#1625 Update the observable-label component to allo inline display

TheHive-Project · Nov 13, 2020 · e098b5d · e098b5d
1 parent b3c9f7c
commit e098b5d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/frontend/app/scripts/components/common/observable-flags.component.js b/frontend/app/scripts/components/common/observable-flags.component.js
@@ -15,6 +15,7 @@
             templateUrl: 'views/components/common/observable-flags.component.html',
             bindings: {
                 observable: '<',
+                inline: '<',
                 onFilter: '&'
             }
         });

diff --git a/frontend/app/styles/main.css b/frontend/app/styles/main.css
@@ -723,3 +723,7 @@ table tr td.task-actions span.action-button {
     background-color: #8a0000 !important;
     /*background: rgba(0,0,0,0.2) !important;*/
 }
+
+.observable-flags.inline div {
+    display: inline;
+}
diff --git a/frontend/app/views/components/alert/observable-list.component.html b/frontend/app/views/components/alert/observable-list.component.html
@@ -33,10 +33,7 @@
                     <tr ng-repeat="observable in $cmp.list.values" class="clickable">
                         <td class="p-0 bg-tlp-{{observable.tlp}} clickable" ng-click="$cmp.filterBy('tlp', observable.tlp)"></td>
                         <td class="nowrap">
-                            <span ng-if="observable.ioc" class="mr-xxs fa fa-star" uib-tooltip="is an IOC" tooltip-popup-delay="500" tooltip-placement="bottom"></span>
-                            <span ng-if="observable.sighted" class="mr-xxs fa fa-toggle-on" uib-tooltip="has been sighted" tooltip-popup-delay="500" tooltip-placement="bottom"></span>
-                            <span ng-if="observable.extraData.seen.seen > 0" class="mr-xxs glyphicon glyphicon-eye-open" ng-class="{'text-danger': observable.extraData.seen.ioc}" uib-tooltip="Seen on {{observable.seen}} existing case(s)" tooltip-popup-delay="500" tooltip-placement="bottom"></span>
-                            <span ng-if="observable.ignoreSimilarity" class="mr-xxs fa fa-chain-broken" uib-tooltip="Ignored for similarity" tooltip-popup-delay="500" tooltip-placement="bottom"></span>
+                            <observable-flags observable="observable" inline="true"></observable-flags>
                         </td>
                         <td>
                             <a href ng-click="$cmp.filterBy('dataType', observable.dataType)">{{observable.dataType}}</a>

diff --git a/frontend/app/views/components/common/observable-flags.component.html b/frontend/app/views/components/common/observable-flags.component.html
@@ -1,4 +1,4 @@
-<div class="observable-flags">
+<div class="observable-flags" ng-class="{'inline': $ctrl.inline}">
     <!-- IOC flag -->
     <div ng-if="!!$ctrl.observable.ioc" class="observable-ioc clickable" uib-tooltip="is an IOC" tooltip-popup-delay="500" tooltip-placement="bottom"
         ng-click="$ctrl.filterBy('ioc', true)">