From d577a21a9a8ec55e81627029aa5f90d1e74c4687 Mon Sep 17 00:00:00 2001 From: Anik Ghosh Date: Mon, 31 Jan 2022 14:26:19 +0530 Subject: [PATCH] user dashboard pagination bug removed --- dashboard/src/pages/Users.tsx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dashboard/src/pages/Users.tsx b/dashboard/src/pages/Users.tsx index 3d47dd3..e632a5c 100644 --- a/dashboard/src/pages/Users.tsx +++ b/dashboard/src/pages/Users.tsx @@ -116,8 +116,19 @@ export default function Users() { if (data?._users) { const { pagination, users } = data._users; const maxPages = getMaxPages(pagination); - setPaginationProps({ ...paginationProps, ...pagination, maxPages }); - setUserList(users); + if (users && users.length > 0) { + setPaginationProps({ ...paginationProps, ...pagination, maxPages }); + setUserList(users); + } else { + if (paginationProps.page !== 1) { + setPaginationProps({ + ...paginationProps, + ...pagination, + maxPages, + page: 1, + }); + } + } } setLoading(false); }; @@ -230,7 +241,7 @@ export default function Users() { ); })} - {paginationProps.maxPages > 1 && ( + {(paginationProps.maxPages > 1 || paginationProps.total >= 5) && (