From 5c3a9f1e58ce5c0d6023f5e66b46e70bb35bb87e Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Sat, 7 Nov 2020 09:23:09 +0100
Subject: [PATCH] #1625 Display ignoreSimilarity in case and alert observables
 list

---
 .../app/views/components/alert/observable-list.component.html | 3 ++-
 frontend/app/views/partials/observables/list/observables.html | 4 ++++
 thehive/app/org/thp/thehive/services/AlertSrv.scala           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/app/views/components/alert/observable-list.component.html b/frontend/app/views/components/alert/observable-list.component.html
index d69db28872..21abc48972 100644
--- a/frontend/app/views/components/alert/observable-list.component.html
+++ b/frontend/app/views/components/alert/observable-list.component.html
@@ -23,7 +23,7 @@
                 <thead>
                     <tr>
                         <th style="width: 10px;" class="p-0"></th>
-                        <th style="width:40px;"></th>
+                        <th style="width:50px;"></th>
                         <th style="width:100px;">Type</th>
                         <th>Data</th>
                         <th style="width: 120px">Date Added</th>
@@ -36,6 +36,7 @@
                             <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>
                         </td>
                         <td>
                             <a href ng-click="$cmp.filterBy('dataType', observable.dataType)">{{observable.dataType}}</a>
diff --git a/frontend/app/views/partials/observables/list/observables.html b/frontend/app/views/partials/observables/list/observables.html
index 823c37e8df..1d852c7e4d 100644
--- a/frontend/app/views/partials/observables/list/observables.html
+++ b/frontend/app/views/partials/observables/list/observables.html
@@ -31,6 +31,7 @@ <h4>
                 <th style="width: 15px"></th>
                 <th style="width: 15px"></th>
                 <th style="width: 15px"></th>
+                <th style="width: 15px"></th>
                 <th style="width: 100px">
                   <a href class="text-default" ng-click="sortByField('dataType')">
                     Type
@@ -71,6 +72,9 @@ <h4>
                 <td>
                     <span ng-click="addFilterValue('sighted', artifact.sighted)" ng-if="artifact.sighted" class="clickable fa fa-toggle-on" uib-tooltip="has been sighted" tooltip-popup-delay="500" tooltip-placement="bottom"></span>
                 </td>
+                <td>
+                    <span ng-if="artifact.ignoreSimilarity" class="fa fa-chain-broken" uib-tooltip="ignored from similarity" tooltip-popup-delay="500" tooltip-placement="bottom"></span>
+                </td>
                 <td>
                     <span
                       uib-tooltip="{{artifact.extraData.seen.seen}} related artifact(s)"
diff --git a/thehive/app/org/thp/thehive/services/AlertSrv.scala b/thehive/app/org/thp/thehive/services/AlertSrv.scala
index f665692ecc..6768a009e2 100644
--- a/thehive/app/org/thp/thehive/services/AlertSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AlertSrv.scala
@@ -411,7 +411,7 @@ object AlertOps {
             _.selectKeys
               .project(
                 _.by(_.richCaseWithoutPerms)
-                  .by((_: Traversal.V[Case]).observables.groupCount(_.byValue(_.ioc)))
+                  .by((_: Traversal.V[Case]).observables.hasNot(_.ignoreSimilarity, true).groupCount(_.byValue(_.ioc)))
               )
           )
             .by(