@appcorp/fusion-storybook 0.2.40 → 0.2.44

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();
@@ -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 FeeStructureMoreActions = () => {
@@ -104,7 +105,7 @@ export const FeeStructureMoreActions = () => {
         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;
         }
         const validationErrors = [];
@@ -119,7 +120,7 @@ export const FeeStructureMoreActions = () => {
             }
             else {
                 if (!((_b = row.id) === null || _b === void 0 ? void 0 : _b.trim()))
-                    msgs.push("id is required for update");
+                    msgs.push(t("validationRequiredIdForUpdate"));
             }
             if (msgs.length > 0) {
                 validationErrors.push({ row: i + 1, messages: msgs });
@@ -128,40 +129,59 @@ export const FeeStructureMoreActions = () => {
         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} fee structures...`);
+                showInfoToast(t("messagesBulkProgress", { processed, total }));
             });
             if (signal.aborted)
                 return;
             if (status.status === "completed") {
                 const r = status.results;
                 if (r && ((_c = r.errors) === null || _c === void 0 ? void 0 : _c.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"));
                 }
-                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: {
@@ -187,17 +207,20 @@ export const FeeStructureMoreActions = () => {
             else {
                 const r = status.results;
                 const detail = ((_e = r === null || r === void 0 ? void 0 : r.errors) === null || _e === void 0 ? void 0 : _e.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/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();
@@ -271,7 +282,7 @@ export const useRbacModule = () => {
             type: RBAC_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: RBAC_DRAWER.FORM_DRAWER },
         });
-    }, [byIdFetchNow, dispatch]);
+    }, [byIdFetchNow, dispatch, resetRecordFormState]);
     const handleDelete = useCallback((row) => {
         if (!confirm(t("messagesDeleteConfirmation")))
             return;
@@ -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/rbac/form.js

@@ -9,7 +9,9 @@ import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { Separator } from "@appcorp/shadcn/components/ui/separator";
 import { useRbacModule } from "./context";
 import { AssignPermissions } from "./assign-permissions";
+import { useTranslations } from "next-intl";
 export const RbacForm = () => {
+    const t = useTranslations("rbac");
     const { state, handleChange } = useRbacModule();
-    return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: "Role Name", required: true, type: "text", value: state.name || "", onChange: (e) => handleChange("name", e.target.value), error: state.errors.name, placeholder: "e.g. Class Teacher, Admin, Accountant", info: "A unique, descriptive name for this role" }), _jsx(EnhancedInput, { id: "description", label: "Description", type: "text", value: state.description || "", onChange: (e) => handleChange("description", e.target.value || undefined), error: state.errors.description, placeholder: "Brief description of what this role can do", info: "Optional description to clarify the role's purpose" })] }), state.id && (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "space-y-2", children: [_jsx("p", { className: "text-sm font-medium", children: "Permissions" }), _jsx(AssignPermissions, {})] })] }))] }));
+    return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: t("formNameLabel"), required: true, type: "text", value: state.name || "", onChange: (e) => handleChange("name", e.target.value), error: state.errors.name, placeholder: t("formNamePlaceholder"), info: t("formNameInfo") }), _jsx(EnhancedInput, { id: "description", label: t("formDescriptionLabel"), type: "text", value: state.description || "", onChange: (e) => handleChange("description", e.target.value || undefined), error: state.errors.description, placeholder: t("formDescriptionPlaceholder"), info: t("formDescriptionInfo") })] }), state.id && (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "space-y-2", children: [_jsx("p", { className: "text-sm font-medium", children: t("viewSectionPermissions") }), _jsx(AssignPermissions, {})] })] }))] }));
 };

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;

package/base-modules/section/context.js

@@ -9,7 +9,7 @@
  * Key responsibilities:
  * - Expose `useSectionModule()` which UI components call for actions
  * - Keep module-specific `apiParams` and callbacks in one place
- * - Ensure cache invalidation and toast notifications on mutation
+ * - Ensure toast notifications on mutation
  *
  * Exported utilities:
  * - `SectionProvider` — provider component used by the page
@@ -28,7 +28,6 @@ import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-com
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { SECTION_API_ROUTES, pageLimit } from "./constants";
 import { sectionFormValidation } from "./validate";
-import { getCachedSections, invalidateSectionsCache } from "./cache";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 // ============================================================================
 // 1.1 DRAWER TYPES
@@ -136,6 +135,30 @@ export const useSectionModule = () => {
             payload: { drawer: null },
         });
     }, [dispatch]);
+    const resetRecordFormState = useCallback(() => {
+        dispatch({
+            type: SECTION_ACTION_TYPES.SET_ERRORS,
+            payload: { errors: {} },
+        });
+        dispatch({
+            type: SECTION_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: false },
+        });
+        dispatch({
+            type: SECTION_ACTION_TYPES.SET_FORM_DATA,
+            payload: {
+                form: {
+                    capacity: null,
+                    classId: "",
+                    enabled: true,
+                    filterEnabled: undefined,
+                    id: "",
+                    name: "",
+                    schoolId,
+                },
+            },
+        });
+    }, [dispatch, schoolId]);
     // ============================================================================
     // 1.4.4 API CALLBACKS
     // ============================================================================
@@ -161,7 +184,6 @@ export const useSectionModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateSectionsCache();
             showToast(isCreated ? t("messagesCreateSuccess") : t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -186,7 +208,6 @@ export const useSectionModule = () => {
             return;
         }
         if (data) {
-            invalidateSectionsCache();
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -239,19 +260,21 @@ export const useSectionModule = () => {
         });
     }, [dispatch]);
     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: SECTION_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: SECTION_DRAWER.VIEW_DRAWER },
         });
-    }, [byIdFetchNow, dispatch]);
+    }, [byIdFetchNow, dispatch, resetRecordFormState]);
     const handleEdit = 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: SECTION_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: SECTION_DRAWER.FORM_DRAWER },
         });
-    }, [byIdFetchNow, dispatch]);
+    }, [byIdFetchNow, dispatch, resetRecordFormState]);
     const handleDelete = useCallback((row) => {
         if (!confirm(t("messagesDeleteConfirmation")))
             return;
@@ -372,19 +395,19 @@ export const useSectionModule = () => {
         {
             enabled: true,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 0,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 1,
         },
         {
             enabled: true,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAdd"),
+            label: t("actionsButtonAdd"),
             order: 2,
         },
     ], [handleCreate, handleFilters, handleMoreActions, t]);
@@ -392,70 +415,39 @@ export const useSectionModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.enabled) === false,
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
             variant: "destructive",
         },
         {
             enabled: false,
             handleOnClick: toggleStatus,
-            label: t("actionRowToggleStatus"),
+            label: t("actionsButtonToggleStatus"),
             order: 4,
         },
     ], [handleDelete, handleEdit, handleView, t, toggleStatus]);
     // ============================================================================
     // 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 getCachedSections({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: SECTION_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesFetchFailed"), 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);
-        }
-    }, [dispatch, listParams, schoolId, showToast, t]);
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [listParams]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================
@@ -480,6 +472,7 @@ export const useSectionModule = () => {
         headerActions,
         listFetchNow,
         listLoading,
+        resetRecordFormState,
         rowActions,
         toggleStatus,
         updateLoading });