Notifications progress method (#2193)

* Added progress method to notifications so no longer dependent on reactive properties

* Updated notification launch controller to use new progress method

* Added progress function to Notifications API. Introduced NotificationService compatibility layer for legacy code

platform/commonUI/notification/bundle.js

@@ -23,11 +23,13 @@
 define([
     "./src/NotificationIndicatorController",
     "./src/NotificationIndicator",
+    "./src/NotificationService",
     "./res/notification-indicator.html",
     'legacyRegistry'
 ], function (
     NotificationIndicatorController,
     NotificationIndicator,
+    NotificationService,
     notificationIndicatorTemplate,
     legacyRegistry
 ) {
@@ -46,7 +48,7 @@ define([
                     "implementation": NotificationIndicatorController,
                     "depends": [
                         "$scope",
-                        "notificationService",
+                        "openmct",
                         "dialogService"
                     ]
                 }
@@ -61,7 +63,7 @@ define([
                 {
                     "key": "notificationService",
                     "implementation": function (openmct) {
-                        return openmct.notifications;
+                        return new NotificationService.default(openmct);
                     },
                     "depends": [
                         "openmct"

platform/commonUI/notification/src/NotificationIndicatorController.js

@@ -35,9 +35,9 @@ define(
          * @param dialogService
          * @constructor
          */
-        function NotificationIndicatorController($scope, notificationService, dialogService) {
-            $scope.notifications = notificationService.notifications;
-            $scope.highest = notificationService.highest;
+        function NotificationIndicatorController($scope, openmct, dialogService) {
+            $scope.notifications = openmct.notifications.notifications;
+            $scope.highest = openmct.notifications.highest;
 
             /**
              * Launch a dialog showing a list of current notifications.
@@ -48,7 +48,7 @@ define(
                         title: "Messages",
                         //Launch the message list dialog with the models
                         // from the notifications
-                        messages: notificationService.notifications
+                        messages: openmct.notifications.notifications
                     }
                 });
 

platform/commonUI/notification/src/NotificationService.js

@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+export default class NotificationService {
+    constructor(openmct) {
+        this.openmct = openmct;
+    }
+    info(message) {
+        if (typeof message === 'string') {
+            return this.openmct.notifications.info(message);
+        } else {
+            if (message.hasOwnProperty('progress')) {
+                return this.openmct.notifications.progress(message.title, message.progress, message.progressText);
+            } else {
+                return this.openmct.notifications.info(message.title);
+            }
+        }
+    }
+    alert(message) {
+        if (typeof message === 'string') {
+            return this.openmct.notifications.alert(message);
+        } else {
+            return this.openmct.notifications.alert(message.title);
+        }
+    }
+    error(message) {
+        if (typeof message === 'string') {
+            return this.openmct.notifications.error(message);
+        } else {
+            return this.openmct.notifications.error(message.title);
+        }
+    }
+    notify(options) {
+        switch (options.severity) {
+        case 'info':
+            return this.info(options);
+        case 'alert':
+            return this.alert(options);
+        case 'error':
+            return this.error(options);
+        }
+    }
+    getAllNotifications() {
+        return this.openmct.notifications.notifications;
+    }
+}