Complete useFilteredSearchQuery refactoring (#1531)

Complete useFilteredSearchQuery ref actoring
2023-09-10 17:07:05 -07:00
parent bcbf303364
commit c808eeca79
7 changed files with 35 additions and 57 deletions
--- a/front/src/modules/people/components/PeoplePicker.tsx
+++ b/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: [
-      {
-        fieldName: 'firstName',
-        filter: relationPickerSearchFilter,
-      },
-      {
-        fieldName: 'lastName',
-        filter: relationPickerSearchFilter,
-      },
-    ],
+    filters: queryFilters,
    mappingFunction: (person) => ({
      entityType: Entity.Person,
      id: person.id,