@appcorp/fusion-storybook 0.1.78 → 0.1.80

package/base-modules/enrollment/context.js

@@ -242,12 +242,15 @@ export const useEnrollmentModule = () => {
             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: ENROLLMENT_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: page },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -392,32 +395,48 @@ export const useEnrollmentModule = () => {
             type: ENROLLMENT_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     // ==========================================================================
     // 1.4.9 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;
-        (async () => {
-            try {
-                const { count, items } = await getCachedEnrollments({
-                    params: listParams,
-                });
-                dispatch({
-                    type: ENROLLMENT_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            }
-        })();
+        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 getCachedEnrollments({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: ENROLLMENT_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesNetworkError"), 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);
+        }
     }, [listParams, dispatch, showToast, schoolId, t]);
     // ==========================================================================
     // 1.4.10 RETURN

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

@@ -199,7 +199,7 @@ export declare const useExpenseModule: () => {
     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/expense/context.js

@@ -155,6 +155,12 @@ export const useExpenseModule = () => {
     }), [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.filterCategory &&
+        !state.filterStatus;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -320,11 +326,12 @@ export const useExpenseModule = () => {
         });
     }, [dispatch]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: EXPENSE_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({
@@ -353,9 +360,8 @@ export const useExpenseModule = () => {
             type: EXPENSE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, closeDrawer, listFetchNow]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: EXPENSE_ACTION_TYPES.SET_CURRENT_PAGE,
@@ -448,27 +454,32 @@ export const useExpenseModule = () => {
     // 1.4.9 EFFECTS
     // ============================================================================
     useEffect(() => {
+        var _a;
         if (!schoolId)
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedExpenses({
-                    params: listParams,
-                });
-                dispatch({
-                    type: EXPENSE_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [listParams, dispatch, t, showToast, schoolId]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedExpenses({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: EXPENSE_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/family/context.d.ts

@@ -135,7 +135,7 @@ export declare const useFamilyModule: () => {
     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/family/context.js

@@ -133,6 +133,10 @@ export const useFamilyModule = () => {
     ]);
     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
     // ==========================================================================
@@ -307,11 +311,12 @@ export const useFamilyModule = () => {
         });
     }, [dispatch]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: FAMILY_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({
@@ -340,9 +345,8 @@ export const useFamilyModule = () => {
             type: FAMILY_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         handleCloseDrawer();
-    }, [dispatch, listFetchNow, handleCloseDrawer]);
+    }, [dispatch, handleCloseDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: FAMILY_ACTION_TYPES.SET_FILTERS,
@@ -428,27 +432,38 @@ export const useFamilyModule = () => {
     // 1.4.9 EFFECTS
     // ==========================================================================
     useEffect(() => {
-        var _a;
+        var _a, _b;
         if (!((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id))
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedFamilies({
-                    params: listParams,
-                });
-                dispatch({
-                    type: FAMILY_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [listParams, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id, dispatch, showToast, t]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedFamilies({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: FAMILY_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
+                }
+            })();
+            return;
+        }
+        (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
+    }, [
+        isDefaultListState,
+        listParams,
+        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id,
+        dispatch,
+        showToast,
+        t,
+    ]);
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
+    }, [listFetchNow]);
     // ==========================================================================
     // 1.4.10 RETURN
     // ==========================================================================

package/base-modules/family-member/context.d.ts

@@ -169,7 +169,7 @@ export declare const useFamilyMemberModule: () => {
     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/family-member/context.js

@@ -158,6 +158,11 @@ export const useFamilyMemberModule = () => {
     ]);
     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.familyId;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -306,11 +311,12 @@ export const useFamilyMemberModule = () => {
         setField(key, value);
     }, [dispatch, setField]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: FAMILY_MEMBER_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({
@@ -381,9 +387,8 @@ export const useFamilyMemberModule = () => {
             type: FAMILY_MEMBER_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         handleCloseDrawer();
-    }, [dispatch, listFetchNow, handleCloseDrawer]);
+    }, [dispatch, handleCloseDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: FAMILY_MEMBER_ACTION_TYPES.SET_FILTERS,
@@ -469,27 +474,38 @@ export const useFamilyMemberModule = () => {
     // 1.4.9 EFFECTS
     // ============================================================================
     useEffect(() => {
-        var _a;
+        var _a, _b;
         if (!((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id))
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedFamilyMembers({
-                    params: listParams,
-                });
-                dispatch({
-                    type: FAMILY_MEMBER_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [listParams, dispatch, showToast, t, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedFamilyMembers({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: FAMILY_MEMBER_ACTION_TYPES.SET_ITEMS,
+                        payload: { items: items || [], count: count || 0 },
+                    });
+                }
+                catch (_a) {
+                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
+                }
+            })();
+            return;
+        }
+        (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
+    }, [
+        dispatch,
+        isDefaultListState,
+        listParams,
+        showToast,
+        t,
+        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id,
+    ]);
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
+    }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

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

@@ -124,7 +124,7 @@ export declare const useFeeStructureModule: () => {
     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/fee-structure/context.js

@@ -103,6 +103,10 @@ export const useFeeStructureModule = () => {
     const updateParams = useMemo(() => (Object.assign(Object.assign(Object.assign({}, (state.id ? { id: state.id } : {})), (!state.id ? { schoolId } : {})), { amount: Number(state.amount), description: state.description || null, enabled: state.enabled, feeType: state.feeType, frequency: state.frequency || null, name: state.name })), [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
     // ============================================================================
@@ -265,11 +269,12 @@ export const useFeeStructureModule = () => {
         });
     }, [dispatch]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: FEE_STRUCTURE_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({
@@ -298,9 +303,8 @@ export const useFeeStructureModule = () => {
             type: FEE_STRUCTURE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: FEE_STRUCTURE_ACTION_TYPES.SET_FILTERS,
@@ -399,27 +403,32 @@ export const useFeeStructureModule = () => {
     // 1.4.9 EFFECTS
     // ============================================================================
     useEffect(() => {
+        var _a;
         if (!schoolId)
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedFeeStructures({
-                    params: listParams,
-                });
-                dispatch({
-                    type: FEE_STRUCTURE_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [listParams, dispatch, showToast, t, schoolId]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedFeeStructures({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: FEE_STRUCTURE_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, showToast, t, schoolId]);
     // 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/rbac/context.d.ts

@@ -126,7 +126,7 @@ export declare const useRbacModule: () => {
     handleFilters: () => void;
     handleMoreActions: () => void;
     handleNextClick: () => void;
-    handlePageChange: (page: number) => void;
+    handlePageChange: (page: number | unknown) => void;
     handlePageLimitChange: (k: string, value: object) => void;
     handlePreviousClick: () => void;
     handleSearch: (query: string) => void;

package/base-modules/rbac/context.js

@@ -104,6 +104,7 @@ export const useRbacModule = () => {
     }), [state.id, state.name, state.description]);
     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;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -236,11 +237,12 @@ export const useRbacModule = () => {
         });
     }, [dispatch, state.currentPage]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: RBAC_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({
@@ -314,9 +316,8 @@ export const useRbacModule = () => {
             type: RBAC_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow === null || listFetchNow === void 0 ? void 0 : listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: RBAC_ACTION_TYPES.SET_CURRENT_PAGE,
@@ -468,26 +469,29 @@ export const useRbacModule = () => {
     // ============================================================================
     // Initial load + re-fetch on page/search change via cache
     useEffect(() => {
-        (async () => {
-            try {
-                const { count, items } = await getCachedRoles({
-                    params: listParams,
-                });
-                dispatch({
-                    type: RBAC_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [dispatch, listParams, showToast, t]);
+        var _a;
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedRoles({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: RBAC_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, showToast, t]);
     // Sync listFetchNow into ref so callbacks can trigger re-fetch
     useEffect(() => {
-        if (listFetchNow) {
-            listFetchNowRef.current = listFetchNow;
-        }
+        listFetchNowRef.current = listFetchNow;
     }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN

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

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