+
+
+
diff --git a/platform/commonUI/notification/src/NotificationIndicator.js b/src/plugins/notificationIndicator/plugin.js
similarity index 60%
rename from platform/commonUI/notification/src/NotificationIndicator.js
rename to src/plugins/notificationIndicator/plugin.js
index af399985c9..d870d67c90 100644
--- a/platform/commonUI/notification/src/NotificationIndicator.js
+++ b/src/plugins/notificationIndicator/plugin.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -19,15 +19,25 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
+import Vue from 'vue';
+import NotificationIndicator from './components/NotificationIndicator.vue';
-define(
- [],
- function () {
+export default function plugin() {
+ return function install(openmct) {
+ let component = new Vue ({
+ provide: {
+ openmct
+ },
+ components: {
+ NotificationIndicator: NotificationIndicator
+ },
+ template: ''
+ }),
+ indicator = {
+ key: 'notifications-indicator',
+ element: component.$mount().$el
+ };
- function NotificationIndicator() {}
-
- NotificationIndicator.template = 'notificationIndicatorTemplate';
-
- return NotificationIndicator;
- }
-);
+ openmct.indicators.add(indicator);
+ };
+}
diff --git a/src/plugins/notificationIndicator/pluginSpec.js b/src/plugins/notificationIndicator/pluginSpec.js
new file mode 100644
index 0000000000..61b6efa486
--- /dev/null
+++ b/src/plugins/notificationIndicator/pluginSpec.js
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, 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.
+ *****************************************************************************/
+
+import NotificationIndicatorPlugin from './plugin.js';
+import Vue from 'vue';
+import {
+ createOpenMct
+} from 'testUtils';
+
+describe('the plugin', () => {
+ let notificationIndicatorPlugin,
+ openmct,
+ indicatorObject,
+ indicatorElement,
+ parentElement,
+ mockMessages = ['error', 'test', 'notifications'];
+
+ beforeEach((done) => {
+ openmct = createOpenMct();
+
+ notificationIndicatorPlugin = new NotificationIndicatorPlugin();
+ openmct.install(notificationIndicatorPlugin);
+
+ parentElement = document.createElement('div');
+
+ indicatorObject = openmct.indicators.indicatorObjects.find(indicator => indicator.key === 'notifications-indicator');
+ indicatorElement = indicatorObject.element;
+
+ openmct.on('start', () => {
+ mockMessages.forEach(message => {
+ openmct.notifications.error(message);
+ });
+ done();
+ });
+
+ openmct.startHeadless();
+ });
+
+ describe('the indicator plugin element', () => {
+ beforeEach(() => {
+ parentElement.append(indicatorElement);
+ return Vue.nextTick();
+ });
+
+ it('notifies the user of the number of notifications', () => {
+ let notificationCountElement = parentElement.querySelector('.c-indicator__count');
+
+ expect(notificationCountElement.innerText).toEqual(mockMessages.length.toString());
+ });
+ });
+
+});
diff --git a/src/plugins/plugins.js b/src/plugins/plugins.js
index ca64422819..d177dcd9a8 100644
--- a/src/plugins/plugins.js
+++ b/src/plugins/plugins.js
@@ -51,7 +51,8 @@ define([
'./conditionWidget/plugin',
'./themes/espresso',
'./themes/maelstrom',
- './themes/snow'
+ './themes/snow',
+ './notificationIndicator/plugin'
], function (
_,
UTCTimeSystem,
@@ -83,7 +84,8 @@ define([
ConditionWidgetPlugin,
Espresso,
Maelstrom,
- Snow
+ Snow,
+ NotificationIndicator
) {
var bundleMap = {
LocalStorage: 'platform/persistence/local',
@@ -192,6 +194,7 @@ define([
plugins.Snow = Snow.default;
plugins.Condition = ConditionPlugin.default;
plugins.ConditionWidget = ConditionWidgetPlugin.default;
+ plugins.NotificationIndicator = NotificationIndicator.default;
return plugins;
});
diff --git a/src/ui/layout/status-bar/NotificationBanner.vue b/src/ui/layout/status-bar/NotificationBanner.vue
index 49fdd927fc..d048a4e0ba 100644
--- a/src/ui/layout/status-bar/NotificationBanner.vue
+++ b/src/ui/layout/status-bar/NotificationBanner.vue
@@ -91,6 +91,7 @@ export default {
},
mounted() {
this.openmct.notifications.on('notification', this.showNotification);
+ this.openmct.notifications.on('dismiss-all', this.clearModel);
},
methods: {
showNotification(notification) {