#232 Add a button to similar cases in alert preview dialog

TheHive-Project · Jun 12, 2017 · 682cd91 · 682cd91
1 parent def8ff7
commit 682cd91
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/ui/app/scripts/controllers/alert/AlertEventCtrl.js b/ui/app/scripts/controllers/alert/AlertEventCtrl.js
@@ -82,6 +82,23 @@
                 });
             };
 
+            self.mergeIntoCase = function(caseId) {
+                self.loading = true;
+                AlertingSrv.mergeInto(self.event.id, caseId)
+                    .then(function(response) {
+                        $uibModalInstance.dismiss();
+
+                        $rootScope.$broadcast('alert:event-imported');
+
+                        $state.go('app.case.details', {
+                            caseId: response.data.id
+                        });
+                    }, function(response) {
+                        self.loading = false;
+                        NotificationSrv.error('AlertEventCtrl', response.data, response.status);
+                    });
+            };
+
             this.follow = function() {
                 var fn = angular.noop;
 

diff --git a/ui/app/scripts/services/AlertingSrv.js b/ui/app/scripts/services/AlertingSrv.js
@@ -30,6 +30,10 @@
                     return $http.post(baseUrl + '/' + alertId + '/createCase', data || {});
                 },
 
+                mergeInto: function(alertId, caseId) {
+                    return $http.post(baseUrl + '/' + alertId + '/merge/' + caseId);
+                },
+
                 canMarkAsRead: function(event) {
                     return event.status === 'New' || event.status === 'Updated';
                 },

diff --git a/ui/app/styles/case-item.css b/ui/app/styles/case-item.css
@@ -43,3 +43,7 @@ div.case-item>div.case-observables-list {
 div.case-item>div.case-similarity {
     width: 200px;
 }
+div.case-item>div.case-similarity-merge {
+    width: 150px;
+    text-align: center;
+}
diff --git a/ui/app/views/partials/alert/event.similarity.html b/ui/app/views/partials/alert/event.similarity.html
@@ -15,6 +15,7 @@
     <div class="case-date text-bold">Date</div>
     <div class="case-similarity text-bold">Observables</div>
     <div class="case-similarity text-bold">IOCs</div>
+    <div class="case-similarity-merge text-bold">Action</div>
 </div>
 
 <div class="case-collection" ng-repeat="item in filteredLinks = (dialog.event.similarCases | filter:dialog.similarityFilters | orderBy:dialog.similaritySorts) ">
@@ -57,22 +58,22 @@
 
         <div class="case-similarity">
             <div>
-                <strong>{{item.similarArtifactCount}} / {{item.artifactCount}}</strong>
-                <uib-progressbar class="progress" max="item.artifactCount" value="item.similarArtifactCount" type="primary">
-                    <i>{{(item.similarArtifactCount / item.artifactCount) | percentage:0}}</i>
-                </uib-progressbar>
+                <strong>{{(item.similarArtifactCount / item.artifactCount) | percentage:0}}</strong> ({{item.similarArtifactCount}} / {{item.artifactCount}})
+                <uib-progressbar class="progress progress-sm" max="item.artifactCount" value="item.similarArtifactCount" type="primary"></uib-progressbar>
             </div>
         </div>
         <div class="case-similarity">
             <div ng-if="item.iocCount > 0">
-                <strong>{{item.similarIocCount}} / {{item.iocCount}}</strong>
-                <uib-progressbar class="progress" max="item.iocCount" value="item.similarIocCount" type="danger">
-                    <i>{{(item.similarIocCount / item.iocCount) | percentage:0}}</i>
-                </uib-progressbar>
+                <strong>{{(item.similarIocCount / item.iocCount) | percentage:0}}</strong> ({{item.similarIocCount}} / {{item.iocCount}})
+                <uib-progressbar class="progress progress-sm" max="item.iocCount" value="item.similarIocCount" type="danger"></uib-progressbar>
             </div>
             <div ng-if="item.iocCount === 0">
                 <em>N/A</em>
             </div>
         </div>
+
+        <div class="case-similarity-merge text-center">
+            <button class="btn btn-sm btn-primary" ng-click="dialog.mergeIntoCase(item.id)">Merge in this case</button>
+        </div>
     </div>
 </div>