Closes #293 - Deduplicated errors and displayed a count.

elastic · Sep 15, 2014 · f7ef493 · f7ef493
1 parent c5cf9b6
commit f7ef493
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/kibana/components/notify/_notifier.js b/src/kibana/components/notify/_notifier.js
@@ -55,7 +55,20 @@ define(function (require) {
       });
     }
 
-    notifs.push(notif);
+    if (!notif.count) notif.count = 1;
+
+    var dup = _.find(notifs, function (item) {
+      return item.content === notif.content
+        && item.stack === notif.stack
+        && item.lifetime === notif.lifetime;
+    });
+
+    if (dup) {
+      dup.count++;
+    } else {
+      notifs.push(notif);
+    }
+
   }
 
   function formatMsg(msg, from) {

diff --git a/src/kibana/components/notify/directives.js b/src/kibana/components/notify/directives.js
@@ -1,5 +1,6 @@
 define(function (require) {
   var notify = require('modules').get('kibana/notify');
+  var _ = require('lodash');
 
   notify.directive('kbnNotifications', function () {
     return {
@@ -11,4 +12,4 @@ define(function (require) {
       template: require('text!components/notify/partials/toaster.html')
     };
   });
-});
+});
diff --git a/src/kibana/components/notify/partials/toaster.html b/src/kibana/components/notify/partials/toaster.html
@@ -27,7 +27,7 @@
             >Fix it</button>
         </div>
 
-        <i class="fa" ng-class="'fa-' + notif.icon" tooltip="{{notif.title}}"></i> <kbn-truncated orig="{{notif.content}}" length="250" /></kbn-truncated>
+        <i class="fa" ng-class="'fa-' + notif.icon" tooltip="{{notif.title}}"></i> <kbn-truncated orig="{{notif.content}}" length="250" /></kbn-truncated><span ng-show="notif.count > 1">&nbsp;({{ notif.count }} errors)</span>
 
         <div ng-if="notif.stack && notif.showStack" class="toaster-stack">
           <pre ng-bind="notif.stack"></pre>
@@ -36,4 +36,4 @@
       </div>
     </li>
   </ul>
-</div>
+</div>