Refactor useFilteredSearchEntityQuery to accept multiple filters (#1526)

* refactoring useFilteredSearchEntityQuery

* refactor with filter addition

---------

Co-authored-by: Charles Bochet <charlesBochet@users.noreply.github.com>
This commit is contained in:
Aditya Pimpalkar
2023-09-11 00:12:16 +01:00
committed by GitHub
parent b6eb280639
commit bcbf303364
7 changed files with 78 additions and 41 deletions

View File

@ -34,8 +34,16 @@ export function PeoplePicker({
const people = useFilteredSearchEntityQuery({
queryHook: useSearchPeopleQuery,
selectedIds: [personId ?? ''],
searchFilter: relationPickerSearchFilter,
filterByFields: [{ companyId: companyId ?? '' }],
filters: [
{
fieldName: 'firstName',
filter: relationPickerSearchFilter,
},
{
fieldName: 'lastName',
filter: relationPickerSearchFilter,
},
],
mappingFunction: (person) => ({
entityType: Entity.Person,
id: person.id,
@ -44,8 +52,7 @@ export function PeoplePicker({
avatarUrl: person.avatarUrl ?? '',
}),
orderByField: 'firstName',
searchOnFields: ['firstName', 'lastName'],
excludePersonIds,
excludeEntityIds: excludePersonIds,
});
async function handleEntitySelected(

View File

@ -14,7 +14,16 @@ export function useFilteredSearchPeopleQuery({
}) {
return useFilteredSearchEntityQuery({
queryHook: useSearchPeopleQuery,
searchOnFields: ['firstName', 'lastName'],
filters: [
{
fieldName: 'firstName',
filter: searchFilter,
},
{
fieldName: 'lastName',
filter: searchFilter,
},
],
orderByField: 'lastName',
selectedIds: selectedIds,
mappingFunction: (entity) =>
@ -25,7 +34,6 @@ export function useFilteredSearchPeopleQuery({
avatarUrl: entity.avatarUrl,
avatarType: 'rounded',
} as ActivityTargetableEntityForSelect),
searchFilter,
limit,
});
}