@appcorp/fusion-storybook 0.2.40 → 0.2.44

package/base-modules/discount-code/form.js

@@ -16,27 +16,33 @@ import { useDiscountCodeModule } from "./context";
 import { useTranslations } from "next-intl";
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
-import { Percent, DollarSign } from "lucide-react";
 import { DISCOUNT_TYPE } from "../../type";
+import { DISCOUNT_CODE_API_ROUTES, DISCOUNT_TYPE_OPTIONS } from "./constants";
 export const DiscountCodeForm = () => {
     const { state, handleChange } = useDiscountCodeModule();
     const t = useTranslations("discountCode");
+    const discountTypeLabelMap = {
+        PERCENTAGE: t("formOptionPercentage"),
+        FIXED: t("formOptionFixed"),
+    };
     const { code, description, discountType, discountValue, enabled, errors } = state;
-    const discountTypeOptions = [
-        {
-            label: t("formDiscountTypeOptionsPercentage"),
-            value: DISCOUNT_TYPE.PERCENTAGE,
-            icon: _jsx(Percent, { className: "h-4 w-4" }),
-        },
-        {
-            label: t("formDiscountTypeOptionsFixed"),
-            value: DISCOUNT_TYPE.FIXED,
-            icon: _jsx(DollarSign, { className: "h-4 w-4" }),
-        },
-    ];
-    return (_jsx("div", { className: "space-y-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.code, id: "code", info: t("formDiscountCodeInfo"), label: t("formDiscountCodeLabel"), onChange: (e) => handleChange("code", e.target.value.toUpperCase()), placeholder: t("formDiscountCodePlaceholder"), required: true, value: code }), _jsx(EnhancedTextarea, { error: errors.description, id: "description", info: t("formDescriptionInfo"), label: t("formDescriptionLabel"), onChange: (e) => handleChange("description", e.target.value), placeholder: t("formDescriptionPlaceholder"), rows: 3, value: description || "" }), _jsx(EnhancedCombobox, { error: errors.discountType, id: "discountType", info: t("formDiscountTypeInfo"), label: t("formDiscountTypeLabel"), onValueChange: (value) => handleChange("discountType", value), options: discountTypeOptions, placeholder: t("formDiscountTypePlaceholder"), required: true, value: discountType }), _jsx(EnhancedInput, { id: "discountValue", label: t("formDiscountValueLabel"), type: "number", value: (discountValue === null || discountValue === void 0 ? void 0 : discountValue.toString()) || "", onChange: (e) => handleChange("discountValue", parseFloat(e.target.value) || 0), error: errors.discountValue, placeholder: discountType === DISCOUNT_TYPE.PERCENTAGE
+    const { enhancedComboboxElement: discountTypeCombo } = useEnhancedCombobox({
+        id: "discountType",
+        info: t("formDiscountTypeInfo"),
+        label: t("formDiscountTypeLabel"),
+        onValueChange: (value) => handleChange("discountType", value),
+        options: DISCOUNT_TYPE_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: discountTypeLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: t("formDiscountTypePlaceholder"),
+        required: true,
+        searchEndpoint: DISCOUNT_CODE_API_ROUTES.UNIT,
+        value: discountType,
+    });
+    return (_jsx("div", { className: "space-y-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.code, id: "code", info: t("formDiscountCodeInfo"), label: t("formDiscountCodeLabel"), onChange: (e) => handleChange("code", e.target.value.toUpperCase()), placeholder: t("formDiscountCodePlaceholder"), required: true, value: code }), _jsx(EnhancedTextarea, { error: errors.description, id: "description", info: t("formDescriptionInfo"), label: t("formDescriptionLabel"), onChange: (e) => handleChange("description", e.target.value), placeholder: t("formDescriptionPlaceholder"), rows: 3, value: description || "" }), discountTypeCombo, _jsx(EnhancedInput, { id: "discountValue", label: t("formDiscountValueLabel"), type: "number", value: (discountValue === null || discountValue === void 0 ? void 0 : discountValue.toString()) || "", onChange: (e) => handleChange("discountValue", parseFloat(e.target.value) || 0), error: errors.discountValue, placeholder: discountType === DISCOUNT_TYPE.PERCENTAGE
                         ? t("formDiscountValuePlaceholderPercentage")
                         : t("formDiscountValuePlaceholderFixed"), required: true, min: 0, max: discountType === DISCOUNT_TYPE.PERCENTAGE ? 100 : undefined, step: discountType === DISCOUNT_TYPE.PERCENTAGE ? 0.1 : 0.01, info: discountType === DISCOUNT_TYPE.PERCENTAGE
                         ? t("formDiscountValueInfoPercentage")

package/base-modules/discount-code/more-actions.js

@@ -9,5 +9,5 @@ import { useTranslations } from "next-intl";
  */
 export const DiscountCodeMoreActions = () => {
     const t = useTranslations("discountCode");
-    return (_jsx("div", { className: "space-y-4", children: _jsx("div", { className: "text-sm text-muted-foreground", children: t("actionMoreActions") }) }));
+    return (_jsx("div", { className: "space-y-4", children: _jsx("div", { className: "text-sm text-muted-foreground", children: t("moreActionsTitle") }) }));
 };

package/base-modules/enrollment/context.js

@@ -25,7 +25,6 @@ import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { ENROLLMENT_API_ROUTES, pageLimit } from "./constants";
-import { getCachedEnrollments, invalidateEnrollmentsCache } from "./cache";
 import { enrollmentFormValidation } from "./validate";
 import { TOAST_VARIANT, generateThemeToast, } from "@appcorp/shadcn/lib/toast-utils";
 import { getCachedWorkspaceSync } from "../workspace/cache";
@@ -164,7 +163,6 @@ export const useEnrollmentModule = () => {
             showToast(isCreatedOrUpdated(data)
                 ? t("messagesEnrollmentCreated")
                 : t("messagesEnrollmentUpdated"), TOAST_VARIANT.SUCCESS);
-            invalidateEnrollmentsCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -189,7 +187,6 @@ export const useEnrollmentModule = () => {
         }
         if (data) {
             showToast(t("messagesEnrollmentDeleted"), TOAST_VARIANT.SUCCESS);
-            invalidateEnrollmentsCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -398,44 +395,13 @@ export const useEnrollmentModule = () => {
     // ==========================================================================
     // 1.4.9 EFFECTS
     // ==========================================================================
-    // Keep the latest fetch function in a ref so the fetch effect can call it
-    // without depending on listFetchNow's unstable identity.
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
-    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
-        if (!schoolId)
-            return;
-        const currentPage = Number(listParams.currentPage) || 1;
-        const currentPageLimit = Number(listParams.pageLimit) || pageLimit;
-        const isDefaultLoad = currentPage === 1 &&
-            currentPageLimit === pageLimit &&
-            !listParams.searchQuery &&
-            listParams.filterEnabled === undefined;
-        if (isDefaultLoad) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedEnrollments({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: ENROLLMENT_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-                }
-            })();
-        }
-        else {
-            // Bypass cache for pagination, pageLimit, filter and search changes.
-            // Use ref to avoid the infinite-loop caused by listFetchNow's unstable identity.
-            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        }
-    }, [listParams, dispatch, showToast, schoolId, t]);
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [listParams]);
     // ==========================================================================
     // 1.4.10 RETURN
     // ==========================================================================

package/base-modules/enrollment/form.js

@@ -11,12 +11,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { Separator } from "@appcorp/shadcn/components/ui/separator";
 import { DATE_FORMATS, formatDate } from "@react-pakistan/util-functions";
 import { useEnrollmentModule } from "./context";
 import { getCachedStudentProfilesSync } from "../student-profile/cache";
 import { getCachedSectionsSync } from "../section/cache";
+import { ENROLLMENT_API_ROUTES } from "./constants";
 import { useTranslations } from "next-intl";
 // ============================================================================
 // COMPONENT
@@ -24,16 +25,42 @@ import { useTranslations } from "next-intl";
 export const EnrollmentForm = () => {
     const { state: { enabled, enrollmentDate, errors, sectionId, studentProfileId, }, handleChange, } = useEnrollmentModule();
     const t = useTranslations("enrollment");
+    const { enhancedComboboxElement: studentProfileIdCombo } = useEnhancedCombobox({
+        emptyText: t("formNoStudentEmpty"),
+        id: "studentProfileId",
+        info: t("formStudentInfo"),
+        label: t("formStudentLabel"),
+        onValueChange: (value) => handleChange("studentProfileId", value),
+        options: (getCachedStudentProfilesSync().items || []).map((s) => ({
+            id: s.id,
+            name: s.studentCode || s.id,
+        })),
+        placeholder: t("formStudentPlaceholder"),
+        required: true,
+        searchEndpoint: ENROLLMENT_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchStudentsPlaceholder"),
+        value: studentProfileId || "",
+    });
+    const { enhancedComboboxElement: sectionIdCombo } = useEnhancedCombobox({
+        emptyText: t("formNoSectionEmpty"),
+        id: "sectionId",
+        info: t("sectionInfo"),
+        label: t("section"),
+        onValueChange: (value) => handleChange("sectionId", value),
+        options: (getCachedSectionsSync().items || []).map((s) => {
+            var _a;
+            return ({
+                id: s.id,
+                name: ((_a = s.class) === null || _a === void 0 ? void 0 : _a.code) ? `${s.class.code}-${s.name}` : s.name,
+            });
+        }),
+        placeholder: t("sectionPlaceholder"),
+        required: true,
+        searchEndpoint: ENROLLMENT_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchSectionsPlaceholder"),
+        value: sectionId || "",
+    });
     return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.enrollmentDate, id: "enrollmentDate", info: t("formEnrollmentDateInfo"), label: t("formEnrollmentDateLabel"), onChange: (e) => handleChange("enrollmentDate", e.target.value), placeholder: t("formEnrollmentDatePlaceholder"), required: true, type: "date", value: enrollmentDate
                     ? formatDate(enrollmentDate, DATE_FORMATS.YYYY_MM_DD)
-                    : "" }), _jsx(Separator, {}), _jsx(EnhancedCombobox, { emptyText: t("formNoStudentEmpty"), error: errors.studentProfileId, id: "studentProfileId", info: t("formStudentInfo"), label: t("formStudentLabel"), onValueChange: (value) => handleChange("studentProfileId", value), options: (getCachedStudentProfilesSync().items || []).map((s) => ({
-                    label: s.studentCode || s.id,
-                    value: s.id,
-                })), placeholder: t("formStudentPlaceholder"), required: true, searchPlaceholder: t("formSearchStudentsPlaceholder"), value: studentProfileId || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoSectionEmpty"), error: errors.sectionId, id: "sectionId", info: t("sectionInfo"), label: t("section"), onValueChange: (value) => handleChange("sectionId", value), options: (getCachedSectionsSync().items || []).map((s) => {
-                    var _a;
-                    return ({
-                        label: ((_a = s.class) === null || _a === void 0 ? void 0 : _a.code) ? `${s.class.code}-${s.name}` : s.name,
-                        value: s.id,
-                    });
-                }), placeholder: t("sectionPlaceholder"), required: true, searchPlaceholder: t("formSearchSectionsPlaceholder"), value: sectionId || "" }), _jsx(EnhancedCheckbox, { checked: enabled, error: errors.enabled, id: "enabled", info: t("actionToggleEnableOrDisableEnrollment"), label: t("formActiveEnrollmentLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
+                    : "" }), _jsx(Separator, {}), studentProfileIdCombo, sectionIdCombo, _jsx(EnhancedCheckbox, { checked: enabled, error: errors.enabled, id: "enabled", info: t("actionToggleEnableOrDisableEnrollment"), label: t("formActiveEnrollmentLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
 };

package/base-modules/enrollment/more-actions.js

@@ -7,7 +7,6 @@ import converter from "json-2-csv";
 import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
 import { ENROLLMENT_API_ROUTES, pageLimit } from "./constants";
-import { invalidateEnrollmentsCache } from "./cache";
 import { ENROLLMENT_ACTION_TYPES, useEnrollmentContext } from "./context";
 import { useRef, useEffect, useCallback } from "react";
 const workspace = getCachedWorkspaceSync();
@@ -68,13 +67,15 @@ async function pollBulkJob(jobId, signal, onProgress) {
         }
     }
 }
-function formatErrorSummary(errors) {
+function formatErrorSummary(t, errors) {
     if (!(errors === null || errors === void 0 ? void 0 : errors.length))
         return "";
-    const lines = errors.slice(0, 5).map((e) => `Row ${e.row}: ${e.error}`);
+    const lines = errors
+        .slice(0, 5)
+        .map((e) => t("messagesBulkRowError", { row: e.row, error: e.error }));
     const remaining = errors.length - 5;
     if (remaining > 0)
-        lines.push(`...and ${remaining} more`);
+        lines.push(t("messagesBulkMoreRows", { count: remaining }));
     return lines.join("\n");
 }
 export const EnrollmentMoreActions = () => {
@@ -107,7 +108,7 @@ export const EnrollmentMoreActions = () => {
         const text = await file.text();
         const records = converter.csv2json(text);
         if (!Array.isArray(records) || records.length === 0) {
-            showErrorToast("CSV file is empty or invalid");
+            showErrorToast(t("messagesBulkCsvEmpty"));
             return;
         }
         // Client-side validation — basic required field check
@@ -117,15 +118,15 @@ export const EnrollmentMoreActions = () => {
             const msgs = [];
             if (method === "POST") {
                 if (!((_b = row.studentProfileId) === null || _b === void 0 ? void 0 : _b.trim()))
-                    msgs.push("studentProfileId is required");
+                    msgs.push(t("validationRequiredStudentProfileId"));
                 if (!((_c = row.sectionId) === null || _c === void 0 ? void 0 : _c.trim()))
-                    msgs.push("sectionId is required");
+                    msgs.push(t("validationRequiredSectionId"));
                 if (!((_d = row.enrollmentDate) === null || _d === void 0 ? void 0 : _d.trim()))
-                    msgs.push("enrollmentDate is required");
+                    msgs.push(t("validationRequiredEnrollmentDate"));
             }
             else {
                 if (!((_e = row.id) === null || _e === void 0 ? void 0 : _e.trim()))
-                    msgs.push("id is required for update");
+                    msgs.push(t("validationRequiredIdForUpdate"));
             }
             if (msgs.length > 0) {
                 validationErrors.push({ row: i + 1, messages: msgs });
@@ -134,40 +135,59 @@ export const EnrollmentMoreActions = () => {
         if (validationErrors.length > 0) {
             const summary = validationErrors
                 .slice(0, 5)
-                .map((e) => `Row ${e.row}: ${e.messages.join("; ")}`)
+                .map((e) => t("messagesBulkRowError", {
+                row: e.row,
+                error: e.messages.join("; "),
+            }))
                 .join("\n");
-            const remaining = validationErrors.length - 5;
-            showErrorToast(`Validation failed for ${validationErrors.length} row(s).\n${summary}${remaining > 0 ? `\n...and ${remaining} more` : ""}`);
+            showErrorToast(t("messagesBulkValidationFailed", {
+                count: validationErrors.length,
+                errors: summary,
+            }));
             return;
         }
         try {
-            showInfoToast(`Bulk ${label} job queued (${records.length} records). Processing...`);
+            showInfoToast(t("messagesBulkJobQueued", { action: label, count: records.length }));
             let jobId;
             try {
                 jobId = await submitBulkJob(text, method, signal);
             }
             catch (submitError) {
-                showErrorToast(`Failed to submit ${label} job: ${submitError instanceof Error ? submitError.message : "Unknown error"}`);
+                showErrorToast(t("messagesBulkJobSubmitFailed", {
+                    action: label,
+                    error: submitError instanceof Error
+                        ? submitError.message
+                        : t("unknownError"),
+                }));
                 return;
             }
             const status = await pollBulkJob(jobId, signal, (processed, total) => {
-                showInfoToast(`Processing ${processed}/${total} enrollments...`);
+                showInfoToast(t("messagesBulkProgress", { processed, total }));
             });
             if (signal.aborted)
                 return;
             if (status.status === "completed") {
                 const r = status.results;
                 if (r && ((_f = r.errors) === null || _f === void 0 ? void 0 : _f.length) > 0) {
-                    const summary = formatErrorSummary(r.errors);
-                    showSuccessToast(`Created ${r.created} | Updated ${r.updated} | Skipped ${r.skipped}\n${summary}`);
+                    const summary = formatErrorSummary(t, r.errors);
+                    showSuccessToast(t("messagesBulkResults", {
+                        created: r.created,
+                        updated: r.updated,
+                        skipped: r.skipped,
+                    }) +
+                        "\n" +
+                        summary);
                 }
                 else if (r) {
-                    showSuccessToast(`Created ${r.created} | Updated ${r.updated} | Skipped ${r.skipped}`);
+                    showSuccessToast(t("messagesBulkResults", {
+                        created: r.created,
+                        updated: r.updated,
+                        skipped: r.skipped,
+                    }));
                 }
                 else {
-                    showSuccessToast("Bulk operation completed successfully");
+                    showSuccessToast(t("messagesBulkSuccess"));
                 }
-                invalidateEnrollmentsCache();
                 const schoolId = ((_g = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _g === void 0 ? void 0 : _g.id) || "";
                 fetch(`${ENROLLMENT_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {
@@ -193,17 +213,20 @@ export const EnrollmentMoreActions = () => {
             else {
                 const r = status.results;
                 const detail = ((_h = r === null || r === void 0 ? void 0 : r.errors) === null || _h === void 0 ? void 0 : _h.length)
-                    ? formatErrorSummary(r.errors)
-                    : "Unknown error";
-                showErrorToast(`Bulk ${label} failed.\n${detail}`);
+                    ? formatErrorSummary(t, r.errors)
+                    : t("unknownError");
+                showErrorToast(t("messagesBulkFailed", { action: label }) + "\n" + detail);
             }
         }
         catch (error) {
             if (error.message === "Polling cancelled")
                 return;
-            showErrorToast(`Bulk ${label} failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+            showErrorToast(t("messagesBulkFailedDetail", {
+                action: label,
+                error: error instanceof Error ? error.message : t("unknownError"),
+            }));
         }
-    }, [dispatch]);
+    }, [dispatch, t]);
     const handleBulkCreate = useCallback((files) => handleBulkFlow(files, "POST"), [handleBulkFlow]);
     const handleBulkUpdate = useCallback((files) => handleBulkFlow(files, "PUT"), [handleBulkFlow]);
     const create = [

package/base-modules/expense/constants.js

@@ -51,6 +51,6 @@ export const PAYMENT_METHOD_OPTIONS = [
     { label: "Debit Card", value: "DEBIT_CARD" },
     { label: "Cheque", value: "CHEQUE" },
     { label: "Online", value: "ONLINE" },
-    { label: "UPI", value: "UPI" },
+    // { label: "UPI", value: "UPI" },
     { label: "Mobile Wallet", value: "MOBILE_WALLET" },
 ];

package/base-modules/expense/context.js

@@ -28,10 +28,9 @@ import { createGenericModule } from "@react-pakistan/util-functions/factory/gene
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { PAYMENT_METHOD, } from "../../type";
-import { getCachedExpenses, invalidateExpensesCache } from "./cache";
-import { expenseFormValidation } from "./validate";
 import { EXPENSE_API_ROUTES, pageLimit } from "./constants";
 import { getCachedWorkspaceSync } from "../workspace/cache";
+import { expenseFormValidation } from "./validate";
 // ============================================================================
 // 1.1 DRAWER TYPES
 // ============================================================================
@@ -155,12 +154,6 @@ export const useExpenseModule = () => {
     }), [state, schoolId]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
-    const isDefaultListState = state.currentPage === 1 &&
-        state.pageLimit === pageLimit &&
-        !debouncedQuery &&
-        state.filterEnabled === undefined &&
-        !state.filterCategory &&
-        !state.filterStatus;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -213,7 +206,6 @@ export const useExpenseModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateExpensesCache();
             showToast(isCreated ? t("messagesExpenseCreated") : t("messagesExpenseUpdated"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -241,7 +233,6 @@ export const useExpenseModule = () => {
             return;
         }
         if (data) {
-            invalidateExpensesCache();
             showToast(t("messagesExpenseDeleted"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -454,33 +445,15 @@ export const useExpenseModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
         if (!schoolId)
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedExpenses({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: EXPENSE_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-                }
-            })();
-            return;
-        }
         (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-    }, [dispatch, isDefaultListState, listParams, schoolId, showToast, t]);
-    // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    }, [listFetchNow]);
+    }, [listParams, schoolId]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/expense/filter.js

@@ -7,20 +7,67 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * filterCategory (combobox), and filterStatus (combobox).
  */
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useExpenseModule } from "./context";
-import { EXPENSE_CATEGORY_OPTIONS, EXPENSE_STATUS_OPTIONS } from "./constants";
+import { EXPENSE_CATEGORY_OPTIONS, EXPENSE_STATUS_OPTIONS, EXPENSE_API_ROUTES } from "./constants";
 import { useTranslations } from "next-intl";
 export const ExpenseFilter = () => {
     const { state, handleChange } = useExpenseModule();
     const { filterCategory, filterEnabled, filterStatus } = state;
     const t = useTranslations("expense");
+    const categoryLabelMap = {
+        SALARY: t("formOptionSalary"),
+        UTILITIES: t("formOptionUtilities"),
+        MAINTENANCE: t("formOptionMaintenance"),
+        SUPPLIES: t("formOptionSupplies"),
+        TRANSPORT: t("formOptionTransport"),
+        MARKETING: t("formOptionMarketing"),
+        INSURANCE: t("formOptionInsurance"),
+        RENT: t("formOptionRent"),
+        TECHNOLOGY: t("formOptionTechnology"),
+        PROFESSIONAL: t("formOptionProfessional"),
+        TRAINING: t("formOptionTraining"),
+        EVENTS: t("formOptionEvents"),
+        FOOD: t("formOptionFood"),
+        MISCELLANEOUS: t("formOptionMiscellaneous"),
+    };
+    const statusLabelMap = {
+        PENDING: t("formOptionPending"),
+        APPROVED: t("formOptionApproved"),
+        PAID: t("formOptionPaid"),
+        REJECTED: t("formOptionRejected"),
+        CANCELLED: t("formOptionCancelled"),
+    };
     const filterEnabledValue = filterEnabled === undefined
         ? "undefined"
         : filterEnabled
             ? "true"
             : "false";
-    return (_jsx("div", { className: "space-y-4", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedCombobox, { emptyText: t("filterNoCategoryFoundLabel"), id: "filterCategory", info: t("filterByCategory"), label: t("filterCategoryLabel"), onValueChange: (value) => handleChange("filterCategory", value), options: EXPENSE_CATEGORY_OPTIONS, placeholder: t("filterAllCategoriesLabel"), searchPlaceholder: t("filterSearchCategoriesLabel"), value: filterCategory || "" }), _jsx(EnhancedCombobox, { emptyText: t("filterNoStatusFoundLabel"), id: "filterStatus", info: t("filterByStatus"), label: t("filterOptionStatus"), onValueChange: (value) => handleChange("filterStatus", value), options: EXPENSE_STATUS_OPTIONS, placeholder: t("filterAllStatusesLabel"), searchPlaceholder: t("filterSearchStatusLabel"), value: filterStatus || "" }), _jsx(EnhancedRadio, { label: t("filterOptionEnabled"), name: "filterEnabled", value: filterEnabledValue, options: [
+    const { enhancedComboboxElement: filterCategoryCombo } = useEnhancedCombobox({
+        emptyText: t("filterNoCategoryFoundLabel"),
+        id: "filterCategory",
+        info: t("filterByCategory"),
+        label: t("filterCategoryLabel"),
+        onValueChange: (value) => handleChange("filterCategory", value),
+        options: EXPENSE_CATEGORY_OPTIONS.map((opt) => ({ id: opt.value, name: categoryLabelMap[opt.value] || opt.label })),
+        placeholder: t("filterAllCategoriesLabel"),
+        searchEndpoint: EXPENSE_API_ROUTES.UNIT,
+        searchPlaceholder: t("filterSearchCategoriesLabel"),
+        value: filterCategory || "",
+    });
+    const { enhancedComboboxElement: filterStatusCombo } = useEnhancedCombobox({
+        emptyText: t("filterNoStatusFoundLabel"),
+        id: "filterStatus",
+        info: t("filterByStatus"),
+        label: t("filterOptionStatus"),
+        onValueChange: (value) => handleChange("filterStatus", value),
+        options: EXPENSE_STATUS_OPTIONS.map((opt) => ({ id: opt.value, name: statusLabelMap[opt.value] || opt.label })),
+        placeholder: t("filterAllStatusesLabel"),
+        searchEndpoint: EXPENSE_API_ROUTES.UNIT,
+        searchPlaceholder: t("filterSearchStatusLabel"),
+        value: filterStatus || "",
+    });
+    return (_jsx("div", { className: "space-y-4", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [filterCategoryCombo, filterStatusCombo, _jsx(EnhancedRadio, { label: t("filterOptionEnabled"), name: "filterEnabled", value: filterEnabledValue, options: [
                         { label: t("filterOptionAll"), value: "undefined" },
                         { label: t("filterOptionEnabled"), value: "true" },
                         { label: t("filterOptionDisabled"), value: "false" },