@appcorp/fusion-storybook 0.3.66 → 0.3.67

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

@@ -14,7 +14,6 @@ export declare const useStudentFeeModule: () => {
     handleDelete: (row?: TableRow) => void;
     handleEdit: (row?: TableRow) => void;
     handleFilters: () => void;
-    setPendingFilter: (field: string, value: boolean | undefined | string) => void;
     handleMoreActions: () => void;
     handlePageChange: (page: number | unknown) => void;
     handlePageLimitChange: (k: string, value: object) => void;
@@ -69,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

@@ -40,25 +40,20 @@ export const useStudentFeeModule = () => {
     const workspace = getCachedWorkspaceSync();
     const listFetchNowRef = useRef(null);
     const debouncedQuery = useDebounce(state.searchQuery, 800);
-    const pendingFiltersRef = useRef({
-        filterEnabled: state.filterEnabled,
-        filterStatus: state.filterStatus || "",
-    });
-    const setPendingFilter = useCallback((field, value) => {
-        pendingFiltersRef.current = Object.assign(Object.assign({}, pendingFiltersRef.current), { [field]: value });
-    }, []);
     // ============================================================================
     // 1.4.2 API PARAMETERS
     // ============================================================================
     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.currentPage,
-        state.filterEnabled,
-        state.filterStatus,
+        state.appliedFilterEnabled,
+        state.appliedFilterStatus,
         state.pageLimit,
         debouncedQuery,
         (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id,
@@ -508,34 +503,40 @@ export const useStudentFeeModule = () => {
         });
     }, [dispatch]);
     const applyFilters = useCallback(() => {
-        const pending = pendingFiltersRef.current;
         dispatch({
-            type: STUDENT_FEE_ACTION_TYPES.SET_FILTERS,
-            payload: {
-                filters: {
-                    filterEnabled: pending.filterEnabled,
-                    filterStatus: pending.filterStatus,
-                },
-            },
+            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(() => {
-        pendingFiltersRef.current = {
-            filterEnabled: undefined,
-            filterStatus: "",
-        };
         dispatch({
-            type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
-            payload: { currentPage: 1 },
+            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "filterEnabled", value: undefined },
         });
         dispatch({
-            type: STUDENT_FEE_ACTION_TYPES.SET_FILTERS,
-            payload: { filters: { filterEnabled: undefined, filterStatus: "" } },
+            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "filterStatus", value: "" },
+        });
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "appliedFilterEnabled", value: undefined },
+        });
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "appliedFilterStatus", value: "" },
+        });
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
+            payload: { currentPage: 1 },
         });
     }, [dispatch]);
     const handleSearch = useCallback((query) => {
@@ -720,7 +721,6 @@ export const useStudentFeeModule = () => {
         handleDelete,
         handleEdit,
         handleFilters,
-        setPendingFilter,
         handleMoreActions,
         handlePageChange,
         handlePageLimitChange,

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

@@ -6,7 +6,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Filter UI for the student-fee list. Supports filterEnabled (radio) and
  * filterStatus (payment status combobox).
  */
-import { useState } from "react";
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
 import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useStudentFeeModule } from "./context";
@@ -14,11 +13,9 @@ import { PAYMENT_STATUS_OPTIONS } from "./constants";
 import { STUDENT_FEE_API_ROUTES } from "../../constants";
 import { useTranslations } from "next-intl";
 export const StudentFeeFilter = () => {
-    const { state, setPendingFilter } = useStudentFeeModule();
+    const { state, handleChange } = useStudentFeeModule();
     const { filterEnabled, filterStatus } = state;
     const t = useTranslations("studentFee");
-    const [localFilterEnabled, setLocalFilterEnabled] = useState(filterEnabled);
-    const [localFilterStatus, setLocalFilterStatus] = useState(filterStatus || "");
     const paymentStatusLabelMap = {
         PENDING: t("formOptionPending"),
         PARTIAL: t("formOptionPartial"),
@@ -27,26 +24,17 @@ export const StudentFeeFilter = () => {
         CANCELLED: t("formOptionCancelled"),
         REFUNDED: t("formOptionRefunded"),
     };
-    const filterEnabledValue = localFilterEnabled === undefined
+    const filterEnabledValue = filterEnabled === undefined
         ? "undefined"
-        : localFilterEnabled
+        : filterEnabled
             ? "true"
             : "false";
-    const handleStatusChange = (value) => {
-        setLocalFilterStatus(value);
-        setPendingFilter("filterStatus", value);
-    };
-    const handleEnabledChange = (next) => {
-        const parsed = next === "true" ? true : next === "false" ? false : undefined;
-        setLocalFilterEnabled(parsed);
-        setPendingFilter("filterEnabled", parsed);
-    };
     const { enhancedComboboxElement: filterStatusCombo } = useEnhancedCombobox({
         emptyText: t("filterNoStatusFoundLabel"),
         id: "filterStatus",
         info: t("filterByPaymentStatus"),
         label: t("filterPaymentStatusLabel"),
-        onValueChange: handleStatusChange,
+        onValueChange: (value) => handleChange("filterStatus", value),
         options: PAYMENT_STATUS_OPTIONS.map((opt) => ({
             value: opt.value,
             label: paymentStatusLabelMap[opt.value] || opt.label,
@@ -61,11 +49,14 @@ export const StudentFeeFilter = () => {
                 value: String((_b = item.value) !== null && _b !== void 0 ? _b : ""),
             });
         },
-        value: localFilterStatus,
+        value: filterStatus || "",
     });
     return (_jsxs("div", { className: "space-y-4", children: [filterStatusCombo, _jsx(EnhancedRadio, { label: t("filterEnabledLabel"), name: "filterEnabled", value: filterEnabledValue, options: [
                     { label: t("filterOptionAll"), value: "undefined" },
                     { label: t("filterOptionEnabled"), value: "true" },
                     { label: t("filterOptionDisabled"), value: "false" },
-                ], onValueChange: handleEnabledChange })] }));
+                ], onValueChange: (next) => {
+                    const parsed = next === "true" ? true : next === "false" ? false : undefined;
+                    handleChange("filterEnabled", parsed);
+                } })] }));
 };

package/package.json

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