#1733 Add an alert-duration compnent to display the time took to impo…

…rt or merge and alert into a case.
TheHive-Project · Jan 11, 2021 · 4283406 · 4283406
1 parent 90bc190
commit 4283406
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/frontend/app/index.html b/frontend/app/index.html
@@ -210,6 +210,7 @@
     <script src="scripts/controllers/SearchCtrl.js"></script>
     <script src="scripts/controllers/SettingsCtrl.js"></script>
     <script src="scripts/directives/affixer.js"></script>
+    <script src="scripts/directives/alert-duration.js"></script>
     <script src="scripts/directives/auto-focus.js"></script>
     <script src="scripts/directives/case-duration.js"></script>
     <script src="scripts/directives/charts/c3Chart.js"></script>

diff --git a/frontend/app/scripts/directives/alert-duration.js b/frontend/app/scripts/directives/alert-duration.js
@@ -0,0 +1,15 @@
+(function() {
+    'use strict';
+    angular.module('theHiveDirectives').directive('alertDuration', function() {
+        return {
+            restrict: 'E',
+            scope: {
+                start: '=',
+                end: '=',
+                icon: '@',
+                indicator: '='
+            },
+            templateUrl: 'views/directives/alert-duration.html'
+        };
+    });
+})();
diff --git a/frontend/app/scripts/services/api/AlertingSrv.js b/frontend/app/scripts/services/api/AlertingSrv.js
@@ -139,7 +139,8 @@
                         onUpdate: callback || undefined,
                         operations: [
                             {'_name': 'listAlert'}
-                        ]
+                        ],
+                        extraData: ['importDate']
                     });
                 },
 

diff --git a/frontend/app/views/directives/alert-duration.html b/frontend/app/views/directives/alert-duration.html
@@ -0,0 +1,8 @@
+<span>
+    <strong ng-if="end" class="text-success" uib-tooltip="Imported after">
+        <i class="fa" ng-class="icon"></i> {{indicator ? 'During ' : ''}}{{start | duration:end}}
+    </strong>
+    <strong ng-if="!end" class="text-danger" uib-tooltip="Created since">
+        <i class="fa" ng-class="icon"></i> {{start | duration}} {{indicator ? 'ago' : ''}}
+    </strong>
+</span>
diff --git a/frontend/app/views/partials/alert/list.html b/frontend/app/views/partials/alert/list.html
@@ -136,6 +136,9 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertList
                                     <td class="text-center">{{::event.observableCount || 0}}</td>
                                     <td>
                                         <a href ng-click="$vm.addFilterValue('date', event.date)">{{event.date | shortDate}}</a>
+                                        <div ng-if="!!event.caseId">
+                                            <alert-duration start="event._createdAt" end="event.extraData.importDate" icon="fa-clock-o"></alert-duration>
+                                        </div>
                                     </td>
                                     <td class="clearfix">
                                         <div class="pull-right" if-permission="manageAlert">