#127 Refactor job report fetching

TheHive-Project · Feb 22, 2017 · a40449c · a40449c
1 parent b3c920e
commit a40449c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js b/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
     angular.module('theHiveControllers').controller('CaseObservablesItemCtrl',
-        function ($scope, $state, $stateParams, $q, $timeout, CaseTabsSrv, CaseArtifactSrv, CortexSrv, PSearchSrv, AnalyzerSrv, JobSrv, AlertSrv, VersionSrv, appConfig) {
+        function ($scope, $state, $stateParams, $q, $timeout, CaseTabsSrv, CaseArtifactSrv, CortexSrv, PSearchSrv, AnalyzerSrv, AlertSrv, VersionSrv, appConfig) {
             var observableId = $stateParams.itemId,
                 observableName = 'observable-' + observableId;
 
@@ -101,14 +101,21 @@
                 });
             };
 
-            $scope.showReport = function (job) {
-                $scope.report = {
-                    template: job.analyzerId,
-                    content: job.report,
-                    status: job.status,
-                    startDate: job.startDate,
-                    endDate: job.endDate
-                };
+            $scope.showReport = function (jobId) {
+                $scope.report = {};
+
+                CortexSrv.getJob(jobId).then(function(response) {
+                    var job = response.data;
+                    $scope.report = {
+                        template: job.analyzerId,
+                        content: job.report,
+                        status: job.status,
+                        startDate: job.startDate,
+                        endDate: job.endDate
+                    };
+                }, function(err) {
+                    AlertSrv.log('An expected error occured while fetching the job report');
+                });
             };
 
             $scope.similarArtifacts = CaseArtifactSrv.api().similar({

diff --git a/ui/app/views/partials/observables/details/artifact-details-analysers.html b/ui/app/views/partials/observables/details/artifact-details-analysers.html
@@ -26,7 +26,7 @@ <h3 class="pad10 text-primary">
                             <i class="glyphicon" ng-class="{ Failure:'glyphicon-warning-sign text-warning', Success:'glyphicon-ok text-success', InProgress:'fa fa-cog fa-spin'}[job.status]"></i>
                         </span>
 
-                        <a href ng-click="showReport(job)" uib-tooltip="View report">{{(job.endDate || job.startDate) | showDate}}</a>
+                        <a href ng-click="showReport(job.id)" uib-tooltip="View report">{{(job.endDate || job.startDate) | showDate}}</a>
                     </li>
                 </ul>
             </td>