Hacks, add a few more event types to cache

openshift · Mar 20, 2017 · 808543f · 808543f
1 parent 70ab5ba
commit 808543f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/app/scripts/directives/notifications/notificationDrawerWrapper.js b/app/scripts/directives/notifications/notificationDrawerWrapper.js
@@ -60,9 +60,7 @@ angular
         });
 
         var subscription = notifications.subscribe($routeParams.project, function(notificationGroups) {
-          console.log('what we got?', notificationGroups);
-          $scope.notificationGroups = [];
-//          $scope.notificationGroups = notificationGroups[$routeParams.project];
+          $scope.notificationGroups = notificationGroups[$routeParams.project] || [];
         });
 
         $scope.$on('$destroy', function() {

diff --git a/app/scripts/services/notifications.js b/app/scripts/services/notifications.js
@@ -20,18 +20,18 @@ angular
       return {
         sort: function(type, reason, kind, name, message) {
           var msg = `${name}: ${message}`;
-          var tier1 = `${kind} ${reason}`;
+          //var tier1 = `${kind} ${reason}`;
           cachedEvents[kind] = cachedEvents[kind] || {};
           cachedEvents[kind][reason] = cachedEvents[kind][reason] || {};
           cachedEvents[kind][reason][type] = cachedEvents[kind][reason][type] || [];
           if(!_.contains(cachedEvents[kind][reason][type], msg)) {
             cachedEvents[kind][reason][type].unshift(msg);
             // no need to keep excessive records...
           }
-          // if we want to limit...
-          // if(cachedEvents[kind][reason][type].length > 15) {
-          //   cachedEvents[kind][reason][type].length = 15;
-          // }
+          // // if we want to limit...
+          if(cachedEvents[kind][reason][type].length > 6) {
+            cachedEvents[kind][reason][type].length = 6;
+          }
           // cachedEvents[tier1] = cachedEvents[tier1] || {};
           // cachedEvents[tier1][type] = cachedEvents[tier1][type] || [];
           // if(!_.contains(cachedEvents[tier1][type], msg)) {
@@ -52,25 +52,27 @@ angular
       var save = function(data) {
         window[storageType].setItem(cachedUserActionsKey, JSON.stringify(data));
       };
-      var cachedProcessedEvents;
+      var cachedProcessedEvents = {};
       var getTypeIndex = function(type) {
         // TODO: verify these are correct
         var indexes = {
           // Applications
           DeploymentConfig: 0,
           ReplicationController: 0,
+          ReplicaSet: 0,
           Deployment: 0,
           StatefulSet: 0,
           Pod: 0,
           Service: 0,
           Route: 0,
           HorizontalPodAutoscaler: 0,
           // Builds
+          BuildConfig: 1,
           Build: 1,
           Pipeline: 1,
           ImageStream: 1,
           // Storage
-          PVC: 2
+          PersistentVolumeClaim: 2
         };
         var index = indexes[type];
         if(typeof index !== 'number') {
@@ -80,6 +82,10 @@ angular
         }
         return indexes[type];
       };
+      var isImportantEvent = function(event) {
+        console.log('isImportantEvent');
+        return true;
+      };
       // TRELLO for adding build events:
       // https://trello.com/c/YiK7d5gs/1149-3-create-events-for-started-completed-failed-builds-builds
       // - TODO: white list proactively filter in, if we didnt discuss,
@@ -101,14 +107,18 @@ angular
         if(!data) {
           return []; // TODO: fix mo' betta
         };
-        cachedProcessedEvents = _.reduce(data.by('metadata.name'), function(result, event) {
+        console.log('process', _.keys(data.by('metadata.name')).length);
+        console.log('cache', cachedProcessedEvents);
+        _.each(data.by('metadata.name'), function(event) {
           var namespace = event.involvedObject.namespace;
+          var type = event.type;
+          // TODO: type, reason, kind....
           var name = event.involvedObject.name;
           var uid = event.metadata.uid;
           var kind = event.involvedObject.kind;
           var index = getTypeIndex(kind);
-          // there are 3 arrays in the result, each has a specific use:
-          result[namespace] = result[namespace] ||  [{
+          // there are 3 arrays for each namespace, matching the current menu structure:
+          cachedProcessedEvents[namespace] = cachedProcessedEvents[namespace] ||  [{
             heading: 'Applications',
             // Applications: Deployments, Pods, StatefulSets, Services, Routes
             notifications: []
@@ -121,21 +131,26 @@ angular
             // Storage: PVC
             notifications: []
           }];
-          // make the notification object:
-          result[namespace][index].notifications.push({
+          if(!cachedProcessedEvents[namespace][index]) {
+            console.warn('missing, add to index list!', cachedProcessedEvents, namespace, index);
+          }
+          if(!isImportantEvent(event)) {
+            return;
+          }
+          cachedProcessedEvents[namespace][index].notifications.push({
             unread:  !_.get(cachedUserActions, [namespace, uid, 'read']),
             message: event.message,
             timestamp: event.lastTimestamp,
             metadata: event.metadata,
             involvedObject: event.involvedObject,
             status: event.type,
+            reason: event.reason,
             actions: null
           });
           // console.log('[', event.type, '>', event.reason, event.involvedObject.kind,']', '(', event.involvedObject.name, ')');
           // console.log('   ', event.message);
           eventTypeOrganizer.sort(event.type, event.reason, event.involvedObject.kind, event.involvedObject.name, event.message);
-          return result;
-        }, {});
+        });
         return cachedProcessedEvents;
       };
 

diff --git a/app/views/directives/notifications/notification-body.html b/app/views/directives/notifications/notification-body.html
@@ -23,6 +23,14 @@
   <span
     class="drawer-pf-notification-message"
     ng-click="customScope.markRead(notification)">{{notification.message}}</span>
+    <br />
+    <!-- TODO: eliminate, this is for filtering -->
+  <span style="font-size: 0.8em; color: #666;">
+    {{notification.status}},
+    {{notification.reason}},
+    {{notification.involvedObject.kind}},
+    {{notification.involvedObject.name}}
+  </span>
   <div
     class="drawer-pf-notification-info"
     ng-click="customScope.markRead(notification)">