@appcorp/fusion-storybook 0.2.40 → 0.2.42

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) })] }));
 };

package/base-modules/fee-structure/more-actions.js

@@ -8,7 +8,6 @@ import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
 import { feeStructureFormValidation } from "./validate";
 import { FEE_STRUCTURE_API_ROUTES, pageLimit } from "./constants";
-import { invalidateFeeStructuresCache } from "./cache";
 import { FEE_STRUCTURE_ACTION_TYPES, useFeeStructureContext } from "./context";
 import { useRef, useEffect, useCallback } from "react";
 const workspace = getCachedWorkspaceSync();
@@ -161,7 +160,6 @@ export const FeeStructureMoreActions = () => {
                 else {
                     showSuccessToast("Bulk operation completed successfully");
                 }
-                invalidateFeeStructuresCache();
                 const schoolId = ((_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id) || "";
                 fetch(`${FEE_STRUCTURE_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {

package/base-modules/rbac/context.d.ts

@@ -120,6 +120,7 @@ export declare const useRbacModule: () => {
     closeDrawer: () => void;
     deleteLoading: boolean;
     handleChange: (key: string, value: string | number | boolean | undefined) => void;
+    resetRecordFormState: () => void;
     handleCreate: () => void;
     handleDelete: (row?: TableRow) => void;
     handleEdit: (row?: TableRow) => Promise<void>;

package/base-modules/rbac/context.js

@@ -27,9 +27,7 @@ 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 { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
-import { USER_ROLE } from "../../type";
 import { RBAC_API_ROUTES, pageLimit } from "./constants";
-import { getCachedRoles, invalidateRolesCache } from "./cache";
 import { roleFormValidation } from "./validate";
 // ============================================================================
 // 1.1 DRAWER TYPES
@@ -105,7 +103,6 @@ export const useRbacModule = () => {
     }), [state.id, state.name, state.description]);
     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;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -154,7 +151,6 @@ export const useRbacModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateRolesCache();
             showToast(isCreated ? t("messagesRoleCreated") : t("messagesRoleUpdated"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -179,7 +175,6 @@ export const useRbacModule = () => {
             return;
         }
         if (data) {
-            invalidateRolesCache();
             showToast(t("messagesRoleDeleted"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -255,15 +250,31 @@ export const useRbacModule = () => {
             payload: { currentPage: 1 },
         });
     }, [dispatch]);
+    const resetRecordFormState = useCallback(() => {
+        dispatch({
+            type: RBAC_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "description", value: "" },
+        });
+        dispatch({
+            type: RBAC_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "enabled", value: true },
+        });
+        dispatch({
+            type: RBAC_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "name", value: "" },
+        });
+    }, [dispatch]);
     // row actions
     const handleView = useCallback((row) => {
+        resetRecordFormState();
         byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: row === null || row === void 0 ? void 0 : row.id } });
         dispatch({
             type: RBAC_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: RBAC_DRAWER.VIEW_DRAWER },
         });
-    }, [byIdFetchNow, dispatch]);
+    }, [byIdFetchNow, dispatch, resetRecordFormState]);
     const handleEdit = useCallback(async (row) => {
+        resetRecordFormState();
         byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: row === null || row === void 0 ? void 0 : row.id } });
         // loadAvailablePermissions is declared below in 1.4.7
         // await loadAvailablePermissions();
@@ -410,7 +421,6 @@ export const useRbacModule = () => {
             }
             // Refetch the role so rolePermissions in state reflects the change
             await (byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: state.id } }));
-            invalidateRolesCache();
         }
         catch (_a) {
             showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
@@ -468,35 +478,15 @@ export const useRbacModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Initial load + re-fetch on page/search change via cache
-    useEffect(() => {
-        var _a;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedRoles({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: RBAC_ACTION_TYPES.SET_ITEMS,
-                        payload: {
-                            items: items.filter((item) => item.userRole !== USER_ROLE.SUPER_ADMIN) || [],
-                            count: count || 0,
-                        },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-                }
-            })();
-            return;
-        }
-        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-    }, [dispatch, isDefaultListState, listParams, showToast, t]);
     // Sync listFetchNow into ref so callbacks can trigger re-fetch
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
     }, [listFetchNow]);
+    // Fetch list on mount and on page/search change
+    useEffect(() => {
+        var _a;
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [dispatch, listParams, showToast, t]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================
@@ -507,6 +497,7 @@ export const useRbacModule = () => {
         closeDrawer,
         deleteLoading,
         handleChange,
+        resetRecordFormState,
         handleCreate,
         handleDelete,
         handleEdit,

package/base-modules/school/context.js

@@ -259,7 +259,7 @@ export const useSchoolModule = () => {
         {
             enabled: true,
             handleOnClick: handleEdit,
-            label: t("actionHeaderEdit"),
+            label: t("actionsButtonEdit"),
             order: 0,
         },
     ], [handleEdit, t]);

package/base-modules/school/form.js

@@ -7,24 +7,44 @@ 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 { useSchoolModule } from "./context";
-import { getCachedTeachersSync } from "../teacher/cache";
 import { CURRENCY } from "../../type";
+import { SCHOOL_API_ROUTES } from "./constants";
 import { useTranslations } from "next-intl";
 export const SchoolForm = () => {
     const t = useTranslations("school");
     const { state, handleChange } = useSchoolModule();
-    const { address, city, code, country, currency, email, enabled, errors, logo, name, phone, postalCode, principalId, state: stateField, website, } = state;
-    // Currency options for combobox
-    const currencyOptions = Object.values(CURRENCY).map((c) => ({
-        label: c,
-        value: c,
-    }));
-    return (_jsx("div", { className: "space-y-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: t("formNameLabel"), value: name, onChange: (e) => handleChange("name", e.target.value), error: errors.name, placeholder: t("formNamePlaceholder"), required: true }), _jsx(EnhancedInput, { id: "code", label: t("formCodeLabel"), value: code, onChange: (e) => handleChange("code", e.target.value), error: errors.code, placeholder: t("formCodePlaceholder"), required: true, info: t("formCodeInfo") }), _jsx(EnhancedCombobox, { emptyText: t("formCurrencyEmptyText"), error: errors.currency, id: "currency", info: t("formCurrencyInfo"), label: t("formCurrencyLabel"), onValueChange: (value) => handleChange("currency", value), options: currencyOptions, placeholder: t("formCurrencyPlaceholder"), required: true, searchPlaceholder: t("formCurrencySearchPlaceholder"), value: currency }), _jsx(EnhancedInput, { id: "address", label: t("formAddressLabel"), value: address || "", onChange: (e) => handleChange("address", e.target.value), error: errors.address, placeholder: t("formAddressPlaceholder") }), _jsxs("div", { className: "grid grid-cols-2 gap-4", children: [_jsx(EnhancedInput, { id: "city", label: t("formCityLabel"), value: city || "", onChange: (e) => handleChange("city", e.target.value), error: errors.city, placeholder: t("formCityPlaceholder") }), _jsx(EnhancedInput, { id: "state", label: t("formStateLabel"), value: stateField || "", onChange: (e) => handleChange("state", e.target.value), error: errors.state, placeholder: t("formStatePlaceholder") })] }), _jsxs("div", { className: "grid grid-cols-2 gap-4", children: [_jsx(EnhancedInput, { id: "country", label: t("formCountryLabel"), value: country || "", onChange: (e) => handleChange("country", e.target.value), error: errors.country, placeholder: t("formCountryPlaceholder") }), _jsx(EnhancedInput, { id: "postalCode", label: t("formPostalCodeLabel"), value: postalCode || "", onChange: (e) => handleChange("postalCode", e.target.value), error: errors.postalCode, placeholder: t("formPostalCodePlaceholder") })] }), _jsxs("div", { className: "grid grid-cols-2 gap-4", children: [_jsx(EnhancedInput, { id: "phone", label: t("formPhoneLabel"), value: phone || "", onChange: (e) => handleChange("phone", e.target.value), error: errors.phone, placeholder: t("formPhonePlaceholder"), type: "tel" }), _jsx(EnhancedInput, { id: "email", label: t("formEmailLabel"), value: email || "", onChange: (e) => handleChange("email", e.target.value), error: errors.email, placeholder: t("formEmailPlaceholder"), type: "email" })] }), _jsx(EnhancedInput, { id: "website", label: t("formWebsiteLabel"), value: website || "", onChange: (e) => handleChange("website", e.target.value), error: errors.website, placeholder: t("formWebsitePlaceholder"), type: "url" }), _jsx(EnhancedInput, { id: "logo", label: t("formLogoLabel"), value: logo || "", onChange: (e) => handleChange("logo", e.target.value), error: errors.logo, placeholder: t("formLogoPlaceholder"), type: "url" }), _jsx(EnhancedCombobox, { emptyText: t("formPrincipalEmptyText"), error: errors.principalId, id: "principalId", info: t("formPrincipalInfo"), label: t("formPrincipalLabel"), onValueChange: (value) => handleChange("principalId", value), options: getCachedTeachersSync().items.map((teacher) => ({
-                        label: `${teacher.firstName || ""} ${teacher.lastName || ""}`.trim() ||
-                            teacher.teacherCode ||
-                            teacher.id,
-                        value: teacher.id,
-                    })), placeholder: t("formPrincipalPlaceholder"), searchPlaceholder: t("formPrincipalSearchPlaceholder"), value: principalId || "" }), _jsx(EnhancedCheckbox, { id: "enabled", label: t("formEnabledLabel"), checked: enabled, error: errors.enabled, onCheckedChange: (checked) => handleChange("enabled", checked), info: t("formEnabledInfo") })] }) }));
+    const { address, city, code, country, currency, email, enabled, errors, logo, name, phone, postalCode, 
+    // principalId,
+    state: stateField, website, } = state;
+    const { enhancedComboboxElement: currencyCombo } = useEnhancedCombobox({
+        emptyText: t("formCurrencyEmptyText"),
+        id: "currency",
+        info: t("formCurrencyInfo"),
+        label: t("formCurrencyLabel"),
+        onValueChange: (value) => handleChange("currency", value),
+        options: Object.values(CURRENCY).map((c) => ({ id: c, name: c })),
+        placeholder: t("formCurrencyPlaceholder"),
+        required: true,
+        searchEndpoint: SCHOOL_API_ROUTES.UNIT,
+        searchPlaceholder: t("formCurrencySearchPlaceholder"),
+        value: currency,
+    });
+    // const { enhancedComboboxElement: principalIdCombo } = useEnhancedCombobox({
+    //   emptyText: t("formPrincipalEmptyText"),
+    //   id: "principalId",
+    //   info: t("formPrincipalInfo"),
+    //   label: t("formPrincipalLabel"),
+    //   onValueChange: (value) => handleChange("principalId", value),
+    //   options: getCachedTeachersSync().items.map((teacher) => ({
+    //     id: teacher.id as string,
+    //     name: `${teacher.firstName || ""} ${teacher.lastName || ""}`.trim() || teacher.teacherCode || teacher.id,
+    //   })),
+    //   placeholder: t("formPrincipalPlaceholder"),
+    //   searchEndpoint: SCHOOL_API_ROUTES.UNIT,
+    //   searchPlaceholder: t("formPrincipalSearchPlaceholder"),
+    //   value: principalId || "",
+    // });
+    return (_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: t("formNameLabel"), value: name, onChange: (e) => handleChange("name", e.target.value), error: errors.name, placeholder: t("formNamePlaceholder"), required: true }), _jsx(EnhancedInput, { id: "code", label: t("formCodeLabel"), value: code, onChange: (e) => handleChange("code", e.target.value), error: errors.code, placeholder: t("formCodePlaceholder"), required: true, info: t("formCodeInfo") }), currencyCombo, _jsx(EnhancedInput, { id: "address", label: t("formAddressLabel"), value: address || "", onChange: (e) => handleChange("address", e.target.value), error: errors.address, placeholder: t("formAddressPlaceholder") }), _jsx(EnhancedInput, { id: "city", label: t("formCityLabel"), value: city || "", onChange: (e) => handleChange("city", e.target.value), error: errors.city, placeholder: t("formCityPlaceholder") }), _jsx(EnhancedInput, { id: "state", label: t("formStateLabel"), value: stateField || "", onChange: (e) => handleChange("state", e.target.value), error: errors.state, placeholder: t("formStatePlaceholder") }), _jsx(EnhancedInput, { id: "country", label: t("formCountryLabel"), value: country || "", onChange: (e) => handleChange("country", e.target.value), error: errors.country, placeholder: t("formCountryPlaceholder") }), _jsx(EnhancedInput, { id: "postalCode", label: t("formPostalCodeLabel"), value: postalCode || "", onChange: (e) => handleChange("postalCode", e.target.value), error: errors.postalCode, placeholder: t("formPostalCodePlaceholder") }), _jsx(EnhancedInput, { id: "phone", label: t("formPhoneLabel"), value: phone || "", onChange: (e) => handleChange("phone", e.target.value), error: errors.phone, placeholder: t("formPhonePlaceholder"), type: "tel" }), _jsx(EnhancedInput, { id: "email", label: t("formEmailLabel"), value: email || "", onChange: (e) => handleChange("email", e.target.value), error: errors.email, placeholder: t("formEmailPlaceholder"), type: "email" })] }), _jsx(EnhancedInput, { id: "website", label: t("formWebsiteLabel"), value: website || "", onChange: (e) => handleChange("website", e.target.value), error: errors.website, placeholder: t("formWebsitePlaceholder"), type: "url" }), _jsx(EnhancedInput, { id: "logo", label: t("formLogoLabel"), value: logo || "", onChange: (e) => handleChange("logo", e.target.value), error: errors.logo, placeholder: t("formLogoPlaceholder"), type: "url" }), _jsx(EnhancedCheckbox, { id: "enabled", label: t("formEnabledLabel"), checked: enabled, error: errors.enabled, onCheckedChange: (checked) => handleChange("enabled", checked), info: t("formEnabledInfo") })] }));
 };

package/base-modules/section/context.d.ts

@@ -128,6 +128,7 @@ export declare const useSectionModule: () => {
     }[];
     listFetchNow: (url?: string, config?: import("@react-pakistan/util-functions/hooks/use-fetch").FetchConfig) => void;
     listLoading: boolean;
+    resetRecordFormState: () => void;
     rowActions: RowAction[];
     toggleStatus: (row?: TableRow) => void;
     updateLoading: boolean;