Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-07-26 13:48:33 +02:00
Code Issues Projects Releases Wiki Activity

fix: user search pagination (#997)

Browse Source
This commit is contained in:
Fredrik Strand Oseberg 2022-05-19 14:27:19 +02:00 committed by GitHub
parent 2e367b3a04
commit 1caf9a924c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/component/admin/users/UsersList/UsersList.tsx
View File

@ -54,8 +54,20 @@ const UsersList = ({ search }: IUsersListProps) => {
const ref = useLoading(loading); const ref = useLoading(loading);
const { filtered, setFilter } = useUsersFilter(users); const { filtered, setFilter } = useUsersFilter(users);
const { sorted, sort, setSort } = useUsersSort(filtered); const { sorted, sort, setSort } = useUsersSort(filtered);
const filterUsersByQueryPage = (user: IUser) => {
const fieldsToSearch = [
user.name ?? '',
user.username ?? user.email ?? '',
];
return fieldsToSearch.some(field => {
return field.toLowerCase().includes(search.toLowerCase());
});
};
// Filter users and reset pagination page when search is triggered
const { page, pages, nextPage, prevPage, setPageIndex, pageIndex } = const { page, pages, nextPage, prevPage, setPageIndex, pageIndex } =
usePagination(sorted, 50); usePagination(sorted, 50, filterUsersByQueryPage);
useEffect(() => { useEffect(() => {
setFilter(filter => ({ ...filter, query: search })); setFilter(filter => ({ ...filter, query: search }));

1
frontend/src/hooks/usePagination.ts
View File

@ -20,6 +20,7 @@ const usePagination = <T>(
} }
const result = paginate(dataToPaginate, limit); const result = paginate(dataToPaginate, limit);
setPageIndex(0);
setPaginatedData(result); setPaginatedData(result);
/* eslint-disable-next-line */ /* eslint-disable-next-line */
}, [JSON.stringify(data), limit]); }, [JSON.stringify(data), limit]);