#609 Fix details of flow items related to Jobs and Actions

TheHive-Project · Jul 26, 2018 · 74bd6ad · 74bd6ad
1 parent 5c6b978
commit 74bd6ad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/ui/app/views/directives/flow/action.html b/ui/app/views/directives/flow/action.html
@@ -9,8 +9,16 @@
         </span>
     </div>
     <div class="flow-item-updates wrap">
-        <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>
+        <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>
 </div>
diff --git a/ui/app/views/directives/flow/observable-job.html b/ui/app/views/directives/flow/observable-job.html
@@ -1,16 +1,24 @@
 <div class="flow-observable-job">
     <div class="flow-item-title wrap">
         <i class="glyphicon glyphicon-cog"></i>
-        <span ng-if="!base.object.endDate">
+        <span ng-if="base.operation === 'Creation'">
             Job: <em>{{base.object.analyzerName || base.object.analyzerId}}</em> started
         </span>
-        <span ng-if="base.object.endDate">
+        <span ng-if="base.operation === 'Update'">
             Job <em>{{base.object.analyzerName || base.object.analyzerId}}</em> terminated
         </span>
     </div>
     <div class="flow-item-updates wrap">
-        <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>
+        <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>
 </div>