@appcorp/fusion-storybook 0.3.90 → 0.3.92

package/base-modules/fee-structure/{context.d.ts → context/shared.d.ts}

@@ -1,11 +1,16 @@
-import { type RowAction, type TableRow } from "@appcorp/shadcn/components/enhanced-table";
-import { FeeStructureBE, FEE_TYPE } from "../../type";
+import { FeeStructureBE, FEE_TYPE } from "../../../type";
 export declare const FEE_STRUCTURE_DRAWER: {
     readonly FILTER_DRAWER: string;
     readonly FORM_DRAWER: string;
     readonly MORE_ACTIONS_DRAWER: string;
     readonly VIEW_DRAWER: string;
 };
+export interface FeeStructuresListResponse {
+    items: FeeStructureBE[];
+    count: number;
+    currentPage: number;
+    pageLimit: number;
+}
 export declare const FEE_STRUCTURE_ACTION_TYPES: {
     readonly RESET_FORM: "RESET_FORM";
     readonly SET_CURRENT_PAGE: "SET_CURRENT_PAGE";
@@ -116,55 +121,3 @@ export declare const FEE_STRUCTURE_ACTION_TYPES: {
     name: string;
     schoolId: string;
 }>;
-export declare const useFeeStructureModule: () => {
-    applyFilters: () => void;
-    byIdLoading: boolean;
-    clearFilters: () => void;
-    clearSearch: () => void;
-    closeDrawer: () => void;
-    deleteLoading: boolean;
-    handleChange: (field: string, value: string | number | boolean | FEE_TYPE | null | undefined) => void;
-    handleCreate: () => void;
-    handleDelete: (row?: TableRow) => void;
-    handleEdit: (row?: TableRow) => void;
-    handleFilters: () => void;
-    handleMoreActions: () => void;
-    handlePageChange: (page: number | unknown) => void;
-    handlePageLimitChange: (k: string, value: object) => void;
-    handleSearch: (query: string) => void;
-    handleSubmit: () => void;
-    handleView: (row?: TableRow) => void;
-    headerActions: {
-        enabled: boolean;
-        handleOnClick: () => void;
-        label: string;
-        order: number;
-    }[];
-    listFetchNow: (url?: string, config?: import("@react-pakistan/util-functions/hooks/use-fetch").FetchConfig) => void;
-    listLoading: boolean;
-    rowActions: RowAction[];
-    toggleStatus: (row?: TableRow) => void;
-    updateLoading: boolean;
-    handleCloseDrawer?: () => void;
-    state: {
-        items: FeeStructureBE[];
-        count: number;
-        currentPage: number;
-        pageLimit: number;
-        searchQuery: string;
-        disableSaveButton: boolean;
-        drawer: string | null;
-        amount: number;
-        classId: string | null;
-        description: string | null;
-        enabled: boolean;
-        errors: Record<string, string>;
-        feeType: FEE_TYPE;
-        filterEnabled: boolean | undefined;
-        frequency: string | null;
-        id: string;
-        name: string;
-        schoolId: string;
-    };
-    dispatch: React.Dispatch<any>;
-};

package/base-modules/fee-structure/context/shared.js

@@ -0,0 +1,47 @@
+"use client";
+import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
+import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
+import { FEE_TYPE } from "../../../type";
+import { pageLimit } from "../constants";
+// ============================================================================
+// 1.1 DRAWER TYPES
+// ============================================================================
+export const FEE_STRUCTURE_DRAWER = {
+    FILTER_DRAWER: DRAWER_TYPES.FILTER_DRAWER,
+    FORM_DRAWER: DRAWER_TYPES.FORM_DRAWER,
+    MORE_ACTIONS_DRAWER: DRAWER_TYPES.MORE_ACTIONS_DRAWER,
+    VIEW_DRAWER: DRAWER_TYPES.VIEW_DRAWER,
+};
+const feeStructureConfig = {
+    name: "FeeStructure",
+    displayName: "Fee Structure",
+    drawerTypes: DRAWER_TYPES,
+    initialState: {
+        // List Data
+        items: [],
+        count: 0,
+        // Search & Pagination
+        currentPage: 1,
+        pageLimit,
+        searchQuery: "",
+        // UI State
+        disableSaveButton: false,
+        drawer: null,
+        // Form State
+        amount: 0,
+        classId: null,
+        description: null,
+        enabled: true,
+        errors: {},
+        feeType: FEE_TYPE.TUITION,
+        filterEnabled: undefined,
+        frequency: null,
+        id: "",
+        name: "",
+        schoolId: "",
+    },
+};
+// ============================================================================
+// 1.3 CREATE FEE STRUCTURE MODULE
+// ============================================================================
+export const { actionTypes: FEE_STRUCTURE_ACTION_TYPES, config: feeStructureModuleConfig, initialState: initialFeeStructureState, Provider: FeeStructureProvider, reducer: feeStructureReducer, useContext: useFeeStructureContext, } = createGenericModule(feeStructureConfig);

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

@@ -0,0 +1,54 @@
+import { type RowAction, type TableRow } from "@appcorp/shadcn/components/enhanced-table";
+import { FEE_TYPE } from "../../../type";
+export declare const useFeeStructureModule: () => {
+    applyFilters: () => void;
+    byIdLoading: boolean;
+    clearFilters: () => void;
+    clearSearch: () => void;
+    closeDrawer: () => void;
+    deleteLoading: boolean;
+    handleChange: (field: string, value: string | number | boolean | FEE_TYPE | null | undefined) => void;
+    handleCreate: () => void;
+    handleDelete: (row?: TableRow) => void;
+    handleEdit: (row?: TableRow) => void;
+    handleFilters: () => void;
+    handleMoreActions: () => void;
+    handlePageChange: (page: number | unknown) => void;
+    handlePageLimitChange: (k: string, value: object) => void;
+    handleSearch: (query: string) => void;
+    handleSubmit: () => void;
+    handleView: (row?: TableRow) => void;
+    headerActions: {
+        enabled: boolean;
+        handleOnClick: () => void;
+        label: string;
+        order: number;
+    }[];
+    listFetchNow: (url?: string, config?: import("@react-pakistan/util-functions/hooks/use-fetch").FetchConfig) => void;
+    listLoading: boolean;
+    rowActions: RowAction[];
+    toggleStatus: (row?: TableRow) => void;
+    updateLoading: boolean;
+    handleCloseDrawer?: () => void;
+    state: {
+        items: import("../../../types").FeeStructureBE[];
+        count: number;
+        currentPage: number;
+        pageLimit: number;
+        searchQuery: string;
+        disableSaveButton: boolean;
+        drawer: string | null;
+        amount: number;
+        classId: string | null;
+        description: string | null;
+        enabled: boolean;
+        errors: Record<string, string>;
+        feeType: FEE_TYPE;
+        filterEnabled: boolean | undefined;
+        frequency: string | null;
+        id: string;
+        name: string;
+        schoolId: string;
+    };
+    dispatch: React.Dispatch<any>;
+};

package/base-modules/fee-structure/{context.js → context/use-fee-structure-module.js}

@@ -1,112 +1,31 @@
 "use client";
-/**
- * FeeStructure Module — business logic + API integration
- *
- * This module wires the generic module state (created by
- * `createGenericModule`) to network actions using `useModuleEntityV2`.
- * It contains the domain-specific handlers (create/view/edit/delete),
- * local validation wiring, and optimistic UI helpers.
- *
- * Key responsibilities:
- * - expose `useFeeStructureModule()` which UI components call for actions
- * - keep the module-specific `apiParams` and callbacks in one place
- * - ensure cache invalidation and toast notifications on mutation
- *
- * Exported utilities:
- * - `FeeStructureProvider` — provider component used by the page
- * - `useFeeStructureModule()` — hook that returns handlers and state
- */
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useCallback, useMemo } from "react";
 import { useTheme } from "next-themes";
 import { useTranslations } from "next-intl";
-import { isCreatedOrUpdated } from "@react-pakistan/util-functions/general/is-created-or-updated";
 import { validateForm } from "@react-pakistan/util-functions/general/validate-form";
-import { useModuleEntityV2, } from "@react-pakistan/util-functions/hooks/use-module-entity-v2";
-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 { pageLimit } from "./constants";
-import { FEE_STRUCTURE_API_ROUTES } from "../../constants";
-import { feeStructureFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
-import { FEE_TYPE } from "../../type";
-import { getCachedWorkspaceSync } from "../workspace/cache";
+import { getCachedWorkspaceSync } from "../../workspace/cache";
+import { feeStructureFormValidation } from "../validate";
+import { FEE_STRUCTURE_ACTION_TYPES, FEE_STRUCTURE_DRAWER, useFeeStructureContext, } from "./shared";
+import { useFeeStructureApiContext } from "./fee-structure-api-provider";
 // ============================================================================
-// 1.1 DRAWER TYPES
-// ============================================================================
-export const FEE_STRUCTURE_DRAWER = {
-    FILTER_DRAWER: DRAWER_TYPES.FILTER_DRAWER,
-    FORM_DRAWER: DRAWER_TYPES.FORM_DRAWER,
-    MORE_ACTIONS_DRAWER: DRAWER_TYPES.MORE_ACTIONS_DRAWER,
-    VIEW_DRAWER: DRAWER_TYPES.VIEW_DRAWER,
-};
-const feeStructureConfig = {
-    name: "FeeStructure",
-    displayName: "Fee Structure",
-    drawerTypes: DRAWER_TYPES,
-    initialState: {
-        // List Data
-        items: [],
-        count: 0,
-        // Search & Pagination
-        currentPage: 1,
-        pageLimit,
-        searchQuery: "",
-        // UI State
-        disableSaveButton: false,
-        drawer: null,
-        // Form State
-        amount: 0,
-        classId: null,
-        description: null,
-        enabled: true,
-        errors: {},
-        feeType: FEE_TYPE.TUITION,
-        filterEnabled: undefined,
-        frequency: null,
-        id: "",
-        name: "",
-        schoolId: "",
-    },
-};
-// ============================================================================
-// 1.3 CREATE FEE STRUCTURE MODULE
-// ============================================================================
-export const { actionTypes: FEE_STRUCTURE_ACTION_TYPES, config: feeStructureModuleConfig, initialState: initialFeeStructureState, Provider: FeeStructureProvider, reducer: feeStructureReducer, useContext: useFeeStructureContext, } = createGenericModule(feeStructureConfig);
-// ============================================================================
-// 1.4 ENHANCED FEE STRUCTURE HOOK WITH API INTEGRATION
+// ENHANCED FEE STRUCTURE HOOK WITH API INTEGRATION
 // ============================================================================
 export const useFeeStructureModule = () => {
     // ============================================================================
-    // 1.4.1 STATE & CORE HOOKS
+    // 1.4.1 STATE & API HOOKS
     // ============================================================================
     var _a;
     const context = useFeeStructureContext();
     const { dispatch } = context;
     const state = context.state;
+    const { listFetchNow, listLoading, updateFetchNow, updateLoading, byIdFetchNow, byIdLoading, deleteFetchNow, deleteLoading, resetFormAndCloseDrawer, } = useFeeStructureApiContext();
     const t = useTranslations("feeStructure");
     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);
     // ============================================================================
-    // 1.4.2 API PARAMETERS
-    // ============================================================================
-    const listParams = useMemo(() => (Object.assign(Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (state.filterEnabled !== undefined
-        ? { filterEnabled: String(state.filterEnabled) }
-        : {}))), [
-        state.currentPage,
-        state.filterEnabled,
-        state.pageLimit,
-        debouncedQuery,
-        schoolId,
-    ]);
-    const updateParams = useMemo(() => (Object.assign(Object.assign(Object.assign({}, (state.id ? { id: state.id } : {})), (!state.id ? { schoolId } : {})), { amount: Number(state.amount), classId: state.classId || null, 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]);
-    // ============================================================================
-    // 1.4.3 UTILITIES
+    // 1.4.2 UTILITIES
     // ============================================================================
     const showToast = useCallback((description, variant) => {
         generateThemeToast({
@@ -115,99 +34,12 @@ export const useFeeStructureModule = () => {
             variant,
         });
     }, [theme]);
-    const resetFormAndCloseDrawer = useCallback(() => {
-        dispatch({ type: FEE_STRUCTURE_ACTION_TYPES.RESET_FORM });
-        dispatch({
-            type: FEE_STRUCTURE_ACTION_TYPES.SET_ERRORS,
-            payload: { errors: {} },
-        });
-        dispatch({
-            type: FEE_STRUCTURE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
-            payload: { disabled: false },
-        });
-        dispatch({
-            type: FEE_STRUCTURE_ACTION_TYPES.SET_DRAWER,
-            payload: { drawer: null },
-        });
-    }, [dispatch]);
     // ============================================================================
-    // 1.4.4 API CALLBACKS
+    // 1.4.3 UPDATE PARAMS (used by handleSubmit for validation + fetch body)
     // ============================================================================
-    const listCallback = useCallback(({ data, error }) => {
-        var _a, _b;
-        if (error) {
-            showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            return;
-        }
-        if (data) {
-            const response = data;
-            dispatch({
-                type: FEE_STRUCTURE_ACTION_TYPES.SET_ITEMS,
-                payload: { items: (_a = response.items) !== null && _a !== void 0 ? _a : [], count: (_b = response.count) !== null && _b !== void 0 ? _b : 0 },
-            });
-        }
-    }, [dispatch, showToast, t]);
-    const updateCallback = useCallback(({ data, error }) => {
-        var _a;
-        if (error) {
-            showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            return;
-        }
-        if (data) {
-            const isCreated = isCreatedOrUpdated(data);
-            showToast(isCreated
-                ? t("messagesFeeStructureCreated")
-                : t("messagesFeeStructureUpdated"), TOAST_VARIANT.SUCCESS);
-            resetFormAndCloseDrawer();
-            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        }
-    }, [resetFormAndCloseDrawer, showToast, t]);
-    const byIdCallback = useCallback(({ data, error }) => {
-        if (error) {
-            showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            return;
-        }
-        if (data) {
-            dispatch({
-                type: FEE_STRUCTURE_ACTION_TYPES.SET_FORM_DATA,
-                payload: { form: Object.assign(Object.assign({}, data), { filterEnabled: undefined }) },
-            });
-        }
-    }, [dispatch, showToast, t]);
-    const deleteCallback = useCallback(({ data, error }) => {
-        var _a;
-        if (error) {
-            showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-            return;
-        }
-        if (data) {
-            showToast(t("messagesFeeStructureDeleted"), TOAST_VARIANT.SUCCESS);
-            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        }
-    }, [showToast, t]);
-    // ============================================================================
-    // 1.4.5 API HOOKS
-    // ============================================================================
-    const { byIdFetchNow, byIdLoading, deleteFetchNow, deleteLoading, listFetchNow, listLoading, updateFetchNow, updateLoading, } = useModuleEntityV2({
-        byIdCallback,
-        byIdParams,
-        deleteCallback,
-        deleteParams,
-        listCallback,
-        listParams,
-        listUrl: FEE_STRUCTURE_API_ROUTES.UNIT,
-        searchQuery: debouncedQuery,
-        unitByIdUrl: FEE_STRUCTURE_API_ROUTES.UNIT,
-        unitUrl: FEE_STRUCTURE_API_ROUTES.UNIT,
-        updateCallback,
-        updateParams,
-        headers: {
-            "Content-Type": "application/json",
-            // "x-api-token": process.env.NEXT_PUBLIC_API_KEY!,
-        },
-    });
+    const updateParams = useMemo(() => (Object.assign(Object.assign(Object.assign({}, (state.id ? { id: state.id } : {})), (!state.id ? { schoolId } : {})), { amount: Number(state.amount), classId: state.classId || null, description: state.description || null, enabled: state.enabled, feeType: state.feeType, frequency: state.frequency || null, name: state.name })), [state, schoolId]);
     // ============================================================================
-    // 1.4.6 HANDLERS
+    // 1.4.4 HANDLERS
     // ============================================================================
     const handleChange = useCallback((field, value) => {
         dispatch({
@@ -296,12 +128,21 @@ export const useFeeStructureModule = () => {
         });
     }, [dispatch]);
     const applyFilters = useCallback(() => {
+        closeDrawer();
+        dispatch({
+            type: FEE_STRUCTURE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "filterEnabled", value: state.filterEnabled },
+        });
         dispatch({
             type: FEE_STRUCTURE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        closeDrawer();
-    }, [dispatch, closeDrawer]);
+        listFetchNow === null || listFetchNow === void 0 ? void 0 : listFetchNow(undefined, {
+            params: Object.assign({ currentPage: 1, pageLimit: state.pageLimit, schoolId }, (state.filterEnabled !== undefined
+                ? { filterEnabled: String(state.filterEnabled) }
+                : {})),
+        });
+    }, [closeDrawer, dispatch, listFetchNow, schoolId, state.filterEnabled, state.pageLimit]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: FEE_STRUCTURE_ACTION_TYPES.SET_FILTERS,
@@ -311,14 +152,21 @@ export const useFeeStructureModule = () => {
             type: FEE_STRUCTURE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-    }, [dispatch]);
+        listFetchNow === null || listFetchNow === void 0 ? void 0 : listFetchNow(undefined, {
+            params: {
+                currentPage: 1,
+                pageLimit: state.pageLimit,
+                schoolId,
+            },
+        });
+    }, [dispatch, listFetchNow, state.pageLimit, schoolId]);
     const toggleStatus = useCallback((row) => {
         updateFetchNow(undefined, {
             body: JSON.stringify(Object.assign(Object.assign({}, row), { enabled: !(row === null || row === void 0 ? void 0 : row.enabled) })),
         });
     }, [updateFetchNow]);
     // ============================================================================
-    // 1.4.7 NETWORK ACTIONS
+    // 1.4.5 NETWORK ACTIONS
     // ============================================================================
     const handleSubmit = useCallback(() => {
         dispatch({
@@ -347,7 +195,7 @@ export const useFeeStructureModule = () => {
         });
     }, [dispatch, updateParams, t, showToast, updateFetchNow]);
     // ============================================================================
-    // 1.4.8 HEADER & ROW ACTIONS
+    // 1.4.6 HEADER & ROW ACTIONS
     // ============================================================================
     const headerActions = useMemo(() => [
         {
@@ -397,20 +245,7 @@ export const useFeeStructureModule = () => {
         },
     ], [handleDelete, handleEdit, handleView, t, toggleStatus]);
     // ============================================================================
-    // 1.4.9 EFFECTS
-    // ============================================================================
-    // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    }, [listFetchNow]);
-    useEffect(() => {
-        var _a;
-        if (!schoolId)
-            return;
-        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-    }, [dispatch, listParams, showToast, t, schoolId]);
-    // ============================================================================
-    // 1.4.10 RETURN
+    // 1.4.7 RETURN
     // ============================================================================
     return Object.assign(Object.assign({}, context), { applyFilters,
         byIdLoading,

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

@@ -17,7 +17,11 @@
  */
 import { FC } from "react";
 import { USER_ROLE } from "../../type";
-interface Props {
+interface ConfigProps {
+    dispatch: React.Dispatch<{
+        type: string;
+        payload?: unknown;
+    }>;
     drawerButtonCancel: string;
     drawerButtonSave: string;
     drawerFilterDescription: string;
@@ -39,6 +43,8 @@ interface Props {
     tableDescription: string;
     tableSearchPlaceholder: string;
     tableTitle: string;
+}
+interface Props extends ConfigProps {
     userRole: USER_ROLE;
 }
 export declare const FeeStructurePage: FC<Props>;

package/base-modules/fee-structure/page.js

@@ -20,7 +20,7 @@ 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";
-import { useFeeStructureModule, FeeStructureProvider, FEE_STRUCTURE_ACTION_TYPES, } from "./context";
+import { useFeeStructureModule, FeeStructureProvider, FeeStructureApiProvider, FEE_STRUCTURE_ACTION_TYPES, } from "./context";
 import { FeeStructureFilter } from "./filter";
 import { FeeStructureForm } from "./form";
 import { FeeStructureMoreActions } from "./more-actions";
@@ -106,6 +106,9 @@ const createFeeStructureConfig = ({ dispatch, drawerButtonCancel, drawerButtonSa
 // STABLE PAGE COMPONENT (created once, outside render)
 // ============================================================================
 const GenericFeeStructurePage = createGenericModulePage();
+// ============================================================================
+// INNER PAGE (requires FeeStructureProvider context)
+// ============================================================================
 const FeeStructurePageInner = (props) => {
     const context = useFeeStructureModule();
     const feeStructureConfig = useMemo(() => createFeeStructureConfig({
@@ -167,4 +170,4 @@ const FeeStructurePageInner = (props) => {
 // ============================================================================
 // PAGE EXPORTS
 // ============================================================================
-export const FeeStructurePage = (props) => (_jsx(FeeStructureProvider, { children: _jsx(FeeStructurePageInner, Object.assign({}, props)) }));
+export const FeeStructurePage = (props) => (_jsx(FeeStructureProvider, { children: _jsx(FeeStructureApiProvider, { children: _jsx(FeeStructurePageInner, Object.assign({}, props)) }) }));

package/package.json

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