Merge pull request #2395 from spadgett/events-sort

Automatic merge from submit-queue. Add resourceVersion as a secondary sort for events Fixes #1846 /assign @jwforres
openshift · Oct 30, 2017 · 567a1d9 · 567a1d9
2 parents c99ed2a + 729769c
commit 567a1d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/scripts/directives/events.js b/app/scripts/directives/events.js
@@ -43,7 +43,11 @@ angular.module('openshiftConsole')
             $scope.sortConfig.isAscending = !(defaultIsReversed[currentID]);
           }
           var order = $scope.sortConfig.isAscending ? 'asc' : 'desc';
-          sortedEvents = _.orderBy($scope.events, [sortID], [order]);
+          // Use `metadata.resourceVersion` as a secondary sort so that the
+          // sort is stable. In practice, this makes sure that the events with
+          // the same `lastTimestamp` appear in the correct order since events
+          // only have second granularity.
+          sortedEvents = _.orderBy($scope.events, [sortID, 'metadata.resourceVersion'], [order, order]);
         };
 
         var filterExpressions = [];

diff --git a/app/scripts/directives/notifications/notificationDrawerWrapper.js b/app/scripts/directives/notifications/notificationDrawerWrapper.js
@@ -153,7 +153,11 @@
       };
 
       var sortMap = function(map) {
-        return _.orderBy(map, ['event.lastTimestamp', 'event.firstTimestamp'], ['desc', 'desc']);
+        // Use `metadata.resourceVersion` as a secondary sort so that the sort
+        // is stable. In practice, this makes sure that the events with the
+        // same `lastTimestamp` appear in the correct order since events only
+        // have second granularity.
+        return _.orderBy(map, ['event.lastTimestamp', 'event.metadata.resourceVersion'], ['desc', 'desc']);
       };
 
       var render = function() {

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -9325,7 +9325,7 @@ lastTimestamp: !0
 var t = _.get(e, "sortConfig.currentField.id", "lastTimestamp");
 l !== t && (l = t, e.sortConfig.isAscending = !u[l]);
 var n = e.sortConfig.isAscending ? "asc" : "desc";
-c = _.orderBy(e.events, [ t ], [ n ]);
+c = _.orderBy(e.events, [ t, "metadata.resourceVersion" ], [ n, n ]);
 }, m = [], p = function() {
 e.filterExpressions = m = a.generateKeywords(_.get(e, "filter.text"));
 }, f = [ "reason", "message", "type" ];
@@ -14638,7 +14638,7 @@ return c.isImportantAPIEvent(t) && !c.isCleared(t.metadata.uid) && (e[t.metadata
 var n = r.project;
 return _.assign({}, e[n], t[n]);
 }, N = function(e) {
-return _.orderBy(e, [ "event.lastTimestamp", "event.firstTimestamp" ], [ "desc", "desc" ]);
+return _.orderBy(e, [ "event.lastTimestamp", "event.metadata.resourceVersion" ], [ "desc", "desc" ]);
 }, D = function() {
 o.$evalAsync(function() {
 p.notificationGroups = [ S(r.project, N(T(g, v))) ], k();