#1327 Add sort to user list when deanling with assignee

TheHive-Project · May 22, 2020 · 3cf0d97 · 3cf0d97
1 parent ec758cf
commit 3cf0d97
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
@@ -175,7 +175,13 @@
                                 return _.extend({}, task);
                             },
                             users: function() {
-                                return UserSrv.list(self.currentUser.organisation, {_is: { locked: false }});
+                                return UserSrv.list(
+                                    self.currentUser.organisation,
+                                    {
+                                        filter: {_is: { locked: false }},
+                                        sort: [{'name': 'asc'}]
+                                    }                                    
+                                );
                             },
                             groups: function() {
                                 var existingGroups = _.uniq(_.pluck(self.template.tasks, 'group').sort());

diff --git a/frontend/app/scripts/directives/updatableUser.js b/frontend/app/scripts/directives/updatableUser.js
@@ -17,11 +17,12 @@
                     scope.$watch('updatable.updating', function(value) {
 
                         if(value === true && !cached) {
-                            UserSrv.list(AuthenticationSrv.currentUser.organisation, {_is: { locked: false }})
+                            UserSrv.list(AuthenticationSrv.currentUser.organisation, {
+                                filter: {_is: { locked: false }},
+                                sort: [{'name': 'asc'}]
+                            })
                                 .then(function(users) {
                                     scope.userList = users;
-
-                                    console.log(scope.userList);
                                 })
                                 .catch(function(err) {
                                     NotificationSrv.error('Fetching users', err.data, err.status);

diff --git a/frontend/app/scripts/services/api/UserSrv.js b/frontend/app/scripts/services/api/UserSrv.js
@@ -174,20 +174,7 @@
                 return $http.post(user ? (url+'/'+ user) : url );
             };
 
-            this.list = function(organisation, query) {
-                // var post = {
-                //     range: 'all',
-                //     query: query
-                // };
-                // return $http
-                //     .post('./api/v1/user/_search', post)
-                //     .then(function(response) {
-                //         return $q.resolve(response.data);
-                //     })
-                //     .catch(function(err) {
-                //         return $q.reject(err);
-                //     });
-
+            this.list = function(organisation, options) {
                 var operations = [{
                         '_name': 'getOrganisation',
                         'idOrName': organisation
@@ -197,10 +184,18 @@
                     }
                 ];
 
-                if (query) {
-                    query._name = 'filter';
+                if (options && options.filter) {
+                    options.filter._name = 'filter';
+
+                    operations.push(options.filter);
+                }
 
-                    operations.push(query);
+                // Sort users by name
+                if (options && options.sort) {
+                    operations.push({
+                        '_name': 'sort',
+                        '_fields': options.sort
+                    });
                 }
 
                 return QuerySrv.query('v1', operations)