#53 Update job status in the flow whenever a job completes

TheHive-Project · Dec 16, 2016 · da31ea5 · da31ea5
1 parent ebb0c7b
commit da31ea5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/ui/app/scripts/services/AuditSrv.js b/ui/app/scripts/services/AuditSrv.js
@@ -33,8 +33,8 @@
                                     ret.pop();
                                 }
                                 messageAdded += 1;
-                            } else {
-                                console.log('message already in the flow: ', message);
+                            } else if(alreadyInFlow && message.base.objectType === 'case_artifact_job') {
+                                ret[messageAdded] = message;
                             }
 
                         }

diff --git a/ui/app/scripts/services/StreamSrv.js b/ui/app/scripts/services/StreamSrv.js
@@ -22,7 +22,6 @@
             },
 
             handleStreamResponse: function(data) {
-                console.log(data);
                 var byRootIds = {};
                 var byObjectTypes = {};
                 var byRootIdsWithObjectTypes = {};

diff --git a/ui/app/views/directives/flow/observable-job.html b/ui/app/views/directives/flow/observable-job.html
@@ -9,16 +9,8 @@
         </span>
     </div>
     <div class="flow-item-updates wrap">
-        <span ng-repeat="(k, v) in base.details" ng-switch="k">
-            <div ng-switch-when="startDate">
-                {{k}}: <em>{{v | showDate}}</em>
-            </div>
-            <div ng-switch-when="endDate">
-                {{k}}: <em>{{v | showDate}}</em>
-            </div>
-            <div ng-switch-default>
-                {{k}}: <em>{{v | limitTo: 250}}</em>
-            </div>
-        </span>
+        <div>status: <em>{{base.object.status}}</em></div>
+        <div>startDate: <em>{{base.object.startDate | showDate}}</em></div>
+        <div ng-if="base.object.endDate">endDate: <em>{{base.object.endDate | showDate}}</em></div>        
     </div>
 </div>