Merge pull request #183 from benjaminapetersen/bpeterse/notification-config

Add ui config for notifications

dist/origin-web-common-ui.js

@@ -408,7 +408,9 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
 
   $templateCache.put('src/components/toast-notifications/toast-notifications.html',
     "<div class=\"toast-notifications-list-pf\">\n" +
-    "  <div ng-repeat=\"(notificationID, notification) in notifications track by notification.trackByID\" ng-if=\"!notification.hidden || notification.isHover\"\n" +
+    "  <div\n" +
+    "    ng-repeat=\"(notificationID, notification) in notifications track by notification.trackByID\"\n" +
+    "    ng-if=\"!notification.hidden || notification.isHover\"\n" +
     "       ng-mouseenter=\"setHover(notification, true)\" ng-mouseleave=\"setHover(notification, false)\">\n" +
     "    <div class=\"toast-pf alert {{notification.type | alertStatus}}\" ng-class=\"{'alert-dismissable': !hideCloseButton}\">\n" +
     "      <button ng-if=\"!hideCloseButton\" type=\"button\" class=\"close\" ng-click=\"close(notification)\">\n" +
@@ -1185,6 +1187,9 @@ angular.module('openshiftCommonUI')
 
         // Listen for updates from NotificationsService to show a notification.
         var deregisterNotificationListener = $rootScope.$on('NotificationsService.onNotificationAdded', function(event, notification) {
+          if (notification.skipToast) {
+            return;
+          }
           $scope.$evalAsync(function() {
             $scope.notifications.push(notification);
             if (NotificationsService.isAutoDismiss(notification)) {
@@ -2152,6 +2157,8 @@ angular.module('openshiftCommonUI').provider('NotificationsService', function()
       // notifications may already have an id that is not necessarily unique,
       // this is an explicitly unique id just for `track by` in templates
       notification.trackByID = _.uniqueId('notification-') + Date.now();
+      notification.skipToast = notification.skipToast || false;
+      notification.showInDrawer = notification.showInDrawer || false;
       notification.timestamp = new Date().toISOString();
       if (isNotificationPermanentlyHidden(notification) || isNotificationVisible(notification)) {
         return;

dist/origin-web-common.js

@@ -579,7 +579,9 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
 
   $templateCache.put('src/components/toast-notifications/toast-notifications.html',
     "<div class=\"toast-notifications-list-pf\">\n" +
-    "  <div ng-repeat=\"(notificationID, notification) in notifications track by notification.trackByID\" ng-if=\"!notification.hidden || notification.isHover\"\n" +
+    "  <div\n" +
+    "    ng-repeat=\"(notificationID, notification) in notifications track by notification.trackByID\"\n" +
+    "    ng-if=\"!notification.hidden || notification.isHover\"\n" +
     "       ng-mouseenter=\"setHover(notification, true)\" ng-mouseleave=\"setHover(notification, false)\">\n" +
     "    <div class=\"toast-pf alert {{notification.type | alertStatus}}\" ng-class=\"{'alert-dismissable': !hideCloseButton}\">\n" +
     "      <button ng-if=\"!hideCloseButton\" type=\"button\" class=\"close\" ng-click=\"close(notification)\">\n" +
@@ -1356,6 +1358,9 @@ angular.module('openshiftCommonUI')
 
         // Listen for updates from NotificationsService to show a notification.
         var deregisterNotificationListener = $rootScope.$on('NotificationsService.onNotificationAdded', function(event, notification) {
+          if (notification.skipToast) {
+            return;
+          }
           $scope.$evalAsync(function() {
             $scope.notifications.push(notification);
             if (NotificationsService.isAutoDismiss(notification)) {
@@ -5763,6 +5768,8 @@ angular.module('openshiftCommonUI').provider('NotificationsService', function()
       // notifications may already have an id that is not necessarily unique,
       // this is an explicitly unique id just for `track by` in templates
       notification.trackByID = _.uniqueId('notification-') + Date.now();
+      notification.skipToast = notification.skipToast || false;
+      notification.showInDrawer = notification.showInDrawer || false;
       notification.timestamp = new Date().toISOString();
       if (isNotificationPermanentlyHidden(notification) || isNotificationVisible(notification)) {
         return;

dist/scripts/templates.js

@@ -379,7 +379,9 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
 
   $templateCache.put('src/components/toast-notifications/toast-notifications.html',
     "<div class=\"toast-notifications-list-pf\">\n" +
-    "  <div ng-repeat=\"(notificationID, notification) in notifications track by notification.trackByID\" ng-if=\"!notification.hidden || notification.isHover\"\n" +
+    "  <div\n" +
+    "    ng-repeat=\"(notificationID, notification) in notifications track by notification.trackByID\"\n" +
+    "    ng-if=\"!notification.hidden || notification.isHover\"\n" +
     "       ng-mouseenter=\"setHover(notification, true)\" ng-mouseleave=\"setHover(notification, false)\">\n" +
     "    <div class=\"toast-pf alert {{notification.type | alertStatus}}\" ng-class=\"{'alert-dismissable': !hideCloseButton}\">\n" +
     "      <button ng-if=\"!hideCloseButton\" type=\"button\" class=\"close\" ng-click=\"close(notification)\">\n" +

src/components/toast-notifications/toast-notifications.html

 <div class="toast-notifications-list-pf">
-  <div ng-repeat="(notificationID, notification) in notifications track by notification.trackByID" ng-if="!notification.hidden || notification.isHover"
+  <div
+    ng-repeat="(notificationID, notification) in notifications track by notification.trackByID"
+    ng-if="!notification.hidden || notification.isHover"
        ng-mouseenter="setHover(notification, true)" ng-mouseleave="setHover(notification, false)">
     <div class="toast-pf alert {{notification.type | alertStatus}}" ng-class="{'alert-dismissable': !hideCloseButton}">
       <button ng-if="!hideCloseButton" type="button" class="close" ng-click="close(notification)">

src/components/toast-notifications/toastNotifications.js

@@ -56,6 +56,9 @@ angular.module('openshiftCommonUI')
 
         // Listen for updates from NotificationsService to show a notification.
         var deregisterNotificationListener = $rootScope.$on('NotificationsService.onNotificationAdded', function(event, notification) {
+          if (notification.skipToast) {
+            return;
+          }
           $scope.$evalAsync(function() {
             $scope.notifications.push(notification);
             if (NotificationsService.isAutoDismiss(notification)) {

src/ui-services/notificationsService.js

@@ -21,6 +21,8 @@ angular.module('openshiftCommonUI').provider('NotificationsService', function()
       // notifications may already have an id that is not necessarily unique,
       // this is an explicitly unique id just for `track by` in templates
       notification.trackByID = _.uniqueId('notification-') + Date.now();
+      notification.skipToast = notification.skipToast || false;
+      notification.showInDrawer = notification.showInDrawer || false;
       notification.timestamp = new Date().toISOString();
       if (isNotificationPermanentlyHidden(notification) || isNotificationVisible(notification)) {
         return;