From e4bf30332b785b0e8191c3a103f9749db4fd5985 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Fri, 26 Feb 2021 17:29:28 +0100
Subject: [PATCH] #1807 Update dates column in alert list

---
 frontend/app/views/partials/alert/list.html | 45 +++++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/frontend/app/views/partials/alert/list.html b/frontend/app/views/partials/alert/list.html
index e937f23c22..16ed5984b3 100644
--- a/frontend/app/views/partials/alert/list.html
+++ b/frontend/app/views/partials/alert/list.html
@@ -79,13 +79,33 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertList
                                     <th width="80px">
                                       Observables
                                     </th>
-                                    <th style="width: 120px">
-                                      <a href class="text-default" ng-click="$vm.sortByField('date')">
+                                    <th style="width: 150px">
+                                        Dates
+
+                                        <a href class="text-default ml-xxxs" ng-click="$vm.sortByField('date')" uib-tooltip="Sort by occur date">
+                                            O.
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('+date') === -1 && $vm.filtering.context.sort.indexOf('-date') === -1" class="fa fa-sort"></i>
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('+date') !== -1" class="fa fa-caret-up"></i>
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('-date') !== -1" class="fa fa-caret-down"></i>
+                                        </a>
+                                        <a href class="text-default ml-xxxs" ng-click="$vm.sortByField('_createdAt')" uib-tooltip="Sort by creation date">
+                                            C.
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('+_createdAt') === -1 && $vm.filtering.context.sort.indexOf('-_createdAt') === -1" class="fa fa-sort"></i>
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('+_createdAt') !== -1" class="fa fa-caret-up"></i>
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('-_createdAt') !== -1" class="fa fa-caret-down"></i>
+                                        </a>
+                                        <a href class="text-default ml-xxxs" ng-click="$vm.sortByField('_updatedAt')" uib-tooltip="Sort by last update date">
+                                            U.
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('+_updatedAt') === -1 && $vm.filtering.context.sort.indexOf('-_updatedAt') === -1" class="fa fa-sort"></i>
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('+_updatedAt') !== -1" class="fa fa-caret-up"></i>
+                                            <i ng-show="$vm.filtering.context.sort.indexOf('-_updatedAt') !== -1" class="fa fa-caret-down"></i>
+                                        </a>
+                                      <!-- <a href class="text-default" ng-click="$vm.sortByField('date')">
                                         Date
                                         <i ng-show="$vm.filtering.context.sort.indexOf('+date') === -1 && $vm.filtering.context.sort.indexOf('-date') === -1" class="fa fa-sort"></i>
                                         <i ng-show="$vm.filtering.context.sort.indexOf('+date') !== -1" class="fa fa-caret-up"></i>
                                         <i ng-show="$vm.filtering.context.sort.indexOf('-date') !== -1" class="fa fa-caret-down"></i>
-                                      </a>
+                                      </a> -->
                                     </th>
                                     <th style="width: 160px"></th>
                                 </tr>
@@ -134,8 +154,17 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertList
                                         </div>
                                     </td>
                                     <td class="text-center">{{::event.observableCount || 0}}</td>
-                                    <td>
-                                        <a href ng-click="$vm.addFilterValue('date', event.date)">{{event.date | shortDate}}</a>
+                                    <td rowspan="3">
+                                        <div ng-class="{'text-bold': $vm.filtering.context.sort.indexOf('+date') !== -1 || $vm.filtering.context.sort.indexOf('-date') !== -1}">
+                                            O. <a href ng-click="$vm.addFilterValue('date', event.date)">{{event.date | shortDate}}</a>
+                                        </div>
+                                        <div ng-class="{'text-bold': $vm.filtering.context.sort.indexOf('+_createdAt') !== -1 || $vm.filtering.context.sort.indexOf('-_createdAt') !== -1}">
+                                            C. <a href ng-click="$vm.addFilterValue('_createdAt', event._createdAt)">{{event._createdAt | shortDate}}</a>
+                                        </div>
+                                        <div ng-if="event._updatedAt > 0" ng-class="{'text-bold': $vm.filtering.context.sort.indexOf('+_updatedAt') !== -1 || $vm.filtering.context.sort.indexOf('-_updatedAt') !== -1}">
+                                            U. <a href ng-click="$vm.addFilterValue('_updatedAt', event._updatedAt)">{{event._updatedAt | shortDate}}</a>
+                                        </div>
+
                                         <div ng-if="!!event.caseId">
                                             <alert-duration start="event._createdAt" end="event.extraData.importDate" icon="fa-clock-o"></alert-duration>
                                         </div>
@@ -169,11 +198,11 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertList
                                 </tr>
                                 <tr>
                                     <td></td>
-                                    <td colspan="9">
+                                    <td colspan="8">
                                         <div class="case-tags flexwrap">
                                             <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>
-                                            <tag-item ng-repeat="tag in event.tags track by $index" class="pointer" 
+                                            <tag-item ng-repeat="tag in event.tags track by $index" class="pointer"
                                                 ng-click="$vm.addFilterValue('tags', tag)" value="tag"></tag-item>
                                         </div>
                                     </td>
@@ -181,7 +210,7 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertList
                                 </tr>
                                 <tr ng-if="$vm.filtering.context.showAdvanced">
                                     <td></td>
-                                    <td colspan="9">
+                                    <td colspan="8">
                                         <custom-field-labels custom-fields="event.customFields" on-field-click="$vm.addFilterValue(name, value)"><custom-field-labels>
                                     </td>
                                     <td></td>