#18 Clean task and observable tabs when tasks or observables get deleted

TheHive-Project · Nov 18, 2016 · dbd4a19 · dbd4a19
1 parent f06694c
commit dbd4a19
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/ui/app/scripts/controllers/case/CaseMainCtrl.js b/ui/app/scripts/controllers/case/CaseMainCtrl.js
@@ -96,6 +96,13 @@
                 field: 'status'
             });
 
+            $scope.$on('tasks:task-removed', function(event, task) {
+                CaseTabsSrv.removeTab('task-' + task.id);
+            });
+            $scope.$on('observables:observable-removed', function(event, observable) {
+                CaseTabsSrv.removeTab('observable-' + observable.id);
+            });
+
             $scope.openTab = function(tabName) {
                 var tab = CaseTabsSrv.getTab(tabName),
                     params = angular.extend({}, $state.params, tab.params || {});

diff --git a/ui/app/scripts/controllers/case/CaseObservablesCtrl.js b/ui/app/scripts/controllers/case/CaseObservablesCtrl.js
@@ -290,10 +290,12 @@
 
             };
 
-            $scope.dropArtifact = function(artifact) {
+            $scope.dropArtifact = function(observable) {
                 // TODO check result !
                 CaseArtifactSrv.api().delete({
-                    artifactId: artifact.id
+                    artifactId: observable.id
+                }, function() {
+                    $scope.$emit('observables:observable-removed', observable);
                 });
             };
 

diff --git a/ui/app/scripts/controllers/case/CaseTasksCtrl.js b/ui/app/scripts/controllers/case/CaseTasksCtrl.js
@@ -71,7 +71,9 @@
                     'taskId': task.id
                 }, {
                     status: 'Cancel'
-                }, function() {}, function(response) {
+                }, function() {
+                    $scope.$emit('tasks:task-removed', task);
+                }, function(response) {
                     AlertSrv.error('taskList', response.data, response.status);
                 });
             });

diff --git a/ui/app/scripts/services/CaseTabsSrv.js b/ui/app/scripts/services/CaseTabsSrv.js
@@ -59,15 +59,19 @@
             },
 
             removeTab: function(tab) {
-                var currentIsActive = tabs[tab].active;
+                var tabItem = tabs[tab];
+
+                if(!tabItem) {
+                    return;
+                }
+
+                var currentIsActive = tabItem.active;
 
                 delete tabs[tab];
 
                 if (currentIsActive) {
-                    console.log('Closing active tab, switch to details');
                     return true;
                 } else {
-                    console.log('Closing non active tab, stay in current tab');
                     return false;
                 }