Skip to content

Commit c07c6dd

Browse files
Merge pull request #9575 from NutharaNR/u2-master-6170
[master] Bug fix in user list page navigation
2 parents a01d3c5 + 360d0ed commit c07c6dd

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

.changeset/itchy-swans-camp.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@wso2is/admin.users.v1": patch
3+
"@wso2is/console": patch
4+
---
5+
6+
Bug fixing in active page number calculation logic for navigating in user list.

features/admin.users.v1/pages/users.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,7 @@ const UsersPage: FunctionComponent<UsersPageInterface> = (
786786
showPagination={ true }
787787
totalPages={ resolveTotalPages() }
788788
totalListSize={ totalUsers }
789+
activePage={ resolveActivePage() }
789790
showTotalListSize={ !isTotalUserCountFeatureDisabled }
790791
paginationOptions={ {
791792
disableNextButton: !isNextPageAvailable,
@@ -1053,6 +1054,14 @@ const UsersPage: FunctionComponent<UsersPageInterface> = (
10531054
setIsInvitationStatusOptionChanged(true);
10541055
};
10551056

1057+
const resolveActivePage = (): number => {
1058+
/**
1059+
* Calculate the current active page based on listOffset and listItemLimit.
1060+
* This ensures pagination component displays the correct page number.
1061+
*/
1062+
return Math.floor((listOffset - 1) / listItemLimit) + 1;
1063+
};
1064+
10561065
const resolveTotalPages = (): number => {
10571066

10581067
/**

0 commit comments

Comments
 (0)