@appcorp/fusion-storybook 0.1.78 → 0.1.80

package/base-modules/section/context.js

@@ -28,7 +28,7 @@ import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-com
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { SECTION_API_ROUTES, pageLimit } from "./constants";
 import { sectionFormValidation } from "./validate";
-import { getCachedSections, getCachedSectionsSync, invalidateSectionsCache, isSectionsCacheStale, } from "./cache";
+import { getCachedSections, invalidateSectionsCache } from "./cache";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 // ============================================================================
 // 1.1 DRAWER TYPES
@@ -268,12 +268,15 @@ export const useSectionModule = () => {
             payload: { drawer: SECTION_DRAWER.MORE_ACTIONS_DRAWER },
         });
     }, [dispatch]);
-    const handlePageChange = useCallback((page) => {
+    const handlePageChange = useCallback((pageOrEvent) => {
+        const page = typeof pageOrEvent === "number" && !isNaN(pageOrEvent)
+            ? pageOrEvent
+            : state.currentPage + 1;
         dispatch({
             type: SECTION_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: page },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -313,9 +316,8 @@ export const useSectionModule = () => {
             type: SECTION_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: SECTION_ACTION_TYPES.SET_FILTERS,
@@ -413,19 +415,23 @@ export const useSectionModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Initial load + re-fetch on page/search/filter change via cache
+    // Keep the latest fetch function in a ref so the fetch effect can call it
+    // without depending on listFetchNow's unstable identity.
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    });
+    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
     useEffect(() => {
+        var _a;
         if (!schoolId)
             return;
-        const cachedData = getCachedSectionsSync();
-        if (cachedData && !isSectionsCacheStale()) {
-            const { count, items } = cachedData;
-            dispatch({
-                type: SECTION_ACTION_TYPES.SET_ITEMS,
-                payload: { items: items || [], count: count || 0 },
-            });
-        }
-        else {
+        const currentPage = Number(listParams.currentPage) || 1;
+        const currentPageLimit = Number(listParams.pageLimit) || pageLimit;
+        const isDefaultLoad = currentPage === 1 &&
+            currentPageLimit === pageLimit &&
+            !listParams.searchQuery &&
+            listParams.filterEnabled === undefined;
+        if (isDefaultLoad) {
             (async () => {
                 try {
                     const { count, items } = await getCachedSections({
@@ -441,11 +447,12 @@ export const useSectionModule = () => {
                 }
             })();
         }
+        else {
+            // Bypass cache for pagination, pageLimit, filter and search changes.
+            // Use ref to avoid the infinite-loop caused by listFetchNow's unstable identity.
+            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+        }
     }, [dispatch, listParams, schoolId, showToast, t]);
-    // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    });
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/student-fee/context.d.ts

@@ -184,7 +184,7 @@ export declare const useStudentFeeModule: () => {
     handleEdit: (row?: TableRow) => void;
     handleFilters: () => void;
     handleMoreActions: () => void;
-    handlePageChange: (page: number) => void;
+    handlePageChange: (page: number | unknown) => void;
     handlePageLimitChange: (k: string, value: object) => void;
     handleSearch: (query: string) => void;
     handleSubmit: () => void;

package/base-modules/student-fee/context.js

@@ -145,6 +145,11 @@ export const useStudentFeeModule = () => {
     }), [state, schoolId]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
+    const isDefaultListState = state.currentPage === 1 &&
+        state.pageLimit === pageLimit &&
+        !debouncedQuery &&
+        state.filterEnabled === undefined &&
+        !state.filterStatus;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -462,11 +467,12 @@ export const useStudentFeeModule = () => {
         }
     }, [dispatch, state]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
-            payload: { currentPage: page },
+            payload: { currentPage: nextPage },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const { option } = Object.assign({}, value);
         dispatch({
@@ -536,9 +542,8 @@ export const useStudentFeeModule = () => {
             type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, closeDrawer, listFetchNow]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
@@ -632,27 +637,32 @@ export const useStudentFeeModule = () => {
     // 1.4.9 EFFECTS
     // ============================================================================
     useEffect(() => {
+        var _a;
         if (!schoolId)
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedStudentFees({
-                    params: listParams,
-                });
-                dispatch({
-                    type: STUDENT_FEE_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [listParams, dispatch, showToast, t]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedStudentFees({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: STUDENT_FEE_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
+                }
+            })();
+            return;
+        }
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [dispatch, isDefaultListState, listParams, schoolId, showToast, t]);
     // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
+    }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/student-profile/context.d.ts

@@ -200,7 +200,7 @@ export declare const useStudentProfileModule: () => {
     handleEdit: (row?: TableRow) => void;
     handleFilters: () => void;
     handleMoreActions: () => void;
-    handlePageChange: (page: number) => void;
+    handlePageChange: (page: number | unknown) => void;
     handlePageLimitChange: (k: string, value: object) => void;
     handleReAdmitStudent: (row?: TableRow) => Promise<void>;
     handleSearch: (query: string) => void;

package/base-modules/student-profile/context.js

@@ -158,6 +158,12 @@ export const useStudentProfileModule = () => {
     ]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
+    const isDefaultListState = state.currentPage === 1 &&
+        state.pageLimit === pageLimit &&
+        !debouncedQuery &&
+        state.filterEnabled === undefined &&
+        !state.filterGender &&
+        !state.filterStatus;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -348,11 +354,12 @@ export const useStudentProfileModule = () => {
         });
     }, [dispatch]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: STUDENT_PROFILE_ACTION_TYPES.SET_CURRENT_PAGE,
-            payload: { currentPage: page },
+            payload: { currentPage: nextPage },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -392,9 +399,8 @@ export const useStudentProfileModule = () => {
             type: STUDENT_PROFILE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: STUDENT_PROFILE_ACTION_TYPES.SET_FILTERS,
@@ -433,6 +439,7 @@ export const useStudentProfileModule = () => {
         invalidateAdmissionsCache();
     }, [dispatch, t]);
     const handleReAdmitStudent = useCallback(async (row) => {
+        var _a;
         if (!confirm(t("areYouSureYouWantToReAdmitThisStudent")))
             return;
         const { data, error } = await fetchData({
@@ -444,7 +451,7 @@ export const useStudentProfileModule = () => {
             },
             body: JSON.stringify({ studentProfileId: row === null || row === void 0 ? void 0 : row.id }),
         });
-        listFetchNow();
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         invalidateStudentProfilesCache();
         invalidateFamiliesCache();
         invalidateFamilyMembersCache();
@@ -455,7 +462,7 @@ export const useStudentProfileModule = () => {
         if (error) {
             showToast(t("messagesReAdmitFailed"), TOAST_VARIANT.ERROR);
         }
-    }, [showToast, t, listFetchNow]);
+    }, [showToast, t]);
     // ============================================================================
     // 1.4.7 SUBMIT
     // ============================================================================
@@ -553,27 +560,32 @@ export const useStudentProfileModule = () => {
     // ============================================================================
     // Initial load + re-fetch on page/search/filter change via cache
     useEffect(() => {
+        var _a;
         if (!schoolId)
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedStudentProfiles({
-                    params: listParams,
-                });
-                dispatch({
-                    type: STUDENT_PROFILE_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [dispatch, listParams, schoolId, showToast, t]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedStudentProfiles({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: STUDENT_PROFILE_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
+                }
+            })();
+            return;
+        }
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [dispatch, isDefaultListState, listParams, schoolId, showToast, t]);
     // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
+    }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/subject/context.d.ts

@@ -114,8 +114,8 @@ export declare const useSubjectModule: () => {
     handleEdit: (row?: TableRow) => void;
     handleFilters: () => void;
     handleMoreActions: () => void;
-    handlePageChange: (page: number) => void;
-    handlePageLimitChange: (limit: number) => void;
+    handlePageChange: (pageOrEvent?: unknown) => void;
+    handlePageLimitChange: (k: string, value: object) => void;
     handleSearch: (query: string) => void;
     handleSubmit: () => void;
     handleView: (row?: TableRow) => void;

package/base-modules/subject/context.js

@@ -194,27 +194,6 @@ export const useSubjectModule = () => {
         }
     }, [showToast, t]);
     // ============================================================================
-    // INITIAL DATA LOADING (sync cache to prevent UI hanging)
-    // ============================================================================
-    useEffect(() => {
-        if (!schoolId)
-            return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedSubjects({
-                    params: listParams,
-                });
-                dispatch({
-                    type: SUBJECT_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [dispatch, listParams, schoolId, showToast, t]);
-    // ============================================================================
     // API HOOKS
     // ============================================================================
     const { listFetchNow, listLoading, updateFetchNow, updateLoading, byIdFetchNow, deleteFetchNow, deleteLoading, byIdLoading, } = useModuleEntityV2({
@@ -235,9 +214,6 @@ export const useSubjectModule = () => {
             "x-api-token": process.env.NEXT_PUBLIC_API_KEY,
         },
     });
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    });
     // ============================================================================
     // HANDLERS
     // ============================================================================
@@ -264,16 +240,24 @@ export const useSubjectModule = () => {
             payload: { key: field, value },
         });
     }, [dispatch]);
-    const handlePageChange = useCallback((page) => {
+    const handlePageChange = useCallback((pageOrEvent) => {
+        const page = typeof pageOrEvent === "number" && !isNaN(pageOrEvent)
+            ? pageOrEvent
+            : state.currentPage + 1;
         dispatch({
             type: SUBJECT_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: page },
         });
-    }, [dispatch]);
-    const handlePageLimitChange = useCallback((limit) => {
+    }, [dispatch, state.currentPage]);
+    const handlePageLimitChange = useCallback((k, value) => {
+        const val = Object.assign({}, value);
         dispatch({
             type: SUBJECT_ACTION_TYPES.SET_PAGE_LIMIT,
-            payload: { pageLimit: limit },
+            payload: { pageLimit: Number(val.option) },
+        });
+        dispatch({
+            type: SUBJECT_ACTION_TYPES.SET_CURRENT_PAGE,
+            payload: { currentPage: 1 },
         });
     }, [dispatch]);
     const handleCreate = useCallback(() => {
@@ -415,9 +399,49 @@ export const useSubjectModule = () => {
             type: SUBJECT_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
+    // ============================================================================
+    // EFFECTS
+    // ============================================================================
+    // Keep the latest fetch function in a ref so the fetch effect can call it
+    // without depending on listFetchNow's unstable identity.
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    });
+    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
+    useEffect(() => {
+        var _a;
+        if (!schoolId)
+            return;
+        const currentPage = Number(listParams.currentPage) || 1;
+        const currentPageLimit = Number(listParams.pageLimit) || pageLimit;
+        const isDefaultLoad = currentPage === 1 &&
+            currentPageLimit === pageLimit &&
+            !listParams.searchQuery &&
+            listParams.filterEnabled === undefined;
+        if (isDefaultLoad) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedSubjects({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: SUBJECT_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
+                }
+            })();
+        }
+        else {
+            // Bypass cache for pagination, pageLimit, filter and search changes.
+            // Use ref to avoid the infinite-loop caused by listFetchNow's unstable identity.
+            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+        }
+    }, [dispatch, listParams, schoolId, showToast, t]);
     // ============================================================================
     // RETURN
     // ============================================================================

package/base-modules/teacher/context.d.ts

@@ -195,7 +195,7 @@ export declare const useTeacherModule: () => {
     handleEdit: (row?: TableRow) => void;
     handleFilters: () => void;
     handleMoreActions: () => void;
-    handlePageChange: (page: number) => void;
+    handlePageChange: (page: number | unknown) => void;
     handlePageLimitChange: (k: string, value: object) => void;
     handleSearch: (query: string) => void;
     handleSubmit: () => void;

package/base-modules/teacher/context.js

@@ -143,6 +143,10 @@ export const useTeacherModule = () => {
     }), [state, schoolId]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
+    const isDefaultListState = state.currentPage === 1 &&
+        state.pageLimit === pageLimit &&
+        !debouncedQuery &&
+        state.filterEnabled === undefined;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -306,11 +310,12 @@ export const useTeacherModule = () => {
         });
     }, [dispatch]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: TEACHER_ACTION_TYPES.SET_CURRENT_PAGE,
-            payload: { currentPage: page },
+            payload: { currentPage: nextPage },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -350,9 +355,8 @@ export const useTeacherModule = () => {
             type: TEACHER_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: TEACHER_ACTION_TYPES.SET_FILTERS,
@@ -450,29 +454,32 @@ export const useTeacherModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Initial load + re-fetch on page/search/filter change via cache
     useEffect(() => {
+        var _a;
         if (!schoolId)
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedTeachers({
-                    params: listParams,
-                });
-                dispatch({
-                    type: TEACHER_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [dispatch, listParams, schoolId, showToast, t]);
-    // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedTeachers({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: TEACHER_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
+                }
+            })();
+            return;
+        }
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [dispatch, isDefaultListState, listParams, schoolId, showToast, t]);
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
+    }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/user/context.d.ts

@@ -125,7 +125,7 @@ export declare const useUserModule: () => {
     handleEdit: (row?: TableRow) => void;
     handleFilters: () => void;
     handleMoreActions: () => void;
-    handlePageChange: (page: number) => void;
+    handlePageChange: (page: number | unknown) => void;
     handlePageLimitChange: (k: string, value: object) => void;
     handleSearch: (query: string) => void;
     handleSubmit: () => Promise<void>;

package/base-modules/user/context.js

@@ -117,6 +117,10 @@ export const useUserModule = () => {
     }), [state, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
+    const isDefaultListState = state.currentPage === 1 &&
+        state.pageLimit === pageLimit &&
+        !debouncedQuery &&
+        state.filterEnabled === undefined;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -314,11 +318,12 @@ export const useUserModule = () => {
         });
     }, [dispatch]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: USER_ACTION_TYPES.SET_CURRENT_PAGE,
-            payload: { currentPage: page },
+            payload: { currentPage: nextPage },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -358,9 +363,8 @@ export const useUserModule = () => {
             type: USER_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: USER_ACTION_TYPES.SET_FILTERS,
@@ -550,27 +554,30 @@ export const useUserModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Initial load + re-fetch on page/search/filter change via cache
     useEffect(() => {
+        var _a;
         if (!(workspace === null || workspace === void 0 ? void 0 : workspace.id))
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedUsers({ params: listParams });
-                dispatch({
-                    type: USER_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [dispatch, listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id, showToast, t]);
-    // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedUsers({ params: listParams });
+                    dispatch({
+                        type: USER_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
+                }
+            })();
+            return;
+        }
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [dispatch, isDefaultListState, listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id, showToast, t]);
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
+    }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/workspace-user/context.d.ts

@@ -137,7 +137,7 @@ export declare const useWorkspaceUserModule: () => {
     handleEdit: () => void;
     handleFilters: () => void;
     handleMoreActions: () => void;
-    handlePageChange: (page: number) => void;
+    handlePageChange: (page: number | unknown) => void;
     handlePageLimitChange: (limit: number) => void;
     handleSearch: (query: string) => void;
     handleSubmit: () => void;