Complete useFilteredSearchQuery refactoring (#1531)

Complete useFilteredSearchQuery ref
actoring

front/src/modules/activities/components/ActivityAssigneePicker.tsx

@@ -41,11 +41,7 @@ export function ActivityAssigneePicker({
     queryHook: useSearchUserQuery,
     filters: [
       {
-        fieldName: 'firstName',
+        fieldNames: ['firstName', 'lastName'],
-        filter: relationPickerSearchFilter,
-      },
-      {
-        fieldName: 'lastName',
         filter: relationPickerSearchFilter,
       },
     ],

front/src/modules/companies/hooks/useFilteredSearchCompanyQuery.ts

@@ -16,7 +16,7 @@ export function useFilteredSearchCompanyQuery({
     queryHook: useSearchCompanyQuery,
     filters: [
       {
-        fieldName: 'name',
+        fieldNames: ['name'],
         filter: searchFilter,
       },
     ],

front/src/modules/people/components/PeoplePicker.tsx

@@ -31,19 +31,24 @@ export function PeoplePicker({
     relationPickerSearchFilterScopedState,
   );
 
+  const queryFilters = [
+    {
+      fieldNames: ['firstName', 'lastName'],
+      filter: relationPickerSearchFilter,
+    },
+  ];
+
+  if (companyId) {
+    queryFilters.push({
+      fieldNames: ['companyId'],
+      filter: companyId,
+    });
+  }
+
   const people = useFilteredSearchEntityQuery({
     queryHook: useSearchPeopleQuery,
     selectedIds: [personId ?? ''],
-    filters: [
+    filters: queryFilters,
-      {
-        fieldName: 'firstName',
-        filter: relationPickerSearchFilter,
-      },
-      {
-        fieldName: 'lastName',
-        filter: relationPickerSearchFilter,
-      },
-    ],
     mappingFunction: (person) => ({
       entityType: Entity.Person,
       id: person.id,

front/src/modules/people/hooks/useFilteredSearchPeopleQuery.ts

@@ -16,11 +16,7 @@ export function useFilteredSearchPeopleQuery({
     queryHook: useSearchPeopleQuery,
     filters: [
       {
-        fieldName: 'firstName',
+        fieldNames: ['firstName', 'lastName'],
-        filter: searchFilter,
-      },
-      {
-        fieldName: 'lastName',
         filter: searchFilter,
       },
     ],

front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts

@@ -26,7 +26,7 @@ type ExtractEntityTypeFromQueryResponse<T> = T extends {
   ? U
   : never;
 
-type SearchFilter = { fieldName: string; filter: string | number };
+type SearchFilter = { fieldNames: string[]; filter: string | number };
 
 const DEFAULT_SEARCH_REQUEST_LIMIT = 10;
 
@@ -87,12 +87,18 @@ export function useFilteredSearchEntityQuery<
       } as QueryVariables,
     });
 
-  const searchFilterByField = filters.map(({ fieldName, filter }) => ({
+  const searchFilter = filters.map(({ fieldNames, filter }) => {
-    [fieldName]: {
+    return {
-      contains: `%${filter}%`,
+      OR: fieldNames.map((fieldName) => ({
-      mode: QueryMode.Insensitive,
+        [fieldName]: {
-    },
+          contains: `%${filter}%`,
-  }));
+          mode: QueryMode.Insensitive,
+        },
+      })),
+    };
+  });
+
+  console.log(searchFilter);
 
   const {
     loading: filteredSelectedEntitiesLoading,
@@ -102,7 +108,7 @@ export function useFilteredSearchEntityQuery<
       where: {
         AND: [
           {
-            OR: searchFilterByField,
+            AND: searchFilter,
           },
           {
             id: {
@@ -117,30 +123,13 @@ export function useFilteredSearchEntityQuery<
     } as QueryVariables,
   });
 
-  const filterEntitesBy = filterByFields
-    ? filterByFields.map((field) => {
-        const extractedValues: Record<string, any> = {};
-
-        for (const key in field) {
-          extractedValues[key] = {
-            equals: field[key],
-          };
-        }
-
-        return extractedValues;
-      })
-    : [];
-
   const { loading: entitiesToSelectLoading, data: entitiesToSelectData } =
     queryHook({
       variables: {
         where: {
           AND: [
             {
-              OR: filterEntitesBy,
+              AND: searchFilter,
-            },
-            {
-              OR: searchFilterByField,
             },
             {
               id: {

front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx

@@ -28,11 +28,7 @@ export function FilterDropdownUserSearchSelect({
     queryHook: useSearchUserQuery,
     filters: [
       {
-        fieldName: 'firstName',
+        fieldNames: ['firstName', 'lastName'],
-        filter: filterDropdownSearchInput,
-      },
-      {
-        fieldName: 'lastName',
         filter: filterDropdownSearchInput,
       },
     ],

front/src/modules/users/components/UserPicker.tsx

@@ -31,11 +31,7 @@ export function UserPicker({
     queryHook: useSearchUserQuery,
     filters: [
       {
-        fieldName: 'firstName',
+        fieldNames: ['firstName', 'lastName'],
-        filter: relationPickerSearchFilter,
-      },
-      {
-        fieldName: 'lastName',
         filter: relationPickerSearchFilter,
       },
     ],