#205 Update the display of tags in lists

TheHive-Project · May 17, 2017 · e8ce72f · e8ce72f
1 parent bb859a7
commit e8ce72f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/ui/app/views/directives/tag-list.html b/ui/app/views/directives/tag-list.html
@@ -1,3 +1,3 @@
 <div class="tags-list flexwrap">
-    <span ng-repeat="tag in data" class="label label-primary mb-xxxs mr-xxxs">{{tag}}</span>
+    <span ng-repeat="tag in data track by $index" class="label label-primary mb-xxxs mr-xxxs">{{tag}}</span>
 </div>
diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html
@@ -36,7 +36,10 @@ <h4 class="vpad10 text-primary">
                 <dl class="dl-horizontal clear">
                     <dt>Tags</dt>
                     <dd>
-                        <tag-list data="dialog.event.tags"></tag-list>
+                        <div class="flexwrap mt-xxs">                            
+                            <strong class="text-muted mr-xxxs" ng-if="!dialog.event.tags || dialog.event.tags === 0">None</strong>
+                            <span ng-repeat="tag in dialog.event.tags track by $index" class="label label-primary mb-xxxs mr-xxxs pointer">{{tag}}</span>
+                        </div>
                     </dd>
                 </dl>
             </div>

diff --git a/ui/app/views/partials/alert/list.html b/ui/app/views/partials/alert/list.html
@@ -80,9 +80,9 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c
                                             </span>
                                         </div>
                                         <div class="case-tags flexwrap mt-xxs">
-                                            <span class="mr-xxxs">Tags:</span>
+                                            <span class="mr-xxxs text-muted"><i class="fa fa-tags"></i></span>
                                             <strong class="text-muted mr-xxxs" ng-if="!event.tags || event.tags.length === 0">None</strong>
-                                            <span ng-repeat="tag in event.tags" class="label label-primary mb-xxxs mr-xxxs pointer" ng-click="$vm.addFilterValue('tags', tag)">{{tag}}</span>
+                                            <span ng-repeat="tag in event.tags track by $index" class="label label-primary mb-xxxs mr-xxxs pointer" ng-click="$vm.addFilterValue('tags', tag)">{{tag}}</span>
                                         </div>
                                     </td>
                                     <td><a href ng-click="$vm.addFilterValue('source', event.source)">{{event.source}}</a></td>

diff --git a/ui/app/views/partials/case/case.list.html b/ui/app/views/partials/case/case.list.html
@@ -71,9 +71,9 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.
                                             <a ui-sref="app.case.details({caseId: currentCase.id})">#{{currentCase.caseId}} - {{currentCase.title}}</a>
                                         </div>
                                         <div class="case-tags flexwrap mt-xxs">
-                                            <span class="mr-xxxs">Tags:</span>
+                                            <span class="mr-xxxs text-muted"><i class="fa fa-tags"></i></span>
                                             <strong class="text-muted mr-xxxs" ng-if="!currentCase.tags || currentCase.tags.length === 0">None</strong>
-                                            <span ng-repeat="tag in currentCase.tags" class="label label-primary mb-xxxs mr-xxxs pointer" ng-click="$vm.addFilterValue('tags', tag)">{{tag}}
+                                            <span ng-repeat="tag in currentCase.tags track by $index" class="label label-primary mb-xxxs mr-xxxs pointer" ng-click="$vm.addFilterValue('tags', tag)">{{tag}}
 
                                             </span>
                                         </div>

diff --git a/ui/app/views/partials/observables/list/artifacts-list-main.html b/ui/app/views/partials/observables/list/artifacts-list-main.html
@@ -32,7 +32,7 @@ <h4>List of observables ({{artifacts.total || 0}} of {{artifactStats.count}})</h
 <div class="col-md-12" ng-show="artifacts.total > 0">
     <psearch ng-if="!switchTEList" control="artifacts"></psearch>
 
-    <table class="table table-striped table-hover valigned">
+    <table class="table table-striped table-hover case-list">
         <thead>
             <tr>
                 <th style="width: 10px;" class="p-0"></th>
@@ -43,7 +43,6 @@ <h4>List of observables ({{artifacts.total || 0}} of {{artifactStats.count}})</h
                 <th style="width: 15px"></th>
                 <th style="width: 100px">Type <a href ng-click="artifacts.sort='-dataType'; artifacts.update()"><i class="fa fa-caret-up"></i></a><a href ng-click="artifacts.sort='+dataType'; artifacts.update()"><i class="fa fa-caret-down"></i></a></th>
                 <th>Data/Filename <a href ng-click="artifacts.sort='-data'; artifacts.update()"><i class="fa fa-caret-up"></i></a><a href ng-click="artifacts.sort='+data'; artifacts.update()"><i class="fa fa-caret-down"></i></a></th>
-                <th style="width: 300px">Tags</th>
                 <th style="width: 120px">Date added <a href ng-click="artifacts.sort='-startDate'; artifacts.update()"><i class="fa fa-caret-up"></i></a><a href ng-click="artifacts.sort='+startDate'; artifacts.update()"><i class="fa fa-caret-down"></i></a></th>
             </tr>
         </thead>
@@ -60,18 +59,24 @@ <h4>List of observables ({{artifacts.total || 0}} of {{artifactStats.count}})</h
 					<span uib-tooltip="{{artifact.stats.seen}} related artifact(s)" tooltip-popup-delay="500" tooltip-placement="bottom" ng-if="artifact.stats.seen > 0" class="glyphicon glyphicon-eye-open"></span>
                 </td>
                 <td>
-                    <a href="" ng-click="addFilterValue('dataType', artifact.dataType)"><span ng-bind="artifact.dataType"></span></a>
+                    <a href ng-click="addFilterValue('dataType', artifact.dataType)"><span ng-bind="artifact.dataType"></span></a>
                 </td>
-                <td class="wrap clickable" ng-click="openArtifact(artifact)">{{(artifact.data | fang) || (artifact.attachment.name | fang)}}</td>
-                <td>
-                	<span ng-repeat="l in artifact.tags track by $index">
-                		<span class="label label-primary mr-xxxs pointer" ng-click="addFilterValue('tags', l)">
-                			<i class="glyphicon glyphicon-tag"></i> <span ng-bind="l"></span>
-                    	</span>
-                    </span>
+                <td class="wrap">
+                    <div class="wrap clickable" ng-click="openArtifact(artifact)">
+                        {{(artifact.data | fang) || (artifact.attachment.name | fang)}}
+                    </div>
+                    <div class="case-tags flexwrap mt-xxs">
+                        <span class="mr-xxxs text-muted"><i class="fa fa-tags"></i></span>
+                        <strong class="text-muted mr-xxxs" ng-if="!artifact.tags || artifact.tags.length === 0">None</strong>
+                        <span class="label label-primary mb-xxxs mr-xxxs pointer"
+                            ng-repeat="tag in artifact.tags track by $index"
+                            ng-click="addFilterValue('tags', tag)">
+                            {{tag}}
+                        </span>
+                    </div>
                 </td>
                 <td>
-                    <a href="" ng-click="addFilterValue('startDate', artifact.startDate)"><span uib-tooltip="{{artifact.startDate | showDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{artifact.startDate | shortDate}}</span></a>
+                    <a href ng-click="addFilterValue('startDate', artifact.startDate)"><span uib-tooltip="{{artifact.startDate | showDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{artifact.startDate | shortDate}}</span></a>
                 </td>
             </tr>
         </tbody>