@appcorp/fusion-storybook 0.2.39 → 0.2.42

package/base-modules/campus/context.js

@@ -85,8 +85,8 @@ export const useCampusModule = () => {
     const { theme } = useTheme();
     const workspace = getCachedWorkspaceSync();
     const schoolId = ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "";
-    const listFetchNowRef = useRef(null);
     const debouncedQuery = useDebounce(state.searchQuery, 800);
+    const listFetchNowRef = useRef(null);
     // ============================================================================
     // 1.4.2 API PARAMETERS
     // ============================================================================
@@ -191,7 +191,6 @@ export const useCampusModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            // invalidateCampusesCache();
             showToast(isCreated ? t("messagesCreateSuccess") : t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -219,7 +218,6 @@ export const useCampusModule = () => {
             return;
         }
         if (data) {
-            // invalidateCampusesCache();
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -399,19 +397,19 @@ export const useCampusModule = () => {
         {
             enabled: false,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 0,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 1,
         },
         {
             enabled: true,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAdd"),
+            label: t("actionsButtonAdd"),
             order: 2,
         },
     ], [handleCreate, handleFilters, handleMoreActions, t]);
@@ -419,68 +417,39 @@ export const useCampusModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === false,
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
             variant: "destructive",
         },
         {
             enabled: false,
             handleOnClick: toggleStatus,
-            label: t("actionRowToggleStatus"),
+            label: t("actionsButtonToggleStatus"),
             order: 4,
         },
     ], [handleDelete, handleEdit, handleView, t, toggleStatus]);
     // ============================================================================
     // 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(() => {
-        listFetchNow();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
+    useEffect(() => {
+        var _a;
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
     }, [listParams]);
-    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
-    // useEffect(() => {
-    //   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 getCachedCampuses({
-    //           params: listParams,
-    //         });
-    //         dispatch({
-    //           type: CAMPUS_ACTION_TYPES.SET_ITEMS,
-    //           payload: { items: items || [], count: count || 0 },
-    //         });
-    //       } catch {
-    //         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.
-    //     listFetchNowRef.current?.();
-    //   }
-    // }, [dispatch, listParams, schoolId, showToast, t]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/class/cache.js

@@ -22,7 +22,6 @@ export const getCachedClasses = ({ params, }) => getCachedData({
     params,
     headers: {
         "Content-Type": "application/json",
-        // "x-api-token": process.env.NEXT_PUBLIC_API_KEY!,
     },
 });
 export const getCachedClassById = (classId) => getCachedItemById(LS_KEYS.CLASSES, classId);

package/base-modules/class/context.js

@@ -28,7 +28,6 @@ import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-com
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { CLASS_API_ROUTES, pageLimit } from "./constants";
 import { classFormValidation } from "./validate";
-import { getCachedClasses, invalidateClassesCache } from "./cache";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 // ============================================================================
 // 1.1 DRAWER TYPES
@@ -159,7 +158,6 @@ export const useClassModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateClassesCache();
             showToast(isCreated ? t("messagesCreateSuccess") : t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -184,7 +182,6 @@ export const useClassModule = () => {
             return;
         }
         if (data) {
-            invalidateClassesCache();
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -378,19 +375,19 @@ export const useClassModule = () => {
         {
             enabled: true,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 0,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 1,
         },
         {
             enabled: true,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAdd"),
+            label: t("actionsButtonAdd"),
             order: 2,
         },
     ], [handleCreate, handleFilters, handleMoreActions, t]);
@@ -398,74 +395,39 @@ export const useClassModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === false,
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
             variant: "destructive",
         },
         {
             enabled: false,
             handleOnClick: toggleStatus,
-            label: t("actionRowToggleStatus"),
+            label: t("actionsButtonToggleStatus"),
             order: 4,
         },
     ], [handleDelete, handleEdit, handleView, t, toggleStatus]);
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Always keep the ref current so the main effect can call the latest listFetchNow
-    // without including it in the dependency array (listFetchNow changes identity every
-    // render because useModuleEntityV2 passes an inline headers object to useFetch).
-    // Declared first so the ref is populated before the fetch effect runs.
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
-    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
-    // listFetchNow is intentionally excluded from deps — it changes every render due to the
-    // inline headers object in useModuleEntityV2. We call it via the stable ref instead.
+    }, [listFetchNow]);
     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 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.
-            // 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]);
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [listParams]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/class/more-actions.js

@@ -7,7 +7,6 @@ import converter from "json-2-csv";
 import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
 import { CLASS_API_ROUTES, pageLimit } from "./constants";
-import { invalidateClassesCache } from "./cache";
 import { CLASS_ACTION_TYPES, useClassContext } from "./context";
 import { useRef, useEffect, useCallback } from "react";
 const workspace = getCachedWorkspaceSync();
@@ -165,7 +164,6 @@ export const ClassMoreActions = () => {
                 else {
                     showSuccessToast("Bulk operation completed successfully");
                 }
-                invalidateClassesCache();
                 const schoolId = ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id) || "";
                 fetch(`${CLASS_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {

package/base-modules/course/context.js

@@ -25,7 +25,6 @@ import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { COURSE_API_ROUTES, pageLimit } from "./constants";
-import { getCachedCourses, invalidateCoursesCache } from "./cache";
 import { courseFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { getCachedWorkspaceSync } from "../workspace/cache";
@@ -167,7 +166,6 @@ export const useCourseModule = () => {
             showToast(isCreatedOrUpdated(data)
                 ? t("messagesCourseCreated")
                 : t("messagesCourseUpdated"), TOAST_VARIANT.SUCCESS);
-            invalidateCoursesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -247,7 +245,6 @@ export const useCourseModule = () => {
         }
         if (data) {
             showToast(t("messagesCourseDeleted"), TOAST_VARIANT.SUCCESS);
-            invalidateCoursesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -456,44 +453,13 @@ export const useCourseModule = () => {
     // ==========================================================================
     // 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.
+    }, [listFetchNow]);
     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 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]);
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [listParams]);
     // ==========================================================================
     // 1.4.10 RETURN
     // ==========================================================================