@appcorp/fusion-storybook 0.1.76 → 0.1.78

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

@@ -115,7 +115,7 @@ export declare const useClassModule: () => {
     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/class/context.js

@@ -272,12 +272,19 @@ export const useClassModule = () => {
             payload: { drawer: CLASS_DRAWER.MORE_ACTIONS_DRAWER },
         });
     }, [dispatch]);
-    const handlePageChange = useCallback((page) => {
+    const handlePageChange = useCallback((pageOrEvent) => {
+        // The factory passes handlePageChange directly as the Next button's onClick
+        // handler (receiving a MouseEvent), but wraps Previous as () => handlePageChange(currentPage - 1).
+        // We detect which case we're in: a valid number means an explicit page target
+        // (Previous path); anything else means "advance to next page".
+        const page = typeof pageOrEvent === "number" && !isNaN(pageOrEvent)
+            ? pageOrEvent
+            : state.currentPage + 1;
         dispatch({
             type: CLASS_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: page },
         });
-    }, [dispatch]);
+    }, [dispatch, state.currentPage]);
     const handlePageLimitChange = useCallback((k, value) => {
         const val = Object.assign({}, value);
         dispatch({
@@ -317,9 +324,8 @@ export const useClassModule = () => {
             type: CLASS_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow();
         closeDrawer();
-    }, [dispatch, listFetchNow, closeDrawer]);
+    }, [dispatch, closeDrawer]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: CLASS_ACTION_TYPES.SET_FILTERS,
@@ -417,23 +423,37 @@ export const useClassModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Initial load + re-fetch on page/search/filter change via cache
+    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes
     useEffect(() => {
         if (!schoolId)
             return;
-        (async () => {
-            try {
-                const { count, items } = await getCachedClasses({ params: listParams });
-                dispatch({
-                    type: CLASS_ACTION_TYPES.SET_ITEMS,
-                    payload: { items: items || [], count: count || 0 },
-                });
-            }
-            catch (_a) {
-                showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-            }
-        })();
-    }, [dispatch, listParams, schoolId, showToast, t]);
+        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 getCachedClasses({
+                        params: listParams,
+                    });
+                    dispatch({
+                        type: CLASS_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
+            listFetchNow();
+        }
+    }, [dispatch, listFetchNow, listParams, schoolId, showToast, t]);
     // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.1.76",
+  "version": "0.1.78",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",