Merge pull request #6911 from dasuni-30/fix/26391

Fix something went wrong issue in administrator listing
wso2 · Sep 23, 2024 · a0e4df9 · a0e4df9
2 parents c33f5c8 + c6eef75
commit a0e4df9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/.changeset/tricky-trainers-remain.md b/.changeset/tricky-trainers-remain.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.administrators.v1": patch
+---
+
+Fix something went wrong issue in administrator listing
diff --git a/features/admin.administrators.v1/pages/administrators.tsx b/features/admin.administrators.v1/pages/administrators.tsx
@@ -170,6 +170,8 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
     const [ searchInternalAdminQuery, setSearchInternalAdminQuery ] = useState<string>("");
     const [ listOffset, setListOffset ] = useState<number>(0);
     const [ listItemLimit, setListItemLimit ] = useState<number>(UIConstants.DEFAULT_RESOURCE_LIST_ITEM_LIMIT);
+    const [ modifiedLimit, setModifiedLimit ] = useState<number>(UIConstants.DEFAULT_RESOURCE_LIST_ITEM_LIMIT
+        + TEMP_RESOURCE_LIST_ITEM_LIMIT_OFFSET);
     const [ listItemAdditionalLimit, setListItemAdditionalLimit ] = useState<number>(0);
     const [ currentActivePage, setCurrentActivePage ] = useState<number>(0);
     const [ triggerClearQuery, setTriggerClearQuery ] = useState<boolean>(false);
@@ -217,10 +219,6 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
     const organizationName: string = store.getState().auth.tenantDomain;
 
     const eventPublisher: EventPublisher = EventPublisher.getInstance();
-
-    const modifiedLimit: number = useMemo(() => {
-        return listItemLimit + TEMP_RESOURCE_LIST_ITEM_LIMIT_OFFSET;
-    }, [ listItemLimit ]);
     // Excluding groups and roles from getUserList API call to improve performance.
     const excludedAttributes: string = UserManagementConstants.GROUPS_ATTRIBUTE;
 
@@ -245,7 +243,7 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
         error: adminUserListFetchRequestError,
         mutate: mutateAdminUserListFetchRequest
     } = useUsersList(
-        modifiedLimit + listItemAdditionalLimit,
+        modifiedLimit,
         listOffset + TEMP_RESOURCE_LIST_ITEM_LIMIT_OFFSET,
         (
             searchQuery === ""
@@ -664,7 +662,7 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
 
             const moderated: UserListInterface = cloneDeep(list);
 
-            if (moderated.Resources?.length === requestedLimit) {
+            if (moderated.Resources?.length > listItemLimit) {
                 moderated.Resources?.splice(-1, popCount);
                 setIsGuestUsersNextPageAvailable(true);
             } else {
@@ -684,9 +682,14 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
 
         // Check if clonedUserList length is less than the requested limit.
         // If so, fetch the next page.
-        if (clonedUserListDeficit > 0 && usersList?.itemsPerPage >= modifiedLimit) {
+        if (
+            clonedUserListDeficit > 0
+            && usersList?.itemsPerPage >= modifiedLimit
+            && usersList?.totalResults >= modifiedLimit
+        ) {
             // Fetch the next page.
-            setListItemAdditionalLimit(clonedUserListDeficit);
+            setModifiedLimit(modifiedLimit + clonedUserListDeficit);
+            setListItemAdditionalLimit(usersList?.Resources?.length - clonedUserList.Resources?.length);
             moderatedUsersList = moderateUsersList(
                 clonedUserList, modifiedLimit - clonedUserListDeficit, TEMP_RESOURCE_LIST_ITEM_LIMIT_OFFSET);
         } else {
@@ -857,6 +860,7 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
         if (currentActivePage > dataActivePage) {
             // When going back, we need to do not need to offset for the additional items.
             setListOffset((dataActivePage - 1) * listItemLimit);
+            setModifiedLimit(listItemLimit + TEMP_RESOURCE_LIST_ITEM_LIMIT_OFFSET);
         } else {
             // When going forward, we need to offset for the additional items requested if any.
             setListOffset(((dataActivePage - 1) * listItemLimit) + listItemAdditionalLimit);