@appcorp/fusion-storybook 0.4.13 → 0.4.14

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

@@ -8,6 +8,10 @@
  */
 import { PAYMENT_STATUS } from "../../type";
 export declare const pageLimit: number;
+export declare const filterDateDefaults: () => {
+    filterFromDate: string;
+    filterToDate: string;
+};
 export declare const PAYMENT_STATUS_OPTIONS: {
     label: string;
     value: PAYMENT_STATUS;

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

@@ -12,6 +12,19 @@ import { PAYMENT_STATUS } from "../../type";
 // ============================================================================
 export const pageLimit = Number(process.env.NEXT_PUBLIC_PAGE_LIMIT) || 10;
 // ============================================================================
+// FILTER DATE DEFAULTS
+// ============================================================================
+export const filterDateDefaults = () => {
+    const now = new Date();
+    const start = new Date(now.getFullYear(), now.getMonth(), 1);
+    const end = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+    const toISODate = (d) => `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+    return {
+        filterFromDate: toISODate(start),
+        filterToDate: toISODate(end),
+    };
+};
+// ============================================================================
 // STATUS OPTIONS
 // ============================================================================
 export const PAYMENT_STATUS_OPTIONS = [

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

@@ -58,6 +58,12 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    filterFromDate: string;
+    filterToDate: string;
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
+    appliedFilterFromDate: string;
+    appliedFilterToDate: string;
     studentFeesSingleEntry: StudentFeeBE[];
 }>, initialStudentFeeState: {
     items: StudentFeeBE[];
@@ -92,6 +98,12 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    filterFromDate: string;
+    filterToDate: string;
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
+    appliedFilterFromDate: string;
+    appliedFilterToDate: string;
     studentFeesSingleEntry: StudentFeeBE[];
 }, StudentFeeProvider: import("react").FC<{
     children: React.ReactNode;
@@ -128,6 +140,12 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    filterFromDate: string;
+    filterToDate: string;
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
+    appliedFilterFromDate: string;
+    appliedFilterToDate: string;
     studentFeesSingleEntry: StudentFeeBE[];
 }, action: any) => {
     items: StudentFeeBE[];
@@ -162,6 +180,12 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    filterFromDate: string;
+    filterToDate: string;
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
+    appliedFilterFromDate: string;
+    appliedFilterToDate: string;
     studentFeesSingleEntry: StudentFeeBE[];
 }, useStudentFeeContext: () => import("@react-pakistan/util-functions/factory/generic-module-factory").GenericModuleContextWithHandlers<{
     items: StudentFeeBE[];
@@ -196,5 +220,11 @@ export declare const STUDENT_FEE_ACTION_TYPES: {
     studentProfileId: string;
     filterEnabled: boolean | undefined;
     filterStatus: PAYMENT_STATUS | "";
+    filterFromDate: string;
+    filterToDate: string;
+    appliedFilterEnabled: boolean | undefined;
+    appliedFilterStatus: PAYMENT_STATUS | "";
+    appliedFilterFromDate: string;
+    appliedFilterToDate: string;
     studentFeesSingleEntry: StudentFeeBE[];
 }>;

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

@@ -2,7 +2,8 @@
 import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { PAYMENT_STATUS } from "../../../type";
-import { pageLimit } from "../constants";
+import { filterDateDefaults, pageLimit } from "../constants";
+const { filterFromDate: defaultFilterFromDate, filterToDate: defaultFilterToDate } = filterDateDefaults();
 // ============================================================================
 // 1.1 DRAWER TYPES
 // ============================================================================
@@ -59,9 +60,16 @@ const studentFeeConfig = {
         schoolId: "",
         status: PAYMENT_STATUS.PENDING,
         studentProfileId: "",
-        // Filters
+        // Draft filters (drawer edits; not fetched until Apply)
         filterEnabled: undefined,
         filterStatus: "",
+        filterFromDate: defaultFilterFromDate,
+        filterToDate: defaultFilterToDate,
+        // Applied filters (committed on Apply; drive the fetch via listParams)
+        appliedFilterEnabled: undefined,
+        appliedFilterStatus: "",
+        appliedFilterFromDate: defaultFilterFromDate,
+        appliedFilterToDate: defaultFilterToDate,
         studentFeesSingleEntry: [],
     },
 };

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

@@ -62,7 +62,24 @@ export const StudentFeeApiProvider = ({ children, }) => {
     // ==========================================================================
     // API PARAMETERS
     // ==========================================================================
-    const listParams = useMemo(() => (Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {}))), [state.currentPage, state.pageLimit, debouncedQuery, schoolId]);
+    const listParams = useMemo(() => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (state.appliedFilterEnabled !== undefined && {
+        filterEnabled: String(state.appliedFilterEnabled),
+    })), (state.appliedFilterStatus && {
+        filterStatus: state.appliedFilterStatus,
+    })), (state.appliedFilterFromDate && {
+        fromDate: state.appliedFilterFromDate,
+    })), (state.appliedFilterToDate && {
+        toDate: state.appliedFilterToDate,
+    }))), [
+        state.currentPage,
+        state.pageLimit,
+        debouncedQuery,
+        schoolId,
+        state.appliedFilterEnabled,
+        state.appliedFilterStatus,
+        state.appliedFilterFromDate,
+        state.appliedFilterToDate,
+    ]);
     const updateParams = useMemo(() => ({
         amount: Number(state.amount),
         amountDue: Number(state.amountDue),

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

@@ -70,6 +70,12 @@ export declare const useStudentFeeModule: () => {
         studentProfileId: string;
         filterEnabled: boolean | undefined;
         filterStatus: PAYMENT_STATUS | "";
+        filterFromDate: string;
+        filterToDate: string;
+        appliedFilterEnabled: boolean | undefined;
+        appliedFilterStatus: PAYMENT_STATUS | "";
+        appliedFilterFromDate: string;
+        appliedFilterToDate: string;
         studentFeesSingleEntry: import("../../../types").StudentFeeBE[];
     };
     dispatch: React.Dispatch<any>;

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

@@ -12,6 +12,7 @@ import { studentFeeFormValidation } from "../validate";
 import { getCachedWorkspaceSync } from "../../workspace/cache";
 import { getCachedFeeStructureById } from "../../fee-structure/cache";
 import { getCachedDiscountCodesSync } from "../../discount-code/cache";
+import { filterDateDefaults } from "../constants";
 import { STUDENT_FEE_ACTION_TYPES, STUDENT_FEE_DRAWER, useStudentFeeContext, } from "./shared";
 import { useStudentFeeApiContext } from "./student-fee-api-provider";
 // ============================================================================
@@ -374,11 +375,28 @@ export const useStudentFeeModule = () => {
         });
     }, [t, deleteFetchNow]);
     const handleFilters = useCallback(() => {
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_FILTERS,
+            payload: {
+                filters: {
+                    filterEnabled: state.appliedFilterEnabled,
+                    filterStatus: state.appliedFilterStatus,
+                    filterFromDate: state.appliedFilterFromDate,
+                    filterToDate: state.appliedFilterToDate,
+                },
+            },
+        });
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: STUDENT_FEE_DRAWER.FILTER_DRAWER },
         });
-    }, [dispatch]);
+    }, [
+        dispatch,
+        state.appliedFilterEnabled,
+        state.appliedFilterStatus,
+        state.appliedFilterFromDate,
+        state.appliedFilterToDate,
+    ]);
     const handleMoreActions = useCallback(() => {
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_DRAWER,
@@ -388,38 +406,42 @@ export const useStudentFeeModule = () => {
     const applyFilters = useCallback(() => {
         closeDrawer();
         dispatch({
-            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
-            payload: { key: "filterEnabled", value: state.filterEnabled },
-        });
-        dispatch({
-            type: STUDENT_FEE_ACTION_TYPES.SET_INPUT_FIELD,
-            payload: { key: "filterStatus", value: state.filterStatus },
+            type: STUDENT_FEE_ACTION_TYPES.SET_FILTERS,
+            payload: {
+                filters: {
+                    appliedFilterEnabled: state.filterEnabled,
+                    appliedFilterStatus: state.filterStatus,
+                    appliedFilterFromDate: state.filterFromDate,
+                    appliedFilterToDate: state.filterToDate,
+                },
+            },
         });
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow === null || listFetchNow === void 0 ? void 0 : listFetchNow(undefined, {
-            params: Object.assign(Object.assign({ currentPage: 1, pageLimit: state.pageLimit, schoolId }, (state.filterEnabled !== undefined && {
-                filterEnabled: state.filterEnabled,
-            })), (state.filterStatus && { filterStatus: state.filterStatus })),
-        });
     }, [
         closeDrawer,
         dispatch,
-        listFetchNow,
-        schoolId,
         state.filterEnabled,
         state.filterStatus,
-        state.pageLimit,
+        state.filterFromDate,
+        state.filterToDate,
     ]);
     const clearFilters = useCallback(() => {
+        const { filterFromDate, filterToDate } = filterDateDefaults();
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_FILTERS,
             payload: {
                 filters: {
                     filterEnabled: undefined,
                     filterStatus: "",
+                    filterFromDate,
+                    filterToDate,
+                    appliedFilterEnabled: undefined,
+                    appliedFilterStatus: "",
+                    appliedFilterFromDate: filterFromDate,
+                    appliedFilterToDate: filterToDate,
                 },
             },
         });
@@ -427,14 +449,7 @@ export const useStudentFeeModule = () => {
             type: STUDENT_FEE_ACTION_TYPES.SET_CURRENT_PAGE,
             payload: { currentPage: 1 },
         });
-        listFetchNow(undefined, {
-            params: {
-                currentPage: 1,
-                pageLimit: state.pageLimit,
-                schoolId,
-            },
-        });
-    }, [dispatch, listFetchNow, state.pageLimit, schoolId]);
+    }, [dispatch]);
     const handleSearch = useCallback((query) => {
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_SEARCH_QUERY,

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

@@ -11,6 +11,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * child components no longer creates redundant API hooks or auto-fetch effects.
  */
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
+import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useStudentFeeModule } from "./context";
 import { PAYMENT_STATUS_OPTIONS } from "./constants";
@@ -18,7 +19,7 @@ import { STUDENT_FEE_API_ROUTES } from "../../constants";
 import { useTranslations } from "next-intl";
 export const StudentFeeFilter = () => {
     const { state, handleChange } = useStudentFeeModule();
-    const { filterEnabled, filterStatus } = state;
+    const { filterEnabled, filterStatus, filterFromDate, filterToDate } = state;
     const t = useTranslations("studentFee");
     const paymentStatusLabelMap = {
         PENDING: t("formOptionPending"),
@@ -55,7 +56,7 @@ export const StudentFeeFilter = () => {
         },
         value: filterStatus || "",
     });
-    return (_jsxs("div", { className: "space-y-4", children: [filterStatusCombo, _jsx(EnhancedRadio, { label: t("filterEnabledLabel"), name: "filterEnabled", value: filterEnabledValue, options: [
+    return (_jsxs("div", { className: "space-y-4", children: [filterStatusCombo, _jsx(EnhancedInput, { id: "filterFromDate", info: t("filterFromDateInfo"), label: t("filterFromDateLabel"), onChange: (e) => handleChange("filterFromDate", e.target.value), onClick: (e) => { var _a, _b; return (_b = (_a = e.currentTarget).showPicker) === null || _b === void 0 ? void 0 : _b.call(_a); }, type: "date", value: filterFromDate || "" }), _jsx(EnhancedInput, { id: "filterToDate", info: t("filterToDateInfo"), label: t("filterToDateLabel"), onChange: (e) => handleChange("filterToDate", e.target.value), onClick: (e) => { var _a, _b; return (_b = (_a = e.currentTarget).showPicker) === null || _b === void 0 ? void 0 : _b.call(_a); }, type: "date", value: filterToDate || "" }), _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" },

package/package.json

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