feat: Allow admin to search users by lastName and email (#5246)

Author: iamareebjamal

app/controllers/admin/users/list.js

@@ -5,14 +5,18 @@ import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-co
 
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
+  sort_by = 'created-at';
+
+  sort_dir = 'ASC';
+
   @or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges;
 
   get columns() {
     return [
       {
         name            : 'Name',
         valuePath       : 'firstName',
-        extraValuePaths : ['deletedAt', 'id', 'isSuperAdmin'],
+        extraValuePaths : ['fullName', 'deletedAt', 'id', 'isSuperAdmin'],
         cellComponent   : 'ui-table/cell/admin/users/cell-first-name',
         width           : 155,
         isSortable      : true,

app/mixins/ember-table-route.js

@@ -20,20 +20,30 @@ export default Mixin.create({
     }
   },
 
-  applySearchFilters(options, params, searchField) {
-    searchField = kebabCase(searchField);
-    if (params.search) {
-      options.pushObject({
-        name : searchField,
-        op   : 'ilike',
-        val  : `%${params.search}%`
-      });
-    } else {
-      options.removeObject({
-        name : searchField,
-        op   : 'ilike',
-        val  : `%${params.search}%`
-      });
+  applySearchFilters(options, params, searchFields) {
+    if (!Array.isArray(searchFields)) {
+      searchFields = [searchFields];
+    }
+    let filters = options;
+    if (searchFields.length > 1) {
+      filters = [];
+      options.pushObject({ or: filters });
+    }
+    for (let searchField of searchFields) {
+      searchField = kebabCase(searchField);
+      if (params.search) {
+        filters.pushObject({
+          name : searchField,
+          op   : 'ilike',
+          val  : `%${params.search}%`
+        });
+      } else {
+        filters.removeObject({
+          name : searchField,
+          op   : 'ilike',
+          val  : `%${params.search}%`
+        });
+      }
     }
     return options;
   },

app/routes/admin/users/list.js

@@ -27,7 +27,6 @@ export default class extends Route.extend(EmberTableRouteMixin) {
   async model(params) {
     this.set('params', params);
     let filterOptions = [];
-    const searchField = 'firstName';
     if (params.users_status === 'active') {
       filterOptions = [
         {
@@ -80,7 +79,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
         }
       ];
     }
-    filterOptions = this.applySearchFilters(filterOptions, params, searchField);
+    filterOptions = this.applySearchFilters(filterOptions, params, ['firstName', 'lastName', 'email']);
 
     let queryString = {
       include        : 'events',

app/templates/components/ui-table/cell/admin/users/cell-created-at.hbs

@@ -1,3 +1,3 @@
-<span>
+<span data-tooltip={{this.record}}>
   {{moment-from-now this.record}}
 </span>

app/templates/components/ui-table/cell/admin/users/cell-first-name.hbs

@@ -1,4 +1,4 @@
-<span>{{this.record}}</span>
+<span>{{this.extraRecords.fullName}}</span>
 <div class="ui hidden divider"></div>
 <div class="ui horizontal compact basic buttons">
   <UiPopup @tagName="a" @click={{action this.props.actions.moveToUserDetails this.extraRecords.id}} @content={{t "View"}} @class="ui icon button">