@appcorp/fusion-storybook 0.3.91 → 0.3.93

package/base-modules/expense/context/expense-api-provider.js

@@ -72,13 +72,8 @@ export const ExpenseApiProvider = ({ children, }) => {
     // ==========================================================================
     // API PARAMETERS
     // ==========================================================================
-    const listParams = useMemo(() => (Object.assign(Object.assign(Object.assign(Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (state.filterCategory ? { filterCategory: state.filterCategory } : {})), (state.filterStatus ? { filterStatus: state.filterStatus } : {})), (state.filterEnabled !== undefined
-        ? { filterEnabled: state.filterEnabled }
-        : {}))), [
+    const listParams = useMemo(() => (Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {}))), [
         state.currentPage,
-        state.filterCategory,
-        state.filterEnabled,
-        state.filterStatus,
         state.pageLimit,
         debouncedQuery,
         schoolId,

package/base-modules/expense/context/use-expense-module.js

@@ -149,12 +149,38 @@ export const useExpenseModule = () => {
         });
     }, [dispatch]);
     const applyFilters = useCallback(() => {
+        closeDrawer();
+        dispatch({
+            type: EXPENSE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "filterCategory", value: state.filterCategory },
+        });
+        dispatch({
+            type: EXPENSE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "filterStatus", value: state.filterStatus },
+        });
+        dispatch({
+            type: EXPENSE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "filterEnabled", value: state.filterEnabled },
+        });
         dispatch({
             type: EXPENSE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        closeDrawer();
-    }, [dispatch, closeDrawer]);
+        listFetchNow === null || listFetchNow === void 0 ? void 0 : listFetchNow(undefined, {
+            params: Object.assign(Object.assign(Object.assign({ currentPage: 1, pageLimit: state.pageLimit, schoolId }, (state.filterCategory && { filterCategory: state.filterCategory })), (state.filterStatus && { filterStatus: state.filterStatus })), (state.filterEnabled !== undefined && {
+                filterEnabled: state.filterEnabled,
+            })),
+        });
+    }, [
+        closeDrawer,
+        dispatch,
+        listFetchNow,
+        schoolId,
+        state.filterCategory,
+        state.filterEnabled,
+        state.filterStatus,
+        state.pageLimit,
+    ]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: EXPENSE_ACTION_TYPES.SET_CURRENT_PAGE,
@@ -170,7 +196,14 @@ export const useExpenseModule = () => {
                 },
             },
         });
-    }, [dispatch]);
+        listFetchNow(undefined, {
+            params: {
+                currentPage: 1,
+                pageLimit: state.pageLimit,
+                schoolId,
+            },
+        });
+    }, [dispatch, listFetchNow, state.pageLimit, schoolId]);
     // ============================================================================
     // 1.4.5 NETWORK ACTIONS
     // ============================================================================

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

@@ -15,10 +15,7 @@
 import { FC } from "react";
 import { USER_ROLE } from "../../type";
 interface ConfigProps {
-    dispatch: React.Dispatch<{
-        type: string;
-        payload?: unknown;
-    }>;
+    clearFilters: () => void;
     drawerButtonCancel: string;
     drawerButtonSave: string;
     drawerFilterDescription: string;

package/base-modules/expense/page.js

@@ -18,7 +18,7 @@ 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 { DATE_FORMATS, formatDate, } from "@react-pakistan/util-functions/general/format-date";
-import { useExpenseModule, ExpenseProvider, ExpenseApiProvider, EXPENSE_ACTION_TYPES, } from "./context";
+import { useExpenseModule, ExpenseProvider, ExpenseApiProvider, } from "./context";
 import { ExpenseFilter } from "./filter";
 import { ExpenseForm } from "./form";
 import { ExpenseMoreActions } from "./more-actions";
@@ -64,7 +64,7 @@ const createComponentInstances = () => ({
     moreActions: _jsx(ExpenseMoreActions, {}),
     view: _jsx(ExpenseView, {}),
 });
-const createExpenseConfig = ({ dispatch, drawerButtonCancel, drawerButtonSave, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, tableColumnHeaderActions, tableColumnHeaderAmount, tableColumnHeaderCategory, tableColumnHeaderExpenseDate, tableColumnHeaderId, tableColumnHeaderStatus, tableColumnHeaderTitle, tableColumnHeaderVendorName, tableDescription, tableSearchPlaceholder, tableTitle, }) => {
+const createExpenseConfig = ({ clearFilters, drawerButtonCancel, drawerButtonSave, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, tableColumnHeaderActions, tableColumnHeaderAmount, tableColumnHeaderCategory, tableColumnHeaderExpenseDate, tableColumnHeaderId, tableColumnHeaderStatus, tableColumnHeaderTitle, tableColumnHeaderVendorName, tableDescription, tableSearchPlaceholder, tableTitle, }) => {
     const components = createComponentInstances();
     return {
         moduleName: "expense",
@@ -95,9 +95,7 @@ const createExpenseConfig = ({ dispatch, drawerButtonCancel, drawerButtonSave, d
         tableDescription,
         tableTitle,
         viewContent: components.view,
-        onClearFilters: () => {
-            dispatch({ type: EXPENSE_ACTION_TYPES.RESET_FORM });
-        },
+        onClearFilters: clearFilters,
     };
 };
 // ============================================================================
@@ -111,7 +109,7 @@ const ExpensePageInner = (props) => {
     const context = useExpenseModule();
     // Memoize config creation - destructure props to avoid object reference changes
     const expenseConfig = useMemo(() => createExpenseConfig({
-        dispatch: context.dispatch,
+        clearFilters: context.clearFilters,
         drawerButtonCancel: props.drawerButtonCancel,
         drawerButtonSave: props.drawerButtonSave,
         drawerFormTitle: props.drawerFormTitle,
@@ -134,7 +132,7 @@ const ExpensePageInner = (props) => {
         tableSearchPlaceholder: props.tableSearchPlaceholder,
         tableTitle: props.tableTitle,
     }), [
-        context.dispatch,
+        context.clearFilters,
         props.drawerButtonCancel,
         props.drawerButtonSave,
         props.drawerFormTitle,

package/base-modules/fee-structure/context/fee-structure-api-provider.js

@@ -62,15 +62,7 @@ export const FeeStructureApiProvider = ({ children, }) => {
     // ==========================================================================
     // 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 listParams = useMemo(() => (Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {}))), [state.currentPage, 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]);

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

@@ -128,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,
@@ -143,7 +152,14 @@ 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) })),

package/package.json

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