From 2f8a0c2c2bfa20ac0ddd704ff4aa947b369e6901 Mon Sep 17 00:00:00 2001
From: Julie Wang <jwang135@gmail.com>
Date: Wed, 20 Jun 2018 10:37:19 -0700
Subject: [PATCH] [Notifications] Added timestamp and object name to copy
 notifications (#2060)

* [Notifications] Added timestamp and object name to copy notifications \n

-Fixes issue #331
-Added timestamps to all notifications
-Added object name to copy success notification
-Updated placement and style of notification timestamp as discussed with Charles.
---
 platform/commonUI/dialog/res/templates/message.html       | 2 +-
 platform/commonUI/notification/src/NotificationService.js | 5 +++--
 platform/entanglement/src/actions/CopyAction.js           | 7 ++++---
 platform/entanglement/test/actions/CopyActionSpec.js      | 7 ++++++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html
index 0f4fcd901b..290c0cad7e 100644
--- a/platform/commonUI/dialog/res/templates/message.html
+++ b/platform/commonUI/dialog/res/templates/message.html
@@ -4,7 +4,7 @@
         <div class="top-bar">
             <div class="title">{{ngModel.title}}</div>
         </div>
-        <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
+        <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint + " [" + ngModel.timestamp + "]"}}</div>
         <div class="message-body">
             <div class="message-action">
                 {{ngModel.actionText}}
diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js
index 0a62a7de5e..5b16fb4689 100644
--- a/platform/commonUI/notification/src/NotificationService.js
+++ b/platform/commonUI/notification/src/NotificationService.js
@@ -31,8 +31,8 @@
  * @namespace platform/commonUI/notification
  */
 define(
-    [],
-    function () {
+    ['moment'],
+    function (moment) {
 
         /**
          * A representation of a user action. Options are provided to
@@ -313,6 +313,7 @@ define(
                 topic = this.topic();
 
             notificationModel.severity = notificationModel.severity || "info";
+            notificationModel.timestamp = moment.utc().format('YYYY-MM-DD hh:mm:ss.ms');
 
             notification = {
                 model: notificationModel,
diff --git a/platform/entanglement/src/actions/CopyAction.js b/platform/entanglement/src/actions/CopyAction.js
index 8577db3487..537582626a 100644
--- a/platform/entanglement/src/actions/CopyAction.js
+++ b/platform/entanglement/src/actions/CopyAction.js
@@ -111,9 +111,11 @@ define(
         CopyAction.prototype.perform = function () {
             var self = this;
 
-            function success() {
+            function success(domainObject) {
+                var domainObjectName = domainObject.model.name;
+
                 self.notification.dismiss();
-                self.notificationService.info("Copying complete.");
+                self.notificationService.info(domainObjectName + " copied successfully.");
             }
 
             function error(errorDetails) {
@@ -160,4 +162,3 @@ define(
         return CopyAction;
     }
 );
-
diff --git a/platform/entanglement/test/actions/CopyActionSpec.js b/platform/entanglement/test/actions/CopyActionSpec.js
index 0817ded2db..0330fae052 100644
--- a/platform/entanglement/test/actions/CopyActionSpec.js
+++ b/platform/entanglement/test/actions/CopyActionSpec.js
@@ -47,6 +47,7 @@ define(
                 mockDialog,
                 mockLog,
                 abstractComposePromise,
+                domainObject = {model: {name: "mockObject"}},
                 progress = {phase: "copying", totalObjects: 10, processed: 1};
 
             beforeEach(function () {
@@ -108,7 +109,7 @@ define(
 
                 abstractComposePromise.then.andCallFake(function (success, error, notify) {
                     notify(progress);
-                    success();
+                    success(domainObject);
                 });
 
                 locationServicePromise.then.andCallFake(function (callback) {
@@ -199,6 +200,10 @@ define(
                         expect(notificationService.info).toHaveBeenCalled();
                     });
 
+                    it("notifies the user with name of object copied", function () {
+                        expect(notificationService.info)
+                            .toHaveBeenCalledWith("mockObject copied successfully.");
+                    });
                 });
             });