#1633 Refresh the job report on observable import from report

TheHive-Project · Nov 12, 2020 · 625fadf · 625fadf
1 parent f4a4a78
commit 625fadf
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 28 deletions.
diff --git a/frontend/app/scripts/controllers/case/CaseObservablesItemCtrl.js b/frontend/app/scripts/controllers/case/CaseObservablesItemCtrl.js
@@ -125,33 +125,71 @@
                 $scope.similarArtifactsLimit = $scope.similarArtifactsLimit + 10;
             };
 
-            $scope.showReport = function (jobId) {
+            $scope.refreshCurrentJob = function() {
+                $scope.loadReport($scope.currentJob);
+            };
+
+            $scope.loadReport = function(jobId) {
                 $scope.report = {};
 
-                CortexSrv.getJob(jobId, true).then(function(response) {
-                    var job = response.data;
-                    $scope.report = {
-                        template: job.analyzerDefinition,
-                        content: job.report,
-                        status: job.status,
-                        startDate: job.startDate,
-                        endDate: job.endDate
-                    };
-
-                    $scope.currentJob = jobId;
-
-                    $timeout(function() {
-                        var reportEl = angular.element('#analysis-report')[0];
-
-                        // Scrolling hack using jQuery stuff
-                        $('html,body').animate({
-                            scrollTop: $(reportEl).offset().top
-                        }, 'fast');
-                    }, 500);
-
-                }, function(/*err*/) {
-                    NotificationSrv.error('An expected error occured while fetching the job report');
-                });
+                return CortexSrv.getJob(jobId, true)
+                    .then(function(response) {
+                        var job = response.data;
+                        $scope.report = {
+                            template: job.analyzerDefinition,
+                            content: job.report,
+                            status: job.status,
+                            startDate: job.startDate,
+                            endDate: job.endDate
+                        };
+
+                        $scope.currentJob = jobId;
+                    });
+            };
+
+            $scope.showReport = function (jobId) {
+
+                $scope.loadReport(jobId)
+                    .then(function(){
+                        $timeout(function() {
+                            var reportEl = angular.element('#analysis-report')[0];
+
+                            // Scrolling hack using jQuery stuff
+                            $('html,body').animate({
+                                scrollTop: $(reportEl).offset().top
+                            }, 'fast');
+                        }, 500);
+                    })
+                    .catch(function(/*err*/) {
+                        NotificationSrv.error('An expected error occured while fetching the job report');
+                    });
+
+                // $scope.report = {};
+
+                // CortexSrv.getJob(jobId, true).then(function(response) {
+                //     var job = response.data;
+                //     $scope.report = {
+                //         template: job.analyzerDefinition,
+                //         content: job.report,
+                //         status: job.status,
+                //         startDate: job.startDate,
+                //         endDate: job.endDate
+                //     };
+                //
+                //     $scope.currentJob = jobId;
+                //
+                //     $timeout(function() {
+                //         var reportEl = angular.element('#analysis-report')[0];
+                //
+                //         // Scrolling hack using jQuery stuff
+                //         $('html,body').animate({
+                //             scrollTop: $(reportEl).offset().top
+                //         }, 'fast');
+                //     }, 500);
+                //
+                // }, function(/*err*/) {
+                //     NotificationSrv.error('An expected error occured while fetching the job report');
+                // });
             };
 
             $scope.openArtifact = function (a) {

diff --git a/frontend/app/scripts/directives/report-observables.js b/frontend/app/scripts/directives/report-observables.js
@@ -8,7 +8,8 @@
                 observables: '=',
                 analyzer: '=',
                 caseId: '=',
-                permissions: '='
+                permissions: '=',
+                onRefresh: '&?'
             },
             templateUrl: 'views/directives/report-observables.html',
             link: function(scope) {
@@ -117,6 +118,10 @@
                                   item.imported = true;
                                   item.selected = false;
                               });
+
+                              if($scope.onRefresh) {
+                                  $scope.onRefresh();
+                              }
                           });
                     });
 

diff --git a/frontend/app/views/directives/report-observables.html b/frontend/app/views/directives/report-observables.html
@@ -39,13 +39,13 @@
                         offset: (pagination.currentPage-1)*pagination.pageSize |
                         limitTo: pagination.pageSize ">
                     <td>
-                        <input type="checkbox" ng-model="observable.selected" ng-change="selectObservable(observable)" ng-disabled="!!observable.stats.observableId">
+                        <input type="checkbox" ng-model="observable.selected" ng-change="selectObservable(observable)" ng-disabled="!!observable.imported">
                     </td>
                     <td>
                         <observable-flags observable="observable" inline="true" hide-seen="true" hide-similarity="true"></observable-flags>
                     </td>
                     <td align="center">
-                        <span uib-tooltip="Observable already imported" tooltip-popup-delay="500" tooltip-placement="right" ng-if="!!observable.stats.observableId" class="fa fa-check"></span>
+                        <span uib-tooltip="Observable already imported" tooltip-popup-delay="500" tooltip-placement="right" ng-if="!!observable.imported" class="fa fa-check"></span>
                     </td>
                     <td>{{observable.dataType}}</td>
                     <td class="wrap">

diff --git a/frontend/app/views/partials/observables/details/analysers.html b/frontend/app/views/partials/observables/details/analysers.html
@@ -115,6 +115,8 @@ <h4 class="pad10 text-primary">
                         observables="report.content.artifacts"
                         analyzer="report.template"
                         permissions="userPermissions"
+                        on-refresh="refreshCurrentJob()"
+
                         ></report-observables>
                 </div>
             </div>