@appcorp/fusion-storybook 0.2.40 → 0.2.44

package/base-modules/expense/form.js

@@ -6,13 +6,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Create / update form for an expense record.
  */
 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 { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
 import { EnhancedDropzone } from "@appcorp/shadcn/components/enhanced-dropzone";
-import { useState } from "react";
 import { useExpenseModule } from "./context";
-import { EXPENSE_CATEGORY_OPTIONS, EXPENSE_STATUS_OPTIONS, PAYMENT_METHOD_OPTIONS, } from "./constants";
+import { EXPENSE_CATEGORY_OPTIONS, EXPENSE_STATUS_OPTIONS, PAYMENT_METHOD_OPTIONS, EXPENSE_API_ROUTES, } from "./constants";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 import { useTranslations } from "next-intl";
 export const ExpenseForm = () => {
@@ -22,9 +21,86 @@ export const ExpenseForm = () => {
     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("expense");
-    const [categorySearchQuery, setCategorySearchQuery] = useState("");
-    const filteredCategoryOptions = EXPENSE_CATEGORY_OPTIONS.filter((opt) => opt.label.toLowerCase().includes(categorySearchQuery.toLowerCase()));
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.title, id: "title", info: t("formTitleInfo"), label: t("formTitleLabel"), onChange: (e) => handleChange("title", e.target.value), placeholder: t("formTitlePlaceholder"), required: true, type: "text", value: title || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoCategoryEmpty"), error: errors.category, id: "category", info: t("formCategoryInfo"), label: t("formCategoryLabel"), onSearchChange: setCategorySearchQuery, onValueChange: (value) => handleChange("category", value), options: filteredCategoryOptions, placeholder: t("formCategoryPlaceholder"), required: true, searchPlaceholder: t("formSearchCategoriesPlaceholder"), value: category || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoStatusEmpty"), error: errors.status, id: "status", info: t("formStatusInfo"), label: t("formOptionStatus"), onValueChange: (value) => handleChange("status", value), options: EXPENSE_STATUS_OPTIONS, placeholder: t("formStatusPlaceholder"), required: true, searchPlaceholder: t("formSearchStatusPlaceholder"), value: status || "" }), _jsx(EnhancedInput, { error: errors.amount, id: "amount", info: `${t("formAmountInfo")} ${currency}`, label: t("formAmountLabel"), min: "0", onChange: (e) => handleChange("amount", Number(e.target.value)), placeholder: "0.00", required: true, step: "0.01", type: "number", value: amount }), _jsx(EnhancedInput, { error: errors.expenseDate, id: "expenseDate", info: t("formExpenseDateInfo"), label: t("formExpenseDateLabel"), onChange: (e) => handleChange("expenseDate", e.target.value), required: true, type: "date", value: expenseDate || "" }), _jsx(EnhancedTextarea, { error: errors.description, id: "description", label: t("formDescriptionLabel"), onChange: (e) => handleChange("description", e.target.value), placeholder: t("formDescriptionPlaceholder"), rows: 3, value: description || "" }), _jsx(EnhancedInput, { error: errors.vendorName, id: "vendorName", info: t("formVendorNameInfo"), label: t("formVendorNameLabel"), onChange: (e) => handleChange("vendorName", e.target.value), placeholder: t("formVendorNamePlaceholder"), type: "text", value: vendorName || "" }), _jsx(EnhancedInput, { error: errors.vendorContact, id: "vendorContact", info: t("formVendorContactInfo"), label: t("formVendorContactLabel"), onChange: (e) => handleChange("vendorContact", e.target.value), placeholder: t("formVendorContactPlaceholder"), type: "text", value: vendorContact || "" }), _jsx(EnhancedInput, { error: errors.invoiceNumber, id: "invoiceNumber", info: t("formInvoiceNumberInfo"), label: t("formInvoiceNumberLabel"), onChange: (e) => handleChange("invoiceNumber", e.target.value), placeholder: t("formInvoiceNumberPlaceholder"), type: "text", value: invoiceNumber || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoPaymentMethodEmpty"), error: errors.paymentMethod, id: "paymentMethod", info: t("formPaymentMethodInfo"), label: t("formPaymentMethodLabel"), onValueChange: (value) => handleChange("paymentMethod", value), options: PAYMENT_METHOD_OPTIONS, placeholder: t("formPaymentMethodPlaceholder"), searchPlaceholder: t("formSearchPaymentMethodsPlaceholder"), value: paymentMethod || "" }), _jsx(EnhancedInput, { error: errors.paymentDate, id: "paymentDate", info: t("formPaymentDateInfo"), label: t("formPaymentDateLabel"), onChange: (e) => handleChange("paymentDate", e.target.value), type: "date", value: paymentDate || "" }), _jsx(EnhancedInput, { error: errors.receiptNumber, id: "receiptNumber", info: t("formReceiptNumberInfo"), label: t("formReceiptNumberLabel"), onChange: (e) => handleChange("receiptNumber", e.target.value), placeholder: t("formReceiptNumberPlaceholder"), type: "text", value: receiptNumber || "" }), _jsx(EnhancedInput, { error: errors.transactionId, id: "transactionId", info: t("formTransactionIdInfo"), label: t("formTransactionIdLabel"), onChange: (e) => handleChange("transactionId", e.target.value), placeholder: t("formTransactionIdPlaceholder"), type: "text", value: transactionId || "" }), _jsx(EnhancedTextarea, { error: errors.remarks, id: "remarks", label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 3, value: remarks || "" }), _jsx(EnhancedDropzone, { accept: ["image/*", "application/pdf"], error: errors.attachments, id: "attachments", info: t("formAttachmentsInfo"), label: t("formAttachmentsLabel"), maxFiles: 10, onChange: (files) => {
+    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 paymentMethodLabelMap = {
+        CASH: t("formOptionCash"),
+        BANK_TRANSFER: t("formOptionBankTransfer"),
+        CREDIT_CARD: t("formOptionCreditCard"),
+        DEBIT_CARD: t("formOptionDebitCard"),
+        CHEQUE: t("formOptionCheque"),
+        ONLINE: t("formOptionOnline"),
+        MOBILE_WALLET: t("formOptionMobileWallet"),
+    };
+    const { enhancedComboboxElement: categoryCombo } = useEnhancedCombobox({
+        emptyText: t("formNoCategoryEmpty"),
+        id: "category",
+        info: t("formCategoryInfo"),
+        label: t("formCategoryLabel"),
+        onValueChange: (value) => handleChange("category", value),
+        options: EXPENSE_CATEGORY_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: categoryLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: t("formCategoryPlaceholder"),
+        required: true,
+        searchEndpoint: EXPENSE_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchCategoriesPlaceholder"),
+        value: category || "",
+    });
+    const { enhancedComboboxElement: statusCombo } = useEnhancedCombobox({
+        emptyText: t("formNoStatusEmpty"),
+        id: "status",
+        info: t("formStatusInfo"),
+        label: t("formOptionStatus"),
+        onValueChange: (value) => handleChange("status", value),
+        options: EXPENSE_STATUS_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: statusLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: t("formStatusPlaceholder"),
+        required: true,
+        searchEndpoint: EXPENSE_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchStatusPlaceholder"),
+        value: status || "",
+    });
+    const { enhancedComboboxElement: paymentMethodCombo } = useEnhancedCombobox({
+        emptyText: t("formNoPaymentMethodEmpty"),
+        id: "paymentMethod",
+        info: t("formPaymentMethodInfo"),
+        label: t("formPaymentMethodLabel"),
+        onValueChange: (value) => handleChange("paymentMethod", value),
+        options: PAYMENT_METHOD_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: paymentMethodLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: t("formPaymentMethodPlaceholder"),
+        searchEndpoint: EXPENSE_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchPaymentMethodsPlaceholder"),
+        value: paymentMethod || "",
+    });
+    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.title, id: "title", info: t("formTitleInfo"), label: t("formTitleLabel"), onChange: (e) => handleChange("title", e.target.value), placeholder: t("formTitlePlaceholder"), required: true, type: "text", value: title || "" }), categoryCombo, statusCombo, _jsx(EnhancedInput, { error: errors.amount, id: "amount", info: `${t("formAmountInfo")} ${currency}`, label: t("formAmountLabel"), min: "0", onChange: (e) => handleChange("amount", Number(e.target.value)), placeholder: "0.00", required: true, step: "0.01", type: "number", value: amount }), _jsx(EnhancedInput, { error: errors.expenseDate, id: "expenseDate", info: t("formExpenseDateInfo"), label: t("formExpenseDateLabel"), onChange: (e) => handleChange("expenseDate", e.target.value), required: true, type: "date", value: expenseDate || "" }), _jsx(EnhancedTextarea, { error: errors.description, id: "description", label: t("formDescriptionLabel"), onChange: (e) => handleChange("description", e.target.value), placeholder: t("formDescriptionPlaceholder"), rows: 3, value: description || "" }), _jsx(EnhancedInput, { error: errors.vendorName, id: "vendorName", info: t("formVendorNameInfo"), label: t("formVendorNameLabel"), onChange: (e) => handleChange("vendorName", e.target.value), placeholder: t("formVendorNamePlaceholder"), type: "text", value: vendorName || "" }), _jsx(EnhancedInput, { error: errors.vendorContact, id: "vendorContact", info: t("formVendorContactInfo"), label: t("formVendorContactLabel"), onChange: (e) => handleChange("vendorContact", e.target.value), placeholder: t("formVendorContactPlaceholder"), type: "text", value: vendorContact || "" }), _jsx(EnhancedInput, { error: errors.invoiceNumber, id: "invoiceNumber", info: t("formInvoiceNumberInfo"), label: t("formInvoiceNumberLabel"), onChange: (e) => handleChange("invoiceNumber", e.target.value), placeholder: t("formInvoiceNumberPlaceholder"), type: "text", value: invoiceNumber || "" }), paymentMethodCombo, _jsx(EnhancedInput, { error: errors.paymentDate, id: "paymentDate", info: t("formPaymentDateInfo"), label: t("formPaymentDateLabel"), onChange: (e) => handleChange("paymentDate", e.target.value), type: "date", value: paymentDate || "" }), _jsx(EnhancedInput, { error: errors.receiptNumber, id: "receiptNumber", info: t("formReceiptNumberInfo"), label: t("formReceiptNumberLabel"), onChange: (e) => handleChange("receiptNumber", e.target.value), placeholder: t("formReceiptNumberPlaceholder"), type: "text", value: receiptNumber || "" }), _jsx(EnhancedInput, { error: errors.transactionId, id: "transactionId", info: t("formTransactionIdInfo"), label: t("formTransactionIdLabel"), onChange: (e) => handleChange("transactionId", e.target.value), placeholder: t("formTransactionIdPlaceholder"), type: "text", value: transactionId || "" }), _jsx(EnhancedTextarea, { error: errors.remarks, id: "remarks", label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 3, value: remarks || "" }), _jsx(EnhancedDropzone, { accept: ["image/*", "application/pdf"], error: errors.attachments, id: "attachments", info: t("formAttachmentsInfo"), label: t("formAttachmentsLabel"), maxFiles: 10, onChange: (files) => {
                     const urls = files.map((f) => URL.createObjectURL(f));
                     handleChange("attachments", urls);
                 }, onRemoveRemote: (url) => {

package/base-modules/family/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 { FAMILY_API_ROUTES, pageLimit } from "./constants";
-import { getCachedFamilies, invalidateFamiliesCache } from "./cache";
 import { familyFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { useTranslations } from "next-intl";
@@ -133,10 +132,6 @@ export const useFamilyModule = () => {
     ]);
     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;
     // ==========================================================================
     // 1.4.3 UTILITIES
     // ==========================================================================
@@ -192,7 +187,6 @@ export const useFamilyModule = () => {
         }
         if (data) {
             showToast(t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateFamiliesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -230,7 +224,6 @@ export const useFamilyModule = () => {
         }
         if (data) {
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateFamiliesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -293,7 +286,7 @@ export const useFamilyModule = () => {
         });
     }, [dispatch, byIdFetchNow]);
     const handleDelete = useCallback((row) => {
-        if (!confirm(t("actionDeleteConfirmation")))
+        if (!confirm(t("messagesDeleteConfirmation")))
             return;
         deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, {
             body: JSON.stringify({ id: row === null || row === void 0 ? void 0 : row.id }),
@@ -394,21 +387,21 @@ export const useFamilyModule = () => {
         {
             enabled: false,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 1,
             icon: MoreHorizontal,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 2,
             icon: Filter,
         },
         {
             enabled: false,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAddFamily"),
+            label: t("actionsButtonAddFamily"),
             order: 3,
             icon: Plus,
         },
@@ -417,14 +410,14 @@ export const useFamilyModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
             icon: Eye,
         },
         {
             enabled: true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
             icon: Pencil,
         },
@@ -436,32 +429,8 @@ export const useFamilyModule = () => {
         var _a, _b;
         if (!((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id))
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedFamilies({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: FAMILY_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-                }
-            })();
-            return;
-        }
         (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
-    }, [
-        isDefaultListState,
-        listParams,
-        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id,
-        dispatch,
-        showToast,
-        t,
-    ]);
+    }, [listParams, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id]);
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
     }, [listFetchNow]);

package/base-modules/family-member/context.js

@@ -26,7 +26,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 { FAMILY_MEMBER_API_ROUTES, pageLimit } from "./constants";
-import { getCachedFamilyMembers, invalidateFamilyMembersCache } from "./cache";
 import { familyMemberFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
@@ -159,11 +158,6 @@ export const useFamilyMemberModule = () => {
     ]);
     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.familyId;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -229,7 +223,6 @@ export const useFamilyMemberModule = () => {
         }
         if (data) {
             showToast(t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateFamilyMembersCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -273,7 +266,6 @@ export const useFamilyMemberModule = () => {
         }
         if (data) {
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateFamilyMembersCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -354,7 +346,7 @@ export const useFamilyMemberModule = () => {
         });
     }, [dispatch, byIdFetchNow]);
     const handleDelete = useCallback((row) => {
-        if (!confirm(t("actionDeleteConfirmation")))
+        if (!confirm(t("messagesDeleteConfirmation")))
             return;
         deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, {
             body: JSON.stringify({ id: row === null || row === void 0 ? void 0 : row.id }),
@@ -437,21 +429,21 @@ export const useFamilyMemberModule = () => {
         {
             enabled: false,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 1,
             icon: MoreHorizontal,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 2,
             icon: Filter,
         },
         {
             enabled: false,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAddFamilyMember"),
+            label: t("actionsButtonAddFamilyMember"),
             order: 3,
             icon: Plus,
         },
@@ -460,14 +452,14 @@ export const useFamilyMemberModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
             icon: Eye,
         },
         {
             enabled: true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
             icon: Pencil,
         },
@@ -479,32 +471,8 @@ export const useFamilyMemberModule = () => {
         var _a, _b;
         if (!((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id))
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedFamilyMembers({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: FAMILY_MEMBER_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-                }
-            })();
-            return;
-        }
         (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
-    }, [
-        dispatch,
-        isDefaultListState,
-        listParams,
-        showToast,
-        t,
-        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id,
-    ]);
+    }, [listParams, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id]);
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
     }, [listFetchNow]);

package/base-modules/fee-structure/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 { FEE_STRUCTURE_API_ROUTES, pageLimit } from "./constants";
-import { getCachedFeeStructures, invalidateFeeStructuresCache } from "./cache";
 import { feeStructureFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { FEE_TYPE } from "../../type";
@@ -104,10 +103,6 @@ export const useFeeStructureModule = () => {
     const updateParams = useMemo(() => (Object.assign(Object.assign(Object.assign({}, (state.id ? { id: state.id } : {})), (!state.id ? { schoolId } : {})), { amount: Number(state.amount), classId: state.classId || null, description: state.description || null, enabled: state.enabled, feeType: state.feeType, frequency: state.frequency || null, name: state.name })), [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;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -158,7 +153,6 @@ export const useFeeStructureModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateFeeStructuresCache();
             showToast(isCreated
                 ? t("messagesFeeStructureCreated")
                 : t("messagesFeeStructureUpdated"), TOAST_VARIANT.SUCCESS);
@@ -185,7 +179,6 @@ export const useFeeStructureModule = () => {
             return;
         }
         if (data) {
-            invalidateFeeStructuresCache();
             showToast(t("messagesFeeStructureDeleted"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -408,25 +401,8 @@ export const useFeeStructureModule = () => {
         var _a;
         if (!schoolId)
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedFeeStructures({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: FEE_STRUCTURE_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, showToast, t, schoolId]);
+    }, [dispatch, listParams, showToast, t, schoolId]);
     // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;

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

@@ -6,103 +6,91 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Form for creating/updating fee structures.
  */
 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 { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
-import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
-import { useEffect, useMemo, useState } from "react";
 import { useFeeStructureModule } from "./context";
-import { FEE_TYPE_OPTIONS, FREQUENCY_OPTIONS } from "./constants";
-import { getCachedClasses, getCachedClassesSync } from "../class/cache";
+import { FEE_TYPE_OPTIONS, FREQUENCY_OPTIONS, FEE_STRUCTURE_API_ROUTES, } from "./constants";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 import { useTranslations } from "next-intl";
+import { useFetch } from "@react-pakistan/util-functions/hooks/use-fetch";
+import { API_METHODS } from "@react-pakistan/util-functions";
 export const FeeStructureForm = () => {
-    var _a, _b, _c;
+    var _a, _b;
     const { state, handleChange } = useFeeStructureModule();
     const { amount, classId, description, enabled, errors, feeType, frequency, name, } = state;
     const t = useTranslations("feeStructure");
+    const feeTypeLabelMap = {
+        TUITION: t("formOptionTuition"),
+        ADMISSION: t("formOptionAdmission"),
+        EXAM: t("formOptionExam"),
+        LIBRARY: t("formOptionLibrary"),
+        LABORATORY: t("formOptionLaboratory"),
+        TRANSPORT: t("formOptionTransport"),
+        SPORTS: t("formOptionSports"),
+        MISCELLANEOUS: t("formOptionMiscellaneous"),
+        LATE: t("formOptionLate"),
+    };
+    const frequencyLabelMap = {
+        Monthly: t("formOptionMonthly"),
+        Quarterly: t("formOptionQuarterly"),
+        "Semi-Annual": t("formOptionSemiAnnual"),
+        Annual: t("formOptionAnnual"),
+        "One-time": t("formOptionOneTime"),
+    };
     const workspace = getCachedWorkspaceSync();
-    const schoolId = ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "";
-    const cachedClasses = getCachedClassesSync();
-    const [classSearchQuery, setClassSearchQuery] = useState("");
-    const [remoteClassOptions, setRemoteClassOptions] = useState(() => cachedClasses.items.map((cls) => ({
-        label: `${cls.name} (${cls.code})`,
-        value: cls.id,
-    })));
-    const [classOptionsLoading, setClassOptionsLoading] = useState(false);
-    const debouncedClassSearchQuery = useDebounce(classSearchQuery, 300);
-    const trimmedClassSearchQuery = debouncedClassSearchQuery.trim();
-    const cachedClassOptions = useMemo(() => cachedClasses.items.map((cls) => ({
-        label: `${cls.name} (${cls.code})`,
-        value: cls.id,
-    })), [cachedClasses.items]);
-    const selectedClassOption = useMemo(() => {
-        const selectedClass = cachedClasses.items.find((item) => item.id === classId);
-        return selectedClass
-            ? [
-                {
-                    label: `${selectedClass.name} (${selectedClass.code})`,
-                    value: selectedClass.id,
-                },
-            ]
-            : [];
-    }, [cachedClasses.items, classId]);
-    const displayedClassOptions = useMemo(() => {
-        const sourceOptions = trimmedClassSearchQuery
-            ? remoteClassOptions
-            : cachedClassOptions;
-        const mergedOptions = [...selectedClassOption, ...sourceOptions];
-        const uniqueOptions = new Map(mergedOptions.map((option) => [option.value, option]));
-        return [...uniqueOptions.values()];
-    }, [
-        cachedClassOptions,
-        remoteClassOptions,
-        selectedClassOption,
-        trimmedClassSearchQuery,
-    ]);
-    useEffect(() => {
-        if (!trimmedClassSearchQuery || !schoolId)
-            return;
-        let isActive = true;
-        const fetchClasses = async () => {
-            setClassOptionsLoading(true);
-            try {
-                const { items } = await getCachedClasses({
-                    params: {
-                        schoolId,
-                        searchQuery: trimmedClassSearchQuery,
-                    },
-                });
-                if (!isActive)
-                    return;
-                setRemoteClassOptions((items || []).map((cls) => ({
-                    label: `${cls.name} (${cls.code})`,
-                    value: cls.id,
-                })));
-            }
-            catch (_a) {
-                if (!isActive)
-                    return;
-                setRemoteClassOptions([]);
-            }
-            finally {
-                if (isActive) {
-                    setClassOptionsLoading(false);
-                }
-            }
-        };
-        void fetchClasses();
-        return () => {
-            isActive = false;
-        };
-    }, [schoolId, trimmedClassSearchQuery]);
-    return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.name, id: "name", info: t("formNameInfo"), label: t("formNameLabel"), onChange: (e) => handleChange("name", e.target.value), placeholder: t("formNamePlaceholder"), required: true, value: name || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoFeeTypeEmpty"), error: errors.feeType, id: "feeType", info: t("formFeeTypeInfo"), label: t("formOptionFeeType"), onValueChange: (value) => handleChange("feeType", value), options: FEE_TYPE_OPTIONS.map((opt) => ({
-                            label: t(`feeType${opt.value.charAt(0).toUpperCase() + opt.value.slice(1).toLowerCase()}`),
-                            value: opt.value,
-                        })), placeholder: t("formFeeTypePlaceholder"), required: true, searchPlaceholder: t("formSearchFeeTypePlaceholder"), value: feeType || "" }), _jsx(EnhancedInput, { error: errors.amount, id: "amount", info: t(`amountInfo`, {
-                            currency: (_c = (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.currency) !== null && _c !== void 0 ? _c : "",
-                        }), label: t("formAmountLabel"), min: "0", onChange: (e) => handleChange("amount", Number(e.target.value)), placeholder: t("formAmountPlaceholder"), required: true, step: "0.01", type: "number", value: amount }), _jsx(EnhancedCombobox, { emptyText: t("formNoFrequencyEmpty"), id: "frequency", info: t("formFrequencyInfo"), label: t("formOptionFrequency"), onValueChange: (value) => handleChange("frequency", value), options: FREQUENCY_OPTIONS.map((opt) => ({
-                            label: t(`frequency${opt.value.replace(/-/g, "")}`),
-                            value: opt.value,
-                        })), placeholder: t("formFrequencyPlaceholder"), searchPlaceholder: t("formSearchFrequencyPlaceholder"), value: frequency || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoClassEmpty"), id: "classId", info: t("formClassInfo"), label: t("formClassLabel"), loading: classOptionsLoading && Boolean(trimmedClassSearchQuery), onSearchChange: setClassSearchQuery, onValueChange: (value) => handleChange("classId", value || null), options: displayedClassOptions, placeholder: t("formClassPlaceholder"), searchPlaceholder: t("formSearchClassPlaceholder"), value: classId || "" }), _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(EnhancedCheckbox, { defaultChecked: enabled, label: t("formActiveFeeStructureLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
+    const { data: classes } = useFetch("/api/v1/class", {
+        params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
+        method: API_METHODS.GET,
+    });
+    // const cachedClasses = getCachedClassesSync();
+    const { enhancedComboboxElement: feeTypeCombo } = useEnhancedCombobox({
+        emptyText: t("formNoFeeTypeEmpty"),
+        id: "feeType",
+        info: t("formFeeTypeInfo"),
+        label: t("formOptionFeeType"),
+        onValueChange: (value) => handleChange("feeType", value),
+        options: FEE_TYPE_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: feeTypeLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: t("formFeeTypePlaceholder"),
+        required: true,
+        searchEndpoint: FEE_STRUCTURE_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchFeeTypePlaceholder"),
+        value: feeType || "",
+    });
+    const { enhancedComboboxElement: frequencyCombo } = useEnhancedCombobox({
+        emptyText: t("formNoFrequencyEmpty"),
+        id: "frequency",
+        info: t("formFrequencyInfo"),
+        label: t("formOptionFrequency"),
+        onValueChange: (value) => handleChange("frequency", value),
+        options: FREQUENCY_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: frequencyLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: t("formFrequencyPlaceholder"),
+        searchEndpoint: FEE_STRUCTURE_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchFrequencyPlaceholder"),
+        value: frequency || "",
+    });
+    const { enhancedComboboxElement: classIdCombo } = useEnhancedCombobox({
+        emptyText: t("formNoClassEmpty"),
+        id: "classId",
+        info: t("formClassInfo"),
+        label: t("formClassLabel"),
+        onValueChange: (value) => handleChange("classId", value || null),
+        options: classes === null || classes === void 0 ? void 0 : classes.map((cls) => ({
+            id: cls.id,
+            name: `${cls.name} (${cls.code})`,
+        })),
+        placeholder: t("formClassPlaceholder"),
+        searchEndpoint: FEE_STRUCTURE_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchClassPlaceholder"),
+        value: classId || "",
+    });
+    return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.name, id: "name", info: t("formNameInfo"), label: t("formNameLabel"), onChange: (e) => handleChange("name", e.target.value), placeholder: t("formNamePlaceholder"), required: true, value: name || "" }), feeTypeCombo, _jsx(EnhancedInput, { error: errors.amount, id: "amount", info: t(`amountInfo`, {
+                            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 : "",
+                        }), label: t("formAmountLabel"), min: "0", onChange: (e) => handleChange("amount", Number(e.target.value)), placeholder: t("formAmountPlaceholder"), required: true, step: "0.01", type: "number", value: amount }), frequencyCombo, classIdCombo, _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(EnhancedCheckbox, { defaultChecked: enabled, label: t("formActiveFeeStructureLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
 };