@appcorp/fusion-storybook 0.3.68 → 0.3.70

package/base-modules/student-fee/context/shared.d.ts

@@ -56,6 +56,8 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
 }>, initialStudentFeeState: {
     items: StudentFeeBE[];
     count: number;
@@ -87,6 +89,8 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
 }, StudentFeeProvider: import("react").FC<{
     children: React.ReactNode;
 }>, studentFeeReducer: (state: {
@@ -120,6 +124,8 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
 }, action: any) => {
     items: StudentFeeBE[];
     count: number;
@@ -151,6 +157,8 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
 }, useStudentFeeContext: () => import("@react-pakistan/util-functions/factory/generic-module-factory").GenericModuleContextWithHandlers<{
     items: StudentFeeBE[];
     count: number;
@@ -182,4 +190,6 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
 }>;

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

@@ -57,9 +57,12 @@ const studentFeeConfig = {
         schoolId: "",
         status: PAYMENT_STATUS.PENDING,
         studentProfileId: "",
-        // Filters
+        // Filters (pending — updated immediately by UI)
         filterEnabled: undefined,
         filterStatus: "",
+        // Applied filters (only updated on "Apply" / "Clear")
+        appliedFilterEnabled: undefined,
+        appliedFilterStatus: "",
     },
 };
 // ============================================================================

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

@@ -68,6 +68,8 @@ export declare const useStudentFeeModule: () => {
         studentProfileId: string;
         filterEnabled: boolean | undefined;
         filterStatus: PAYMENT_STATUS | "";
+        appliedFilterEnabled: boolean | undefined;
+        appliedFilterStatus: PAYMENT_STATUS | "";
     };
     dispatch: React.Dispatch<any>;
 };

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

@@ -45,13 +45,15 @@ export const useStudentFeeModule = () => {
     // ============================================================================
     const listParams = useMemo(() => {
         var _a;
-        return (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: state.filterEnabled }
-            : {})), (state.filterStatus ? { status: state.filterStatus } : {})));
+        return (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.appliedFilterEnabled !== undefined
+            ? { filterEnabled: state.appliedFilterEnabled }
+            : {})), (state.appliedFilterStatus
+            ? { status: state.appliedFilterStatus }
+            : {})));
     }, [
+        state.appliedFilterEnabled,
+        state.appliedFilterStatus,
         state.currentPage,
-        state.filterEnabled,
-        state.filterStatus,
         state.pageLimit,
         debouncedQuery,
         (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id,
@@ -501,17 +503,30 @@ export const useStudentFeeModule = () => {
         });
     }, [dispatch]);
     const applyFilters = useCallback(() => {
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "appliedFilterEnabled", value: state.filterEnabled },
+        });
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "appliedFilterStatus", value: state.filterStatus },
+        });
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
         closeDrawer();
-    }, [dispatch, closeDrawer]);
+    }, [dispatch, closeDrawer, state.filterEnabled, state.filterStatus]);
     const clearFilters = useCallback(() => {
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_FILTERS,
             payload: {
-                filters: { filterEnabled: undefined, filterStatus: "" },
+                filters: {
+                    filterEnabled: undefined,
+                    filterStatus: "",
+                    appliedFilterEnabled: undefined,
+                    appliedFilterStatus: "",
+                },
             },
         });
         dispatch({

package/base-modules/student-fee/form.js

@@ -11,7 +11,7 @@ import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
 import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useEffect } from "react";
-import { useStudentFeeModule } from "./context";
+import { useStudentFeeModule, STUDENT_FEE_DRAWER } from "./context";
 import { PAYMENT_STATUS_OPTIONS } from "./constants";
 import { STUDENT_FEE_API_ROUTES, DISCOUNT_CODE_API_ROUTES, FEE_STRUCTURE_API_ROUTES, STUDENT_PROFILE_API_ROUTES, } from "../../constants";
 import { getCachedWorkspaceSync } from "../workspace/cache";
@@ -24,7 +24,7 @@ import { getTranslatedError } from "../../utils/get-translated-error";
 export const StudentFeeForm = () => {
     var _a, _b, _c, _d, _e;
     const { state, handleChange } = useStudentFeeModule();
-    const { amount, amountDue, amountPaid, discountAmount, discountCodeId, dueDate, enabled, errors, feeStructureId, paidAt, remarks, status, studentProfileId, } = state;
+    const { amount, amountDue, amountPaid, discountAmount, discountCodeId, drawer, dueDate, enabled, errors, feeStructureId, paidAt, remarks, status, studentProfileId, } = state;
     const workspace = getCachedWorkspaceSync();
     const currency = (_b = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency) !== null && _b !== void 0 ? _b : "";
     const t = useTranslations("studentFee");
@@ -49,11 +49,13 @@ export const StudentFeeForm = () => {
         method: API_METHODS.GET,
     });
     useEffect(() => {
+        if (drawer !== STUDENT_FEE_DRAWER.FORM_DRAWER)
+            return;
         studentProfileFetchNow();
         feeStructureFetchNow();
         discountCodeFetchNow();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [drawer]);
     const { enhancedComboboxElement: studentProfileIdCombo } = useEnhancedCombobox({
         emptyText: t("formNoStudentEmpty"),
         id: "studentProfileId",

package/package.json

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