#127 Update the observable details page to display mini reports based…

… on the the observable summary
TheHive-Project · Mar 1, 2017 · 1db057e · 1db057e
1 parent f61ad6a
commit 1db057e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js b/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js
@@ -75,7 +75,7 @@
 
             };
 
-            $scope.onJobsChange = function () {
+            $scope.onJobsChange = function (updates) {
                 $scope.analyzerJobs = {};
 
                 angular.forEach($scope.analyzers, function (analyzer, analyzerId) {
@@ -99,6 +99,26 @@
                             */
                     }
                 });
+
+                // Check it a job completed successfully and update the observableId
+                if(updates && updates.length > 0) {
+
+                    var statuses = _.pluck(_.map(updates, function(item) {
+                        return item.base.details;
+                    }), 'status');
+
+                    console.log(statuses);
+                    if(statuses.indexOf('Success') > -1) {
+                        CaseArtifactSrv.api().get({
+                            'artifactId': observableId
+                        }, function (observable) {
+                            $scope.artifact = observable;
+                        }, function (response) {
+                            AlertSrv.error('artifactDetails', response.data, response.status);
+                            CaseTabsSrv.activateTab('observables');
+                        });
+                    }
+                }
             };
 
             $scope.showReport = function (jobId) {
@@ -113,7 +133,7 @@
                         startDate: job.startDate,
                         endDate: job.endDate
                     };
-                }, function(err) {
+                }, function(/*err*/) {
                     AlertSrv.log('An expected error occured while fetching the job report');
                 });
             };

diff --git a/ui/app/scripts/services/PSearchSrv.js b/ui/app/scripts/services/PSearchSrv.js
@@ -2,7 +2,7 @@
     'use strict';
     angular.module('theHiveServices')
         .factory('PSearchSrv', function(SearchSrv, StreamSrv) {
-            function update(objectType, control) {
+            function update(objectType, control, updates) {
                 var range = '';
                 if (control.loadAll) {
                     range = 'all';
@@ -38,7 +38,7 @@
                             control.values.push(d);
                         });
                         if (angular.isFunction(control.onUpdate)) {
-                            control.onUpdate();
+                            control.onUpdate(updates);
                         }
                     }
                     control.total = total;
@@ -93,8 +93,8 @@
                 }
 
                 if (control.skipStream !== true) {
-                    StreamSrv.listen(root, control.streamObjectType || objectType, function() {
-                        update(objectType, control);
+                    StreamSrv.listen(root, control.streamObjectType || objectType, function(updates) {
+                        update(objectType, control, updates);
                     });
                 }
 

diff --git a/ui/app/views/partials/case/case.observables.item.html b/ui/app/views/partials/case/case.observables.item.html
@@ -25,14 +25,12 @@ <h4>
     </div>
     <!-- Observable analysers short reports -->
     <div class="col-md-11 col-md-offset-1">
-        <report ng-if="jobs[0]"
-            ng-repeat="(analyzerId, jobs) in analyzerJobs"
+        <report ng-repeat="(analyzerId, summary) in artifact.reports"
             artifact="artifact"
-            content="jobs[0].report.summary"
+            content="summary"
             report-type="short"
             name="analyzerId"
-            status="jobs[0].status"
-            success="jobs[0].success"
+            success="true"
             class="short-report"></report>
     </div>
 </div>

diff --git a/ui/app/views/reports/short.html b/ui/app/views/reports/short.html
@@ -1 +0,0 @@
-Default Short Tpl