@appcorp/fusion-storybook 0.1.79 → 0.1.81

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

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

package/base-modules/admission/context.js

@@ -239,6 +239,12 @@ export const useAdmissionModule = () => {
     ]);
     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.filterAdmissionStatus === undefined &&
+        state.filterStartDate === undefined &&
+        state.filterEndDate === undefined;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -459,11 +465,12 @@ export const useAdmissionModule = () => {
         });
     }, [dispatch]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: ADMISSION_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({
@@ -578,6 +585,7 @@ export const useAdmissionModule = () => {
         }
     }, [workspace, t, showToast]);
     const handleAddStudent = useCallback(async (row) => {
+        var _a;
         const tableRow = row;
         const { data, error } = await fetchData({
             url: "/api/v1/admit-student",
@@ -588,7 +596,7 @@ export const useAdmissionModule = () => {
             },
             body: JSON.stringify({ admissionId: tableRow === null || tableRow === void 0 ? void 0 : tableRow.id }),
         });
-        listFetchNow();
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         invalidateAdmissionsCache();
         invalidateFamiliesCache();
         invalidateFamilyMembersCache();
@@ -599,12 +607,12 @@ export const useAdmissionModule = () => {
         if (error) {
             showToast(t("messagesAdmitFailed"), TOAST_VARIANT.ERROR);
         }
-    }, [t, showToast, listFetchNow]);
+    }, [t, showToast]);
     // ============================================================================
     // 1.4.7 NETWORK ACTIONS
     // ============================================================================
     const handleAnalyze = useCallback(async (row) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const tableRow = row;
         if (!(tableRow === null || tableRow === void 0 ? void 0 : tableRow.id))
             return;
@@ -654,12 +662,12 @@ export const useAdmissionModule = () => {
             });
         }
         invalidateAdmissionsCache();
-        listFetchNow();
+        (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
         generateThemeToast({
-            description: `${t("messagesAnalyzeSuccess")} ${(_b = result === null || result === void 0 ? void 0 : result.score) !== null && _b !== void 0 ? _b : "N/A"} — ${(_c = result === null || result === void 0 ? void 0 : result.status) !== null && _c !== void 0 ? _c : ""}`,
+            description: `${t("messagesAnalyzeSuccess")} ${(_c = result === null || result === void 0 ? void 0 : result.score) !== null && _c !== void 0 ? _c : "N/A"} — ${(_d = result === null || result === void 0 ? void 0 : result.status) !== null && _d !== void 0 ? _d : ""}`,
             variant: TOAST_VARIANT.SUCCESS,
         });
-    }, [(_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id, t, showToast, byIdFetchNow, listFetchNow, dispatch]);
+    }, [(_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id, t, showToast, byIdFetchNow, dispatch]);
     const handleSubmit = useCallback(() => {
         dispatch({
             type: ADMISSION_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
@@ -813,35 +821,39 @@ export const useAdmissionModule = () => {
             type: ADMISSION_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         handleCloseDrawer();
-    }, [dispatch, listFetchNow, handleCloseDrawer]);
+    }, [dispatch, handleCloseDrawer]);
     // ============================================================================
     // 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 getCachedAdmissions({
-                    params: listParams,
-                });
-                dispatch({
-                    type: ADMISSION_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id, t, showToast, dispatch]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedAdmissions({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: ADMISSION_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, workspace === null || workspace === void 0 ? void 0 : workspace.id, t, showToast]);
     // 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/attendance/context.d.ts

@@ -129,7 +129,7 @@ export declare const useAttendanceModule: () => {
     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;

package/base-modules/attendance/context.js

@@ -234,12 +234,15 @@ export const useAttendanceModule = () => {
             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: ATTENDANCE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: page },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -388,32 +391,48 @@ export const useAttendanceModule = () => {
             type: ATTENDANCE_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 getCachedAttendances({
-                    params: listParams,
-                });
-                dispatch({
-                    type: ATTENDANCE_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 getCachedAttendances({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: ATTENDANCE_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/campus/context.d.ts

@@ -134,7 +134,7 @@ export declare const useCampusModule: () => {
     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;

package/base-modules/campus/context.js

@@ -279,12 +279,15 @@ export const useCampusModule = () => {
             payload: { drawer: CAMPUS_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: CAMPUS_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 useCampusModule = () => {
             type: CAMPUS_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: CAMPUS_ACTION_TYPES.SET_FILTERS,
@@ -413,27 +415,44 @@ export const useCampusModule = () => {
     // ============================================================================
     // 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 getCachedCampuses({
-                    params: listParams,
-                });
-                dispatch({
-                    type: CAMPUS_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), 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 getCachedCampuses({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: CAMPUS_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]);
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    });
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

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

@@ -28,7 +28,7 @@ export declare const CLASS_ACTION_TYPES: {
     drawer: string | null;
     errors: Record<string, string>;
     code: string;
-    description: string | null;
+    description: string;
     enabled: boolean;
     id: string;
     name: string;
@@ -44,7 +44,7 @@ export declare const CLASS_ACTION_TYPES: {
     drawer: string | null;
     errors: Record<string, string>;
     code: string;
-    description: string | null;
+    description: string;
     enabled: boolean;
     id: string;
     name: string;
@@ -62,7 +62,7 @@ export declare const CLASS_ACTION_TYPES: {
     drawer: string | null;
     errors: Record<string, string>;
     code: string;
-    description: string | null;
+    description: string;
     enabled: boolean;
     id: string;
     name: string;
@@ -78,7 +78,7 @@ export declare const CLASS_ACTION_TYPES: {
     drawer: string | null;
     errors: Record<string, string>;
     code: string;
-    description: string | null;
+    description: string;
     enabled: boolean;
     id: string;
     name: string;
@@ -94,7 +94,7 @@ export declare const CLASS_ACTION_TYPES: {
     drawer: string | null;
     errors: Record<string, string>;
     code: string;
-    description: string | null;
+    description: string;
     enabled: boolean;
     id: string;
     name: string;
@@ -141,7 +141,7 @@ export declare const useClassModule: () => {
         drawer: string | null;
         errors: Record<string, string>;
         code: string;
-        description: string | null;
+        description: string;
         enabled: boolean;
         id: string;
         name: string;

package/base-modules/class/context.js

@@ -57,7 +57,7 @@ const classConfig = {
         errors: {},
         // Form State
         code: "",
-        description: null,
+        description: "",
         enabled: true,
         id: "",
         name: "",

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

@@ -119,7 +119,7 @@ export declare const useCourseModule: () => {
     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;

package/base-modules/course/context.js

@@ -269,12 +269,15 @@ export const useCourseModule = () => {
             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: COURSE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: page },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -419,32 +422,48 @@ export const useCourseModule = () => {
             type: COURSE_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 getCachedCourses({
-                    params: listParams,
-                });
-                dispatch({
-                    type: COURSE_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 getCachedCourses({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: COURSE_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/discount-code/context.d.ts

@@ -120,7 +120,7 @@ export declare const useDiscountCodeModule: () => {
     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/discount-code/context.js

@@ -121,6 +121,10 @@ export const useDiscountCodeModule = () => {
     ]);
     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
     // ============================================================================
@@ -251,11 +255,12 @@ export const useDiscountCodeModule = () => {
         });
     }, [dispatch, state.currentPage]);
     const handlePageChange = useCallback((page) => {
+        const nextPage = typeof page === "number" ? page : state.currentPage + 1;
         dispatch({
             type: DISCOUNT_CODE_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({
@@ -323,9 +328,8 @@ export const useDiscountCodeModule = () => {
             type: DISCOUNT_CODE_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: DISCOUNT_CODE_ACTION_TYPES.SET_CURRENT_PAGE,
@@ -413,27 +417,32 @@ export const useDiscountCodeModule = () => {
     // ============================================================================
     // 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 getCachedDiscountCodes({
-                    params: listParams,
-                });
-                dispatch({
-                    type: DISCOUNT_CODE_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [dispatch, listParams, showToast, t, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
+        if (isDefaultListState) {
+            (async () => {
+                try {
+                    const { count, items } = await getCachedDiscountCodes({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: DISCOUNT_CODE_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, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
     // Keep ref in sync with latest listFetchNow (avoids stale closure in callbacks)
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
+    }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

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

@@ -129,7 +129,7 @@ export declare const useEnrollmentModule: () => {
     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;