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:
@ -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(
|
||||
|
||||
@ -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,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user