#207 Fix worker type display in jobs list

TheHive-Project · Jul 4, 2019 · 99cbfb4 · 99cbfb4
1 parent 6b1ab64
commit 99cbfb4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/www/src/app/pages/jobs/components/jobs.list.html b/www/src/app/pages/jobs/components/jobs.list.html
@@ -14,14 +14,15 @@
   <div class="row mv-s" ng-if="$ctrl.jobs.length > 0">
     <div class="col-sm-12 flex-table">
       <div class="flex-header media">
-        <div class="flex-col flex-w-100 text-center">Status</div>        
+        <div class="flex-col flex-w-100 text-center">Status</div>
         <div class="flex-col flex-1">Job details</div>
         <div class="flex-col flex-w-120 text-center">TLP</div>
         <div class="flex-col flex-w-120 text-center">PAP</div>
         <div class="flex-col flex-w-100"></div>
         <div class="flex-col flex-w-100" require-roles="orgadmin,analyze"></div>
       </div>
-      <div class="flex-row media" ng-repeat="job in $ctrl.jobs track by job.id" ng-init="isFile = job.dataType ==='file'">
+      <div class="flex-row media" ng-repeat="job in $ctrl.jobs track by job.id"
+        ng-init="isFile = job.dataType ==='file'">
         <div class="flex-col flex-w-100 vertical centered">
           <span class="label label-lg label-default" ng-class="{
             'Success': 'label-success',
@@ -30,13 +31,14 @@
         </div>
         <div class="flex-col flex-1">
           <h4 class="media-heading text-primary">
-            <strong>[{{job.dataType}}]</strong>            
-            <span ng-if="job.type !== 'responder'">{{(isFile ? job.attachment.name : job.data) | fang | limitTo:200}}</span>
+            <strong>[{{job.dataType}}]</strong>
+            <span
+              ng-if="job.type !== 'responder'">{{(isFile ? job.attachment.name : job.data) | fang | limitTo:200}}</span>
             <span ng-if="job.type === 'responder'">{{job.label || 'No Label'}}</span>
           </h4>
           <div class="row mv-xs text-muted">
             <div class="col-sm-4">
-              <strong>Analyzer:</strong>
+              <strong class="text-capitalized">{{ job.type }}:</strong>
               <span>{{job.analyzerName}}</span>
             </div>
             <div class="col-sm-4">
@@ -46,11 +48,12 @@ <h4 class="media-heading text-primary">
             <div class="col-sm-4">
               <strong>User:</strong>
               <span>{{job.organization}}/{{job.createdBy}}</span>
-            </div>            
+            </div>
           </div>
           <div ng-if="job.status === 'Failure'" class="row text-danger wrap">
             <div class="col-sm-12">
-              <a class="text-danger" href ng-click="job.showError = !!!job.showError">{{job.showError ? 'Hide' : 'Show'}} error</a>
+              <a class="text-danger" href
+                ng-click="job.showError = !!!job.showError">{{job.showError ? 'Hide' : 'Show'}} error</a>
               <pre ng-show="job.showError" class="error-trace">{{job.message}}</pre>
             </div>
           </div>
@@ -72,4 +75,4 @@ <h4 class="media-heading text-primary">
       </div>
     </div>
   </div>
-</section>
+</section>
diff --git a/www/src/assets/styles/sass/index.scss b/www/src/assets/styles/sass/index.scss
@@ -1,4 +1,3 @@
-
 $icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';
 @import '~bootstrap-sass/assets/stylesheets/_bootstrap.scss';
 
@@ -9,7 +8,10 @@ $icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';
 @import './paginable-table.scss';
 
 
-html { height: 100%; }
+html {
+  height: 100%;
+}
+
 body {
   min-height: 100%;
   position: relative;
@@ -18,20 +20,22 @@ body {
 
 .btn.btn-clear {
   &:active {
-    box-shadow: none !important;    
+    box-shadow: none !important;
   }
 
   &:focus {
     outline: none !important;
-  }  
+  }
 
   &.text-danger {
     &:focus {
       color: #a94442;
     }
   }
+
   background-color: #fff;
 }
+
 .btn.btn-clear:active:focus {
   outline: none !important;
 }
@@ -141,6 +145,7 @@ a.text-white:hover {
   .container {
     max-width: 1200px;
   }
+
   /* Remove the padding we set earlier */
   .header,
   .footer {
@@ -199,4 +204,8 @@ a.text-white:hover {
 
 textarea.vertical {
   resize: vertical;
+}
+
+.text-capitalized {
+  text-transform: capitalize;
 }