#1805 Add sort by dates in users list

TheHive-Project · Mar 2, 2021 · d39f38d · d39f38d
1 parent a5591d2
commit d39f38d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/frontend/app/scripts/components/organisation/OrgUserListCmp.js b/frontend/app/scripts/components/organisation/OrgUserListCmp.js
@@ -18,6 +18,13 @@
                     this.onSort({field: field});
                 };
 
+                self.addFilterValue = function(field, value) {
+                    self.onFilter({
+                        field: field,
+                        value: value
+                    });
+                }
+
                 self.reload = function() {
                     self.onReload();
                 };
@@ -210,7 +217,8 @@
                 setPasswordEnabled: '<',
                 onReload: '&',
                 onEdit: '&',
-                onSort: '&'
+                onSort: '&',
+                onFilter: '&'
             }
         });
 })();
diff --git a/frontend/app/views/components/org/user.list.html b/frontend/app/views/components/org/user.list.html
@@ -36,9 +36,16 @@
                     <th>Password</th>
                     <th>API Key</th>
                     <th class="text-center" style="width: 100px" ng-if="$ctrl.mfaEnabled">MFA</th>
-                    <th class="text-center" style="width: 120px">
+                    <th class="text-center" style="width: 150px">
+                        Dates
+                        <a href class="text-default" ng-click="$ctrl.sortByField('_createdAt')">
+                            C.
+                            <i ng-show="$ctrl.sort.indexOf('+_createdAt') === -1 && $ctrl.sort.indexOf('-_createdAt') === -1" class="fa fa-sort"></i>
+                            <i ng-show="$ctrl.sort.indexOf('+_createdAt') !== -1" class="fa fa-caret-up"></i>
+                            <i ng-show="$ctrl.sort.indexOf('-_createdAt') !== -1" class="fa fa-caret-down"></i>
+                        </a>
                         <a href class="text-default" ng-click="$ctrl.sortByField('_updatedAt')">
-                            Updated At
+                            U.
                             <i ng-show="$ctrl.sort.indexOf('+_updatedAt') === -1 && $ctrl.sort.indexOf('-_updatedAt') === -1" class="fa fa-sort"></i>
                             <i ng-show="$ctrl.sort.indexOf('+_updatedAt') !== -1" class="fa fa-caret-up"></i>
                             <i ng-show="$ctrl.sort.indexOf('-_updatedAt') !== -1" class="fa fa-caret-down"></i>
@@ -105,7 +112,14 @@
                             <button type="button" class="btn btn-danger btn-sm" ng-click="$ctrl.resetMfa(user)">Reset</button>
                         </span>
                     </td>
-                    <td>{{user._updatedAt | shortDate}}</td>
+                    <td>
+                        <div ng-class="{'text-bold': $ctrl.sort.indexOf('+_createdAt') !== -1 || $ctrl.sort.indexOf('-_createdAt') !== -1}">
+                            C. <a href ng-click="$ctrl.addFilterValue('_createdAt', user._createdAt)">{{user._createdAt | shortDate}}</a>
+                        </div>
+                        <div ng-if="user._updatedAt > 0" ng-class="{'text-bold': $ctrl.sort.indexOf('+_updatedAt') !== -1 || $ctrl.sort.indexOf('-_updatedAt') !== -1}">
+                            U. <a href ng-click="$ctrl.addFilterValue('_updatedAt', user._updatedAt)">{{user._updatedAt | shortDate}}</a>
+                        </div>
+                    </td>
                     <td>
                         <span class="clickable mr-xxs text-primary" ng-click="$ctrl.editUser(user)" uib-tooltip="Edit User">
                             <i class="text-20 fa fa-edit"></i>

diff --git a/frontend/app/views/partials/admin/organisation/details.html b/frontend/app/views/partials/admin/organisation/details.html
@@ -108,6 +108,7 @@ <h4>
                                 on-reload="$vm.loadUsers()"
                                 on-edit="$vm.showUserDialog(user)"
                                 on-sort="$vm.sortByField(field)"
+                                on-filter="$vm.addFilterValue(field, value)"
                                 sort="$vm.filtering.context.sort"
                                 set-password-enabled="$vm.canSetPass"
                                 mfa-enabled="$vm.canChangeMfa"></org-user-list>