Merge pull request ChangemakerStudios#67 from jijiechen/webui

Fixed the random errors in test cases.

Author: Jaben

src/Papercut.Message/MessageRepository.cs

@@ -116,7 +116,7 @@ public string SaveMessage(Action<FileStream> writeTo)
             {
                 // the file must not exists.  the resolution of DataTime.Now may be slow w.r.t. the speed of the received files
                 fileName = Path.Combine(_messagePathConfigurator.DefaultSavePath,
-                    $"{DateTime.Now:yyyyMMddHHmmssFFF}-{StringHelpers.SmallRandomString()}.eml");
+                    $"{DateTime.Now:yyyyMMddHHmmssfff}-{StringHelpers.SmallRandomString()}.eml");
 
                 using (var fileStream = File.Create(fileName))
                 {

src/Papercut.Module.WebUI/Controllers/MessageController.cs

@@ -18,15 +18,13 @@
 
 namespace Papercut.Module.WebUI.Controllers
 {
-    using System;
     using System.Linq;
     using System.Net;
     using System.Net.Http;
-    using System.Threading.Tasks;
     using System.Web.Http;
-    using Core.Domain.Message;
+
     using Message;
-    using MimeKit;
+
     using Models;
 
     using Papercut.Message.Helpers;

src/Papercut.Module.WebUI/Models/MimeMessageEntry.cs

@@ -47,7 +47,7 @@ public static RefDto CreateFrom(MimeMessageEntry messageEntry)
                 return new RefDto
                 {
                     Subject = messageEntry.Subject,
-                    CreatedAt = messageEntry.Created,
+                    CreatedAt = messageEntry.Created?.ToUniversalTime(),
                     Id = messageEntry.Id,
                     Size = messageEntry.FileSize
                 };
@@ -72,7 +72,7 @@ public static Dto CreateFrom(MimeMessageEntry messageEntry)
                 return new Dto
                 {
                     Subject = messageEntry.Subject,
-                    CreatedAt = messageEntry.Created,
+                    CreatedAt = messageEntry.Created?.ToUniversalTime(),
                     Id = messageEntry.Id,
                     From = ToAddressList(mail?.From),
                     To = ToAddressList(mail?.To),

src/Papercut.Module.WebUI/assets/css/style.css

@@ -135,7 +135,7 @@
 }
 
 .preview .tab-content {
-  overflow-y: scroll;
+  overflow-y: visible;
 }
 
 .headers {

src/Papercut.Module.WebUI/assets/index.html

@@ -120,7 +120,7 @@
     <div class="col-md-4 col-sm-3">
       <div class="row">
         <div class="col-md-9 col-sm-12 text-right">
-            {{ getMoment(date(message.CreatedAt)).fromNow() }}
+            {{ getMoment(message.CreatedAt).fromNow() }}
         </div>
         <div class="col-md-3 col-sm-12 text-right">
           {{ message.Size }}
@@ -182,7 +182,7 @@
     </div>
 
     <div class="col-md-3 col-md-offset-3 col-sm-3 text-right">
-      {{ getMoment(date(message.Created)).fromNow() }}
+      {{ getMoment(message.CreatedAt).fromNow() }}
     </div>
   </div>
 </div>
@@ -257,7 +257,7 @@
     </ul>
 
     <div class="tab-content">
-      <iframe target-blank="" ng-if="hasHTML(preview)" ng-class="{ active: hasHTML(preview) }" class="tab-pane" id="preview-html" srcdoc="{{preview.previewHTML}}" seamless frameborder="0" style="width: 100%"></iframe>
+      <iframe target-blank="" ng-if="hasHTML(preview)" ng-class="{ active: hasHTML(preview) }" class="tab-pane" id="preview-html" body-html="preview.previewHTML" seamless frameborder="0" style="width: 100%"></iframe>
       <div class="tab-pane" ng-class="{ active: !hasHTML(preview) }" id="preview-plain" ng-bind-html="formatMessagePlain(preview)"></div>
     </div>
   </div>

src/Papercut.Module.WebUI/assets/js/controllers.js

@@ -40,8 +40,8 @@ papercutApp.controller('MailCtrl', function ($scope, $http, $sce, $timeout) {
   $scope.saveSMTPServer = false;
 
 
-  $scope.getMoment = function(a) {
-    return moment(a)
+  $scope.getMoment = function (a) {
+      return moment.utc(a, 'YYYY-MM-DDTHH:mm:ss.SSSZ').local();
   }
 
   $scope.backToInbox = function() {
@@ -511,3 +511,19 @@ papercutApp.directive('ngKeyEnter', function () {
     };
 });
 
+
+papercutApp.directive('bodyHtml', ['$sce', '$timeout', function ($sce, $timeout) {
+    return {
+        link: function (scope, element, attrs) {
+            element.attr('src', "about:blank");
+            element.on('load', function () {
+                var body = $(element).contents().find('body');
+                body.empty().append($sce.getTrustedHtml(scope.$eval(attrs.bodyHtml)));
+
+                $timeout(function () {
+                    element.css('height', $(body[0].ownerDocument.documentElement).height() + 100);
+                }, 50);
+            });
+        }
+    };
+}]);

test/Papercut.Module.WebUI.Tests/MessageFacts/LoadMessageFacts.cs

@@ -18,6 +18,7 @@
 
 namespace Papercut.Module.WebUI.Test.MessageFacts
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Net;
@@ -59,6 +60,11 @@ public void ShouldLoadAllMessages()
             Assert.NotNull(message.CreatedAt);
             Assert.NotNull(message.Size);
             Assert.AreEqual("Test", message.Subject);
+
+
+            // Should serve CreatedAt as UTC value.
+            var dateDiff = DateTime.UtcNow - message.CreatedAt.Value;
+            Assert.Less(Math.Abs(dateDiff.TotalMinutes), 1);
         }
 
         [Test, Order(2)]