@appcorp/fusion-storybook 0.1.64 → 0.1.66

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

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

package/base-modules/admission/context.js

@@ -18,7 +18,9 @@
  * - `ADMISSION_DRAWER` — drawer type constants
  * - `useAdmissionModule()` — hook that returns state, dispatch, and handlers
  */
-import { useCallback, useEffect, useMemo } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useTheme } from "next-themes";
+import { useTranslations } from "next-intl";
 import { validateForm, isCreatedOrUpdated, API_METHODS, fetchData, } from "@react-pakistan/util-functions";
 import { formatCnic } from "@react-pakistan/util-functions/general/cnic-formatter";
 import { formatPhone } from "@react-pakistan/util-functions/general/format-phone";
@@ -28,7 +30,6 @@ import { createGenericModule } from "@react-pakistan/util-functions/factory/gene
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { ADMISSION_STATUS, GENDER, } from "../../type";
-import { useTranslations } from "next-intl";
 import { ADMISSION_API_ROUTES, pageLimit } from "./constants";
 import { admissionFormValidation } from "./validate";
 import { getCachedAdmissions, invalidateAdmissionsCache } from "./cache";
@@ -39,7 +40,7 @@ import { invalidateFamilyMembersCache } from "../family-member/cache";
 import { invalidateStudentProfilesCache } from "../student-profile/cache";
 import { Filter, Plus } from "lucide-react";
 // ============================================================================
-// DRAWER TYPES
+// 1.1 DRAWER TYPES
 // ============================================================================
 export const ADMISSION_DRAWER = {
     FILTER_DRAWER: DRAWER_TYPES.FILTER_DRAWER,
@@ -48,7 +49,7 @@ export const ADMISSION_DRAWER = {
     VIEW_DRAWER: DRAWER_TYPES.VIEW_DRAWER,
 };
 // ============================================================================
-// CONFIGURATION
+// 1.2 MODULE CONFIGURATION
 // ============================================================================
 const admissionConfig = {
     name: "Admission",
@@ -121,125 +122,133 @@ const admissionConfig = {
     drawerTypes: DRAWER_TYPES,
 };
 // ============================================================================
-// CREATE ADMISSION MODULE
+// 1.3 CREATE ADMISSION MODULE
 // ============================================================================
 export const { actionTypes: ADMISSION_ACTION_TYPES, config: admissionModuleConfig, initialState: initialAdmissionState, Provider: AdmissionProvider, reducer: admissionReducer, useContext: useAdmissionContext, } = createGenericModule(admissionConfig);
 // ============================================================================
-// ENHANCED ADMISSION HOOK WITH API INTEGRATION
+// 1.4 ENHANCED ADMISSION HOOK WITH API INTEGRATION
 // ============================================================================
 export const useAdmissionModule = () => {
     var _a, _b, _c, _d, _e, _f;
+    // ============================================================================
+    // 1.4.1 STATE & CORE HOOKS
+    // ============================================================================
     const context = useAdmissionContext();
     const { dispatch } = context;
+    const state = context.state;
     const t = useTranslations("admission");
+    const { theme } = useTheme();
     const workspace = getCachedWorkspaceSync();
-    const debouncedQuery = useDebounce(context.state.searchQuery, 800);
+    const listFetchNowRef = useRef(null);
+    const debouncedQuery = useDebounce(state.searchQuery, 800);
     // ============================================================================
-    // API PARAMETERS
+    // 1.4.2 API PARAMETERS
     // ============================================================================
     const listParams = useMemo(() => {
         var _a;
-        return (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ currentPage: context.state.currentPage, pageLimit: context.state.pageLimit, schoolId: ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "" }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (context.state.filterEnabled !== undefined
-            ? { filterEnabled: String(context.state.filterEnabled) }
-            : {})), (context.state.filterAdmissionStatus
-            ? { filterAdmissionStatus: context.state.filterAdmissionStatus }
-            : {})), (context.state.filterStartDate
-            ? { filterStartDate: context.state.filterStartDate }
-            : {})), (context.state.filterEndDate
-            ? { filterEndDate: context.state.filterEndDate }
-            : {})));
+        return (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId: ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "" }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (state.filterEnabled !== undefined
+            ? { filterEnabled: String(state.filterEnabled) }
+            : {})), (state.filterAdmissionStatus
+            ? { filterAdmissionStatus: state.filterAdmissionStatus }
+            : {})), (state.filterStartDate
+            ? { filterStartDate: state.filterStartDate }
+            : {})), (state.filterEndDate ? { filterEndDate: state.filterEndDate } : {})));
     }, [
-        context.state.currentPage,
-        context.state.filterAdmissionStatus,
-        context.state.filterEnabled,
-        context.state.filterEndDate,
-        context.state.filterStartDate,
-        context.state.pageLimit,
+        state.currentPage,
+        state.filterAdmissionStatus,
+        state.filterEnabled,
+        state.filterEndDate,
+        state.filterStartDate,
+        state.pageLimit,
         debouncedQuery,
         (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id,
     ]);
     const updateParams = useMemo(() => {
         var _a, _b, _c, _d;
         return ({
-            address: context.state.address || "",
-            admissionNotes: context.state.admissionNotes || "",
-            admissionStatus: context.state.status || ADMISSION_STATUS.PENDING,
-            bForm: context.state.bForm || "",
-            city: context.state.city || "",
-            classForAdmission: context.state.classForAdmission || "",
-            country: context.state.country || "",
-            discountCode: context.state.discountCode || "",
-            dob: context.state.dob || null,
-            emergencyContact: context.state.emergencyContact || "",
-            enabled: (_a = context.state.enabled) !== null && _a !== void 0 ? _a : true,
-            fatherCnic: context.state.fatherCnic || "",
-            fatherFirstName: context.state.fatherFirstName || "",
-            fatherLastName: context.state.fatherLastName || "",
-            fatherMobile: context.state.fatherMobile || "",
-            fatherOccupation: context.state.fatherOccupation || "",
-            fatherOrganization: context.state.fatherOrganization || "",
-            firstName: context.state.firstName || "",
-            gender: context.state.gender || null,
-            hafiz: (_b = context.state.hafiz) !== null && _b !== void 0 ? _b : false,
-            id: context.state.id || "",
-            lastName: context.state.lastName || "",
-            motherCnic: context.state.motherCnic || "",
-            motherFirstName: context.state.motherFirstName || "",
-            motherLastName: context.state.motherLastName || "",
-            motherMobile: context.state.motherMobile || "",
-            notes: context.state.notes || "",
-            orphan: (_c = context.state.orphan) !== null && _c !== void 0 ? _c : false,
-            postalCode: context.state.postalCode || "",
-            previousSchool: context.state.previousSchool || "",
-            registrationCode: context.state.registrationCode || "",
+            address: state.address || "",
+            admissionNotes: state.admissionNotes || "",
+            admissionStatus: state.status || ADMISSION_STATUS.PENDING,
+            bForm: state.bForm || "",
+            city: state.city || "",
+            classForAdmission: state.classForAdmission || "",
+            country: state.country || "",
+            discountCode: state.discountCode || "",
+            dob: state.dob || null,
+            emergencyContact: state.emergencyContact || "",
+            enabled: (_a = state.enabled) !== null && _a !== void 0 ? _a : true,
+            fatherCnic: state.fatherCnic || "",
+            fatherFirstName: state.fatherFirstName || "",
+            fatherLastName: state.fatherLastName || "",
+            fatherMobile: state.fatherMobile || "",
+            fatherOccupation: state.fatherOccupation || "",
+            fatherOrganization: state.fatherOrganization || "",
+            firstName: state.firstName || "",
+            gender: state.gender || null,
+            hafiz: (_b = state.hafiz) !== null && _b !== void 0 ? _b : false,
+            id: state.id || "",
+            lastName: state.lastName || "",
+            motherCnic: state.motherCnic || "",
+            motherFirstName: state.motherFirstName || "",
+            motherLastName: state.motherLastName || "",
+            motherMobile: state.motherMobile || "",
+            notes: state.notes || "",
+            orphan: (_c = state.orphan) !== null && _c !== void 0 ? _c : false,
+            postalCode: state.postalCode || "",
+            previousSchool: state.previousSchool || "",
+            registrationCode: state.registrationCode || "",
             schoolId: ((_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id) || "",
-            siblings: context.state.siblings || "",
-            state: context.state.state || "",
+            siblings: state.siblings || "",
+            state: state.state || "",
         });
     }, [
-        context.state.address,
-        context.state.admissionNotes,
-        context.state.status,
-        context.state.bForm,
-        context.state.city,
-        context.state.classForAdmission,
-        context.state.country,
-        context.state.discountCode,
-        context.state.dob,
-        context.state.emergencyContact,
-        context.state.enabled,
-        context.state.fatherCnic,
-        context.state.fatherFirstName,
-        context.state.fatherLastName,
-        context.state.fatherMobile,
-        context.state.fatherOccupation,
-        context.state.fatherOrganization,
-        context.state.firstName,
-        context.state.gender,
-        context.state.hafiz,
-        context.state.id,
-        context.state.lastName,
-        context.state.motherCnic,
-        context.state.motherFirstName,
-        context.state.motherLastName,
-        context.state.motherMobile,
-        context.state.notes,
-        context.state.orphan,
-        context.state.postalCode,
-        context.state.previousSchool,
-        context.state.registrationCode,
-        context.state.siblings,
-        context.state.state,
+        state.address,
+        state.admissionNotes,
+        state.status,
+        state.bForm,
+        state.city,
+        state.classForAdmission,
+        state.country,
+        state.discountCode,
+        state.dob,
+        state.emergencyContact,
+        state.enabled,
+        state.fatherCnic,
+        state.fatherFirstName,
+        state.fatherLastName,
+        state.fatherMobile,
+        state.fatherOccupation,
+        state.fatherOrganization,
+        state.firstName,
+        state.gender,
+        state.hafiz,
+        state.id,
+        state.lastName,
+        state.motherCnic,
+        state.motherFirstName,
+        state.motherLastName,
+        state.motherMobile,
+        state.notes,
+        state.orphan,
+        state.postalCode,
+        state.previousSchool,
+        state.registrationCode,
+        state.siblings,
+        state.state,
         (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id,
     ]);
-    const byIdParams = useMemo(() => ({ id: context.state.id }), [context.state.id]);
-    const deleteParams = useMemo(() => ({ id: context.state.id }), [context.state.id]);
+    const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
+    const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
     // ============================================================================
-    // UTILITIES
+    // 1.4.3 UTILITIES
     // ============================================================================
-    const showToast = useCallback((message, variant) => {
-        generateThemeToast({ description: message, variant });
-    }, []);
+    const showToast = useCallback((description, variant) => {
+        generateThemeToast({
+            description,
+            theme: theme,
+            variant,
+        });
+    }, [theme]);
     const setField = useCallback((key, value) => {
         var _a, _b, _c;
         let formatted = value === null
@@ -275,9 +284,9 @@ export const useAdmissionModule = () => {
         });
     }, [dispatch]);
     // ============================================================================
-    // API CALLBACKS
+    // 1.4.4 API CALLBACKS
     // ============================================================================
-    const listCallback = ({ data, error }) => {
+    const listCallback = useCallback(({ data, error }) => {
         if (error) {
             showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
             return;
@@ -288,21 +297,22 @@ export const useAdmissionModule = () => {
                 payload: { items: data.items || [], count: data.count || 0 },
             });
         }
-    };
-    const updateCallback = ({ data, error }) => {
+    }, [dispatch, showToast, t]);
+    const updateCallback = useCallback(({ data, error }) => {
+        var _a;
         const isCreated = isCreatedOrUpdated(data);
         if (error) {
             showToast(isCreated ? t("messagesCreateFailed") : t("messagesUpdateFailed"), TOAST_VARIANT.ERROR);
             return;
         }
         if (data) {
-            showToast(t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             invalidateAdmissionsCache();
-            listFetchNow();
+            showToast(t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
+            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
-    };
-    const byIdCallback = ({ data, error }) => {
+    }, [resetFormAndCloseDrawer, showToast, t]);
+    const byIdCallback = useCallback(({ data, error }) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
         if (error) {
             showToast(t("messagesDetailsFetchFailed"), TOAST_VARIANT.ERROR);
@@ -365,22 +375,23 @@ export const useAdmissionModule = () => {
                 payload: { form: { aiAnalysis } },
             });
         }
-    };
-    const deleteCallback = ({ data, error }) => {
+    }, [dispatch, showToast, t, setField]);
+    const deleteCallback = useCallback(({ data, error }) => {
+        var _a;
         if (error) {
             showToast(t("messagesDeleteFailed"), TOAST_VARIANT.ERROR);
             return;
         }
         if (data) {
-            showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             invalidateAdmissionsCache();
-            listFetchNow();
+            showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
+            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
-    };
+    }, [showToast, t]);
     // ============================================================================
-    // API HOOKS
+    // 1.4.5 API HOOKS
     // ============================================================================
-    const { listFetchNow, listLoading, updateFetchNow, updateLoading, byIdFetchNow, deleteFetchNow, deleteLoading, byIdLoading, } = useModuleEntityV2({
+    const { byIdFetchNow, byIdLoading, deleteFetchNow, deleteLoading, listFetchNow, listLoading, updateFetchNow, updateLoading, } = useModuleEntityV2({
         byIdCallback,
         byIdParams,
         deleteCallback,
@@ -399,7 +410,7 @@ export const useAdmissionModule = () => {
         },
     });
     // ============================================================================
-    // HANDLERS
+    // 1.4.6 HANDLERS
     // ============================================================================
     const handleChange = useCallback((field, value) => {
         dispatch({
@@ -454,10 +465,15 @@ export const useAdmissionModule = () => {
             payload: { currentPage: page },
         });
     }, [dispatch]);
-    const handlePageLimitChange = useCallback((limit) => {
+    const handlePageLimitChange = useCallback((k, value) => {
+        const val = Object.assign({}, value);
         dispatch({
             type: ADMISSION_ACTION_TYPES.SET_PAGE_LIMIT,
-            payload: { pageLimit: limit },
+            payload: { pageLimit: Number(val.option) },
+        });
+        dispatch({
+            type: ADMISSION_ACTION_TYPES.SET_CURRENT_PAGE,
+            payload: { currentPage: 1 },
         });
     }, [dispatch]);
     const handleSearch = useCallback((query) => {
@@ -586,7 +602,7 @@ export const useAdmissionModule = () => {
         }
     }, [t, showToast, listFetchNow]);
     // ============================================================================
-    // NETWORK ACTIONS
+    // 1.4.7 NETWORK ACTIONS
     // ============================================================================
     const handleAnalyze = useCallback(async (row) => {
         var _a, _b, _c;
@@ -725,7 +741,7 @@ export const useAdmissionModule = () => {
         (_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id,
     ]);
     // ============================================================================
-    // HEADER & ROW ACTIONS
+    // 1.4.8 HEADER & ROW ACTIONS
     // ============================================================================
     const hasGeminiSecrets = Boolean(((_e = workspace === null || workspace === void 0 ? void 0 : workspace.secrets) === null || _e === void 0 ? void 0 : _e.GEMINI_API_KEY) && ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.secrets) === null || _f === void 0 ? void 0 : _f.GEMINI_MODEL));
     const headerActions = useMemo(() => [
@@ -802,8 +818,9 @@ export const useAdmissionModule = () => {
         handleCloseDrawer();
     }, [dispatch, listFetchNow, handleCloseDrawer]);
     // ============================================================================
-    // EFFECTS
+    // 1.4.9 EFFECTS
     // ============================================================================
+    // Initial load + re-fetch on page/search/filter change via cache
     useEffect(() => {
         if (!(workspace === null || workspace === void 0 ? void 0 : workspace.id))
             return;
@@ -822,8 +839,12 @@ export const useAdmissionModule = () => {
             }
         })();
     }, [listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id, t, showToast, dispatch]);
+    // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    });
     // ============================================================================
-    // RETURN
+    // 1.4.10 RETURN
     // ============================================================================
     return Object.assign(Object.assign({}, context), { applyFilters,
         byIdLoading,

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

@@ -8,6 +8,9 @@
  *     based on drawer type so the component type produced by createGenericModulePage
  *     may change at runtime, but this is acceptable for drawer-based sizing)
  *   - permission guard
+ *
+ * Exported utilities:
+ * - `AdmissionPage` — root component that wraps with AdmissionProvider
  */
 import { FC } from "react";
 import { USER_ROLE } from "../../type";

package/base-modules/admission/page.js

@@ -1,5 +1,3 @@
-"use client";
-import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Admission Page Component
  *
@@ -10,7 +8,12 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *     based on drawer type so the component type produced by createGenericModulePage
  *     may change at runtime, but this is acceptable for drawer-based sizing)
  *   - permission guard
+ *
+ * Exported utilities:
+ * - `AdmissionPage` — root component that wraps with AdmissionProvider
  */
+"use client";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from "react";
 import { COMPONENT_TYPE } from "@appcorp/shadcn/components/enhanced-table";
 import { createGenericModulePage, } from "@react-pakistan/util-functions/factory/generic-component-factory";
@@ -83,9 +86,6 @@ const createAdmissionConfig = ({ cancelLabel, dispatch, drawer, drawerTitle, lab
 // STABLE PAGE COMPONENT (created once, outside render)
 // ============================================================================
 const GenericAdmissionPage = createGenericModulePage();
-// ============================================================================
-// INNER PAGE (requires AdmissionProvider context)
-// ============================================================================
 const AdmissionPageInner = (props) => {
     const context = useAdmissionModule();
     // Memoize config creation - destructure props to avoid object reference changes
@@ -133,4 +133,7 @@ const AdmissionPageInner = (props) => {
     }
     return (_jsx("div", { className: "p-4", children: _jsx(GenericAdmissionPage, { overrideConfig: admissionConfig, context: context, tableBodyCols: tableBodyCols }) }));
 };
+// ============================================================================
+// PAGE EXPORTS
+// ============================================================================
 export const AdmissionPage = (props) => (_jsx(AdmissionProvider, { children: _jsx(AdmissionPageInner, Object.assign({}, props)) }));

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

@@ -123,30 +123,10 @@ export declare const FamilyStateContextProvider: import("react").FC<{
     children: React.ReactNode;
 }>;
 export declare const useFamilyModule: () => {
-    state: {
-        items: FamilyBE[];
-        count: number;
-        currentPage: number;
-        pageLimit: number;
-        searchQuery: string;
-        disableSaveButton: boolean;
-        drawer: string | null;
-        address: string;
-        city: string;
-        country: string;
-        enabled: boolean;
-        errors: Record<string, string>;
-        familyCode: string;
-        filterEnabled: boolean | undefined;
-        id: string;
-        postalCode: string;
-        stateProvince: string;
-        userId: string;
-    };
-    dispatch: import("react").Dispatch<any>;
     applyFilters: () => void;
     byIdLoading: boolean;
     clearFilters: () => void;
+    clearSearch: () => void;
     deleteLoading: boolean;
     handleChange: (field: string, value: string | number | boolean | undefined | null) => void;
     handleCloseDrawer: () => void;
@@ -156,7 +136,7 @@ export declare const useFamilyModule: () => {
     handleFilters: () => void;
     handleMoreActions: () => void;
     handlePageChange: (page: number) => void;
-    handlePageLimitChange: (limit: number) => void;
+    handlePageLimitChange: (_k: string, value: object) => void;
     handleSearch: (query: string) => void;
     handleSubmit: () => void;
     handleView: (row?: TableRow) => void;
@@ -167,7 +147,29 @@ export declare const useFamilyModule: () => {
         order: number;
         icon: import("react").ForwardRefExoticComponent<Omit<import("lucide-react").LucideProps, "ref"> & import("react").RefAttributes<SVGSVGElement>>;
     }[];
+    listFetchNow: (url?: string, config?: import("@react-pakistan/util-functions/hooks/use-fetch").FetchConfig) => void;
     listLoading: boolean;
     rowActions: RowAction[];
     updateLoading: boolean;
+    state: {
+        items: FamilyBE[];
+        count: number;
+        currentPage: number;
+        pageLimit: number;
+        searchQuery: string;
+        disableSaveButton: boolean;
+        drawer: string | null;
+        address: string;
+        city: string;
+        country: string;
+        enabled: boolean;
+        errors: Record<string, string>;
+        familyCode: string;
+        filterEnabled: boolean | undefined;
+        id: string;
+        postalCode: string;
+        stateProvince: string;
+        userId: string;
+    };
+    dispatch: React.Dispatch<any>;
 };