@appcorp/fusion-storybook 0.3.88 → 0.3.90

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

@@ -414,7 +414,6 @@ export const useStudentFeeModule = () => {
         state.pageLimit,
     ]);
     const clearFilters = useCallback(() => {
-        console.log("clearFilters");
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_FILTERS,
             payload: {
@@ -458,7 +457,7 @@ export const useStudentFeeModule = () => {
         });
         try {
             const res = await fetch(STUDENT_FEE_API_ROUTES.CREATE_MONTHLY, {
-                method: "POST",
+                method: API_METHODS.POST,
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({ schoolId }),
             });

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

@@ -14,7 +14,12 @@
  */
 import { FC } from "react";
 import { USER_ROLE } from "../../type";
-interface Props {
+interface ConfigProps {
+    clearFilters: () => void;
+    dispatch: React.Dispatch<{
+        type: string;
+        payload?: unknown;
+    }>;
     drawerButtonCancel: string;
     drawerButtonSave: string;
     drawerFilterDescription: string;
@@ -42,6 +47,8 @@ interface Props {
     tableDescription: string;
     tableSearchPlaceholder: string;
     tableTitle: string;
+}
+interface Props extends ConfigProps {
     userRole: USER_ROLE;
 }
 export declare const StudentFeePage: FC<Props>;

package/base-modules/student-fee/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 { useStudentFeeModule, StudentFeeProvider, STUDENT_FEE_ACTION_TYPES, } from "./context";
+import { useStudentFeeModule, StudentFeeProvider } from "./context";
 import { StudentFeeApiProvider } from "./context/student-fee-api-provider";
 import { StudentFeeFilter } from "./filter";
 import { StudentFeeForm } from "./form";
@@ -79,22 +79,9 @@ const createComponentInstances = () => ({
     misc1: _jsx(StudentFeeMonthly, {}),
     misc2: _jsx(StudentFeeSingle, {}),
 });
-const createStudentFeeConfig = ({ dispatch, drawerButtonCancel, drawerButtonSave, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMisc1Description, drawerMisc1Title, drawerMisc2Description, drawerMisc2Title, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, tableColumnHeaderActions, tableColumnHeaderAmount, tableColumnHeaderAmountDue, tableColumnHeaderAmountPaid, tableColumnHeaderDueDate, tableColumnHeaderFeeStructure, tableColumnHeaderId, tableColumnHeaderRemarks, tableColumnHeaderStatus, tableColumnHeaderStudent, tableDescription, tableSearchPlaceholder, tableTitle, }) => {
+const createStudentFeeConfig = ({ clearFilters, drawerButtonCancel, drawerButtonSave, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMisc1Description, drawerMisc1Title, drawerMisc2Description, drawerMisc2Title, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, tableColumnHeaderActions, tableColumnHeaderAmount, tableColumnHeaderAmountDue, tableColumnHeaderAmountPaid, tableColumnHeaderDueDate, tableColumnHeaderFeeStructure, tableColumnHeaderId, tableColumnHeaderRemarks, tableColumnHeaderStatus, tableColumnHeaderStudent, tableDescription, tableSearchPlaceholder, tableTitle, }) => {
     const components = createComponentInstances();
     return {
-        moduleName: "studentFee",
-        tableColumns: [
-            { label: tableColumnHeaderId, width: "5%" },
-            { label: tableColumnHeaderStudent, width: "12%" },
-            { label: tableColumnHeaderFeeStructure, width: "12%" },
-            { label: tableColumnHeaderAmount, width: "10%" },
-            { label: tableColumnHeaderAmountPaid, width: "10%" },
-            { label: tableColumnHeaderAmountDue, width: "10%" },
-            { label: tableColumnHeaderDueDate, width: "10%" },
-            { label: tableColumnHeaderStatus, width: "10%" },
-            { label: tableColumnHeaderRemarks, width: "11%" },
-            { label: tableColumnHeaderActions, width: "5%" },
-        ],
         cancelLabel: drawerButtonCancel,
         drawerFilterDescription,
         drawerFilterTitle,
@@ -112,25 +99,40 @@ const createStudentFeeConfig = ({ dispatch, drawerButtonCancel, drawerButtonSave
         formContent: components.form,
         misc1Content: components.misc1,
         misc2Content: components.misc2,
+        moduleName: "studentFee",
         moreActionsContent: components.moreActions,
+        onClearFilters: clearFilters,
         saveLabel: drawerButtonSave,
         searchPlaceholder: tableSearchPlaceholder,
+        tableColumns: [
+            { label: tableColumnHeaderId, width: "5%" },
+            { label: tableColumnHeaderStudent, width: "12%" },
+            { label: tableColumnHeaderFeeStructure, width: "12%" },
+            { label: tableColumnHeaderAmount, width: "10%" },
+            { label: tableColumnHeaderAmountPaid, width: "10%" },
+            { label: tableColumnHeaderAmountDue, width: "10%" },
+            { label: tableColumnHeaderDueDate, width: "10%" },
+            { label: tableColumnHeaderStatus, width: "10%" },
+            { label: tableColumnHeaderRemarks, width: "11%" },
+            { label: tableColumnHeaderActions, width: "5%" },
+        ],
         tableDescription,
         tableTitle,
         viewContent: components.view,
-        onClearFilters: () => {
-            dispatch({ type: STUDENT_FEE_ACTION_TYPES.RESET_FORM });
-        },
     };
 };
 // ============================================================================
 // STABLE PAGE COMPONENT (created once, outside render)
 // ============================================================================
 const GenericStudentFeePage = createGenericModulePage();
+// ============================================================================
+// INNER PAGE (requires StudentFeeProvider context)
+// ============================================================================
 const StudentFeePageInner = (props) => {
     const context = useStudentFeeModule();
     // Memoize config creation - destructure props to avoid object reference changes
     const studentFeeConfig = useMemo(() => createStudentFeeConfig({
+        clearFilters: context.clearFilters,
         dispatch: context.dispatch,
         drawerButtonCancel: props.drawerButtonCancel,
         drawerButtonSave: props.drawerButtonSave,
@@ -160,6 +162,7 @@ const StudentFeePageInner = (props) => {
         tableSearchPlaceholder: props.tableSearchPlaceholder,
         tableTitle: props.tableTitle,
     }), [
+        context.clearFilters,
         context.dispatch,
         props.drawerButtonCancel,
         props.drawerButtonSave,
@@ -189,13 +192,13 @@ const StudentFeePageInner = (props) => {
         props.tableTitle,
     ]);
     const hasPermission = resolveRbacPermissions({
-        userRole: props.userRole,
         moduleName: "Student Fee",
+        userRole: props.userRole,
     });
     if (!hasPermission) {
         return _jsx(RbacNoAccess, { moduleName: "Student Fee" });
     }
-    return (_jsx("div", { className: "p-4", children: _jsx(GenericStudentFeePage, { overrideConfig: studentFeeConfig, context: context, tableBodyCols: tableBodyCols }) }));
+    return (_jsx("div", { className: "p-4", children: _jsx(GenericStudentFeePage, { context: context, overrideConfig: studentFeeConfig, tableBodyCols: tableBodyCols }) }));
 };
 // ============================================================================
 // PAGE EXPORTS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.3.88",
+  "version": "0.3.90",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",
@@ -37,7 +37,7 @@
     ]
   },
   "devDependencies": {
-    "@appcorp/shadcn": "^2.0.13",
+    "@appcorp/shadcn": "^2.0.14",
     "@chromatic-com/storybook": "^5.1.2",
     "@commitlint/cli": "^20.5.0",
     "@commitlint/config-conventional": "^20.5.0",
@@ -55,7 +55,7 @@
     "@radix-ui/react-slider": "^1",
     "@radix-ui/react-slot": "^1",
     "@radix-ui/react-toast": "^1",
-    "@react-pakistan/util-functions": "^3.0.7",
+    "@react-pakistan/util-functions": "^3.0.9",
     "@storybook/addon-a11y": "^10.3.4",
     "@storybook/addon-docs": "^10.3.4",
     "@storybook/addon-onboarding": "^10.3.4",