From 40f0cdd18d7415c7e6be57d3198b87e1bc1119d0 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Sun, 28 Jun 2020 16:58:18 +0200
Subject: [PATCH] #1410 Update alert list: status column, quick filters

---
 .../controllers/alert/AlertListCtrl.js        | 28 +++++++++----------
 frontend/app/views/partials/alert/list.html   | 17 ++++-------
 .../views/partials/alert/list/toolbar.html    | 17 ++++++-----
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/frontend/app/scripts/controllers/alert/AlertListCtrl.js b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
index b72d5bf2ea..e112f22ff0 100755
--- a/frontend/app/scripts/controllers/alert/AlertListCtrl.js
+++ b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
@@ -31,17 +31,9 @@
                         sort: ['-date']
                     },
                     defaultFilter: [{
-                        field: 'status',
-                        type: 'enumeration',
-                        value: {
-                            list: [{
-                                text: 'New',
-                                label: 'New'
-                            }, {
-                                text: 'Updated',
-                                label: 'Updated'
-                            }]
-                        }
+                        field: 'imported',
+                        type: 'boolean',
+                        value: false
                     }]
                 });
                 self.filtering.initContext('list')
@@ -408,17 +400,18 @@
                 this.search();
             };
 
-            this.filterByStatus = function(status) {
+            this.filterByStatus = function(flag) {
                 self.filtering.clearFilters()
                     .then(function(){
-                        self.addFilterValue('status', status);
+                        self.addFilterValue('imported', flag);
                     });
             };
 
             this.filterByNewAndUpdated = function() {
                 self.filtering.clearFilters()
                     .then(function(){
-                        self.addFilterValue('status', ['New', 'Updated']);
+                        // TODO nadouani: how to support updated alerts
+                        self.addFilterValue('imported', true);
                     });
             };
 
@@ -426,6 +419,13 @@
                 self.addFilterValue('severity', Severity.values[numericSev]);
             };
 
+            this.filterBy = function(field, value) {
+                self.filtering.clearFilters()
+                    .then(function(){
+                        self.addFilterValue(field, value);
+                    });
+            };
+
             this.sortBy = function(sort) {
                 self.list.sort = sort;
                 self.list.update();
diff --git a/frontend/app/views/partials/alert/list.html b/frontend/app/views/partials/alert/list.html
index 40d326b12e..06d996f7d5 100644
--- a/frontend/app/views/partials/alert/list.html
+++ b/frontend/app/views/partials/alert/list.html
@@ -111,7 +111,7 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c
                                             <span>{{::event.sourceRef}}</span>
 
                                             <span ng-if="event.externalLink" class="pl-xxs">
-                                                <a ng-href="{{event.externalLink}}" target="_blank">
+                                                <a ng-href="{{event.externalLink}}" target="_blank" uib-tooltip="Open alert's external link">
                                                     <i class="fa fa-external-link"></i>
                                                 </a>
                                             </span>
@@ -122,14 +122,13 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c
                                         <span><a href ng-click="$vm.addFilterValue('type', event.type)">{{::event.type}}</a></span>
                                     </td>
                                     <td>
-                                        <span class="clickable label label-default" ng-class="{'label-danger': event.status==='New', 'label-warning': event.status === 'Updated'}" ng-click="$vm.addFilterValue('status', event.status)">{{::event.status}}</span>
-                                        <span class="clickable label label-default" ng-class="{'label-danger': !event.case}">{{event.case ? 'Imported' : 'New'}}</span>
+                                        <span class="clickable label label-default" ng-class="{'label-danger': !event.caseId}" ng-click="$vm.addFilterValue('imported', !!event.caseId)">{{event.caseId ? 'Imported' : 'New'}}</span>
                                     </td>
                                     <td class="wrap">
                                         <div class="case-title">
                                             <span>
-                                                <span ng-if="!event.case">{{::event.title}}</span>
-                                                <span ng-if="event.case" ui-sref="app.case.details({caseId: event.case})">
+                                                <span ng-if="!event.caseId">{{::event.title}}</span>
+                                                <span ng-if="event.caseId" ui-sref="app.case.details({caseId: event.caseId})">
                                                     <a href>{{::event.title}}</a>
                                                 </span>
                                             </span>
@@ -139,10 +138,6 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c
                                             <strong class="text-muted mr-xxxs" ng-if="!event.tags || event.tags.length === 0">None</strong>
                                             <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>
-                                        <!-- <div class="flexwrap" ng-if="event.type === 'misp'">
-                                            <span class="mr-xxxs text-muted"><i class="fa fa-link"></i></span>
-                                            <a ng-href="{{$vm.urls[event.source]}}/events/{{event.sourceRef}}" target="_blank">Open in MISP</a>
-                                        </div> -->
                                     </td>
                                     <td><a href ng-click="$vm.addFilterValue('source', event.source)">{{event.source}}</a></td>
                                     <td class="text-center">
@@ -189,10 +184,10 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c
                                         </div>
 
                                         <div class="pull-right">
-                                            <a class="btn btn-xs btn-icon btn-clear" href ng-click="$vm.import(event)" uib-tooltip="Preview and Import" ng-if="!event.case">
+                                            <a class="btn btn-xs btn-icon btn-clear" href ng-click="$vm.import(event)" uib-tooltip="Preview and Import" ng-if="!event.caseId">
                                                 <i class="text-info text-20 fa fa-file-text-o"></i>
                                             </a>
-                                            <a class="btn btn-xs btn-icon btn-clear" href ui-sref="app.case.details({caseId: event.case})" uib-tooltip="View case" ng-if="event.case">
+                                            <a class="btn btn-xs btn-icon btn-clear" href ui-sref="app.case.details({caseId: event.caseId})" uib-tooltip="View case" ng-if="event.caseId">
                                                 <i class="text-info text-20 fa fa-search"></i>
                                             </a>
                                         </div>
diff --git a/frontend/app/views/partials/alert/list/toolbar.html b/frontend/app/views/partials/alert/list/toolbar.html
index 74041af749..056f21539d 100644
--- a/frontend/app/views/partials/alert/list/toolbar.html
+++ b/frontend/app/views/partials/alert/list/toolbar.html
@@ -47,23 +47,22 @@
                     <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu" uib-dropdown-menu>
+                    <!-- TODO nadouani: fix this filter -->
+                    <!-- <li>
+                        <a class="clickable" ng-click="$vm.filterByNewAndUpdated()">New & Updated events ({{(alertEvents.Updated.count || 0) + (alertEvents.New.count || 0)}})</a>
+                    </li> -->
                     <li>
-                        <!-- TODO nadouani: fix this filter -->
-                        <a ng-click="$vm.filterByNewAndUpdated()">New & Updated events ({{(alertEvents.Updated.count || 0) + (alertEvents.New.count || 0)}})</a>
+                        <a class="clickable" ng-click="$vm.filterByStatus(false)">New events ({{alertEvents.New.count || 0}})</a>
                     </li>
                     <li>
-                        <!-- TODO nadouani: fix this filter -->
-                        <a ng-click="$vm.filterByNewAndUpdated()">New & Updated events ({{(alertEvents.Updated.count || 0) + (alertEvents.New.count || 0)}})</a>
+                        <a class="clickable" ng-click="$vm.filterByStatus(true)">Imported events ({{alertEvents.Imported.count || 0}})</a>
                     </li>
                     <li>
-                        <!-- TODO nadouani: fix this filter -->
-                        <a ng-click="$vm.filterByStatus('New')">New events ({{alertEvents.New.count || 0}})</a>
+                        <a class="clickable" ng-click="$vm.filterBy('read', true)">Read events</a>
                     </li>
                     <li>
-                        <!-- TODO nadouani: fix this filter -->
-                        <a ng-click="$vm.filterByStatus('Updated')">Updated events({{alertEvents.Updated.count || 0}})</a>
+                        <a class="clickable" ng-click="$vm.filterBy('read', false)">Unread events</a>
                     </li>
-
                 </ul>
             </div>