small compatibility fix to make legacy dialogs (mostly) work (#2310)

platform/commonUI/dialog/bundle.js

@@ -28,6 +28,7 @@ define([
     "./res/templates/dialog.html",
     "./res/templates/overlay-blocking-message.html",
     "./res/templates/message.html",
+    "./res/templates/notification-message.html",
     "./res/templates/overlay-message-list.html",
     "./res/templates/overlay.html",
     'legacyRegistry'
@@ -39,6 +40,7 @@ define([
     dialogTemplate,
     overlayBlockingMessageTemplate,
     messageTemplate,
+    notificationMessageTemplate,
     overlayMessageListTemplate,
     overlayTemplate,
     legacyRegistry
@@ -88,6 +90,10 @@ define([
                     "key": "message",
                     "template": messageTemplate
                 },
+                {
+                    "key": "notification-message",
+                    "template": notificationMessageTemplate
+                },
                 {
                     "key": "overlay-message-list",
                     "template": overlayMessageListTemplate

platform/commonUI/dialog/res/templates/message.html

@@ -2,12 +2,19 @@
      ng-class="'message-severity-' + ngModel.severity">
     <div class="w-message-contents">
         <div class="top-bar">
-            <div class="title">{{ngModel.message}}</div>
+            <div class="title">{{ngModel.title}}</div>
+        </div>
+        <div class="hint" ng-hide="ngModel.hint === undefined">
+            {{ngModel.hint}}
+            <span ng-if="ngModel.timestamp !== undefined">[{{ngModel.timestamp}}]</span>
         </div>
         <div class="message-body">
+            <div class="message-action">
+                {{ngModel.actionText}}
+            </div>
             <mct-include key="'progress-bar'"
                          ng-model="ngModel"
-                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
+                         ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
         </div>
         <div class="bottom-bar">
             <a ng-repeat="dialogOption in ngModel.options"

platform/commonUI/dialog/res/templates/notification-message.html

@@ -0,0 +1,25 @@
+<div class="l-message"
+     ng-class="'message-severity-' + ngModel.severity">
+    <div class="w-message-contents">
+        <div class="top-bar">
+            <div class="title">{{ngModel.message}}</div>
+        </div>
+        <div class="message-body">
+            <mct-include key="'progress-bar'"
+                         ng-model="ngModel"
+                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
+        </div>
+        <div class="bottom-bar">
+            <a ng-repeat="dialogOption in ngModel.options"
+                class="s-button"
+                ng-click="dialogOption.callback()">
+                    {{dialogOption.label}}
+            </a>
+            <a class="s-button major"
+                ng-if="ngModel.primaryOption"
+                ng-click="ngModel.primaryOption.callback()">
+                    {{ngModel.primaryOption.label}}
+            </a>
+        </div>
+    </div>
+</div>

platform/commonUI/dialog/res/templates/overlay-message-list.html

@@ -9,7 +9,7 @@
         <div class="w-messages">
             <mct-include
                 ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
-                key="'message'" ng-model="msg.model"></mct-include>
+                key="'notification-message'" ng-model="msg.model"></mct-include>
         </div>
         <div class="bottom-bar">
             <a ng-repeat="dialogAction in ngModel.dialog.actions"