15672: More filter usage fixes.

[arvados-workbench2.git] / src / store / users / user-panel-middleware-service.ts

diff --git a/src/store/users/user-panel-middleware-service.ts b/src/store/users/user-panel-middleware-service.ts
index 2f60209368ffc48afd266216e28f97398fc769ff..c253f40ab0daabc173d34261c56e5b2ec4894af3 100644 (file)
--- a/src/store/users/user-panel-middleware-service.ts
+++ b/src/store/users/user-panel-middleware-service.ts
@@ -12,7 +12,7 @@ import { updateResources } from '~/store/resources/resources-actions';
 import { FilterBuilder } from '~/services/api/filter-builder';
 import { SortDirection } from '~/components/data-table/data-column';
 import { OrderDirection, OrderBuilder } from '~/services/api/order-builder';
-import { ListResults } from '~/services/common-service/common-resource-service';
+import { ListResults } from '~/services/common-service/common-service';
 import { userBindedActions } from '~/store/users/users-actions';
 import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
 import { UserResource } from '~/models/user';
@@ -27,24 +27,43 @@ export class UserMiddlewareService extends DataExplorerMiddlewareService {
         const state = api.getState();
         const dataExplorer = getDataExplorer(state.dataExplorer, this.getId());
         try {
-            const response = await this.services.userService.list(getParams(dataExplorer));
-            api.dispatch(updateResources(response.items));
-            api.dispatch(setItems(response));
+            const responseFirstName = await this.services.userService.list(getParamsFirstName(dataExplorer));
+            if (responseFirstName.itemsAvailable) {
+                api.dispatch(updateResources(responseFirstName.items));
+                api.dispatch(setItems(responseFirstName));
+            } else {
+                const responseLastName = await this.services.userService.list(getParamsLastName(dataExplorer));
+                api.dispatch(updateResources(responseLastName.items));
+                api.dispatch(setItems(responseLastName));
+            }
         } catch {
             api.dispatch(couldNotFetchUsers());
         }
     }
 }
 
-export const getParams = (dataExplorer: DataExplorer) => ({
+const getParamsFirstName = (dataExplorer: DataExplorer) => ({
     ...dataExplorerToListParams(dataExplorer),
     order: getOrder(dataExplorer),
-    filters: getFilters(dataExplorer)
+    filters: getFiltersFirstName(dataExplorer)
 });
 
-export const getFilters = (dataExplorer: DataExplorer) => {
+const getParamsLastName = (dataExplorer: DataExplorer) => ({
+    ...dataExplorerToListParams(dataExplorer),
+    order: getOrder(dataExplorer),
+    filters: getFiltersLastName(dataExplorer)
+});
+
+const getFiltersFirstName = (dataExplorer: DataExplorer) => {
+    const filters = new FilterBuilder()
+        .addILike("first_name", dataExplorer.searchValue)
+        .getFilters();
+    return filters;
+};
+
+const getFiltersLastName = (dataExplorer: DataExplorer) => {
     const filters = new FilterBuilder()
-        .addILike("username", dataExplorer.searchValue)
+        .addILike("last_name", dataExplorer.searchValue)
         .getFilters();
     return filters;
 };