@appcorp/fusion-storybook 0.2.39 → 0.2.42

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

@@ -8,13 +8,9 @@ import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-ut
 import { STUDENT_STATUS } from "../../../type";
 import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
 import { formatPhoneDisplay } from "@react-pakistan/util-functions/general/format-phone-display";
-import { STUDENT_PROFILE_API_ROUTES, pageLimit } from "../constants";
+import { STUDENT_PROFILE_API_ROUTES } from "../constants";
 import { studentProfileFormValidation } from "../validate";
-import { getCachedStudentProfiles, invalidateStudentProfilesCache, } from "../cache";
 import { getCachedWorkspaceSync } from "../../workspace/cache";
-import { invalidateFamiliesCache } from "../../family/cache";
-import { invalidateFamilyMembersCache } from "../../family-member/cache";
-import { invalidateAdmissionsCache } from "../../admission/cache";
 import { useStudentProfileContext, STUDENT_PROFILE_ACTION_TYPES, STUDENT_PROFILE_DRAWER, } from "./module-base";
 export const useStudentProfileModule = () => {
     var _a;
@@ -71,12 +67,6 @@ export const useStudentProfileModule = () => {
     ]);
     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.filterGender &&
-        !state.filterStatus;
     const showToast = useCallback((description, variant) => {
         generateThemeToast({
             description,
@@ -99,6 +89,46 @@ export const useStudentProfileModule = () => {
             payload: { drawer: null },
         });
     }, [dispatch]);
+    const resetRecordFormState = useCallback(() => {
+        dispatch({
+            type: STUDENT_PROFILE_ACTION_TYPES.SET_ERRORS,
+            payload: { errors: {} },
+        });
+        dispatch({
+            type: STUDENT_PROFILE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: false },
+        });
+        dispatch({
+            type: STUDENT_PROFILE_ACTION_TYPES.SET_FORM_DATA,
+            payload: {
+                form: {
+                    address: null,
+                    avatar: null,
+                    bloodGroup: null,
+                    city: null,
+                    country: null,
+                    dateOfBirth: null,
+                    email: null,
+                    emergencyPhone: null,
+                    enabled: true,
+                    familyMemberId: "",
+                    filterEnabled: undefined,
+                    filterGender: undefined,
+                    filterStatus: undefined,
+                    firstName: "",
+                    gender: null,
+                    id: "",
+                    lastName: "",
+                    phone: null,
+                    postalCode: null,
+                    remarks: null,
+                    state: null,
+                    status: STUDENT_STATUS.ACTIVE,
+                    studentCode: "",
+                },
+            },
+        });
+    }, [dispatch]);
     const listCallback = useCallback(({ data, error }) => {
         var _a, _b;
         if (error) {
@@ -121,9 +151,6 @@ export const useStudentProfileModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateStudentProfilesCache();
-            invalidateFamiliesCache();
-            invalidateFamilyMembersCache();
             showToast(isCreated ? t("messagesCreateSuccess") : t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -176,7 +203,6 @@ export const useStudentProfileModule = () => {
             return;
         }
         if (data) {
-            invalidateStudentProfilesCache();
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -223,21 +249,23 @@ export const useStudentProfileModule = () => {
         });
     }, [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: STUDENT_PROFILE_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: STUDENT_PROFILE_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: STUDENT_PROFILE_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: STUDENT_PROFILE_DRAWER.FORM_DRAWER },
         });
-    }, [byIdFetchNow, dispatch]);
+    }, [byIdFetchNow, dispatch, resetRecordFormState]);
     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 }),
@@ -335,10 +363,6 @@ export const useStudentProfileModule = () => {
             type: STUDENT_PROFILE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: { key: "enabled", value: false },
         });
-        invalidateStudentProfilesCache();
-        invalidateFamiliesCache();
-        invalidateFamilyMembersCache();
-        invalidateAdmissionsCache();
     }, [dispatch, t]);
     const handleReAdmitStudent = useCallback(async (row) => {
         var _a;
@@ -354,10 +378,6 @@ export const useStudentProfileModule = () => {
             body: JSON.stringify({ studentProfileId: row === null || row === void 0 ? void 0 : row.id }),
         });
         (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        invalidateStudentProfilesCache();
-        invalidateFamiliesCache();
-        invalidateFamilyMembersCache();
-        invalidateAdmissionsCache();
         if (data) {
             showToast(t("messagesReAdmitSuccess"), TOAST_VARIANT.SUCCESS);
         }
@@ -395,19 +415,19 @@ export const useStudentProfileModule = () => {
         {
             enabled: false,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 1,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 2,
         },
         {
             enabled: false,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAddStudentProfile"),
+            label: t("actionsButtonAddStudentProfile"),
             order: 3,
         },
     ], [handleCreate, handleFilters, handleMoreActions, t]);
@@ -415,32 +435,32 @@ export const useStudentProfileModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
         },
         {
             enabled: true,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
         },
         {
             enabled: false,
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.status) === STUDENT_STATUS.ACTIVE,
             handleOnClick: handleWithdrawStudent,
-            label: t("actionRowWithdrawStudent"),
+            label: t("actionsButtonWithdrawStudent"),
             order: 4,
             variant: "destructive",
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.status) === STUDENT_STATUS.INACTIVE,
             handleOnClick: handleReAdmitStudent,
-            label: t("actionRowReAdmitStudent"),
+            label: t("actionsButtonReAdmitStudent"),
             order: 5,
         },
     ], [
@@ -451,32 +471,18 @@ export const useStudentProfileModule = () => {
         handleReAdmitStudent,
         t,
     ]);
+    // ============================================================================
+    // 1.4.9 EFFECTS
+    // ============================================================================
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
         if (!schoolId)
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedStudentProfiles({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: STUDENT_PROFILE_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], 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, schoolId, showToast, t]);
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    }, [listFetchNow]);
+    }, [dispatch, listParams, schoolId, showToast, t]);
     return Object.assign(Object.assign({}, context), { applyFilters,
         byIdLoading,
         clearFilters,
@@ -500,6 +506,7 @@ export const useStudentProfileModule = () => {
         headerActions,
         listFetchNow,
         listLoading,
+        resetRecordFormState,
         rowActions,
         toggleStatus,
         updateLoading });

package/base-modules/student-profile/context.d.ts

@@ -8,7 +8,7 @@
  * Key responsibilities:
  * - Expose `useStudentProfileModule()` 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:
  * - `StudentProfileProvider` — provider component used by the page

package/base-modules/student-profile/context.js

@@ -9,7 +9,7 @@
  * Key responsibilities:
  * - Expose `useStudentProfileModule()` 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:
  * - `StudentProfileProvider` — provider component used by the page

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

@@ -1,10 +1,10 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useTranslations } from "next-intl";
 import { useStudentProfileModule } from "./context";
-import { STATUS_OPTIONS } from "./constants";
+import { STATUS_OPTIONS, STUDENT_PROFILE_API_ROUTES } from "./constants";
 export const StudentProfileFilter = () => {
     const t = useTranslations("studentProfile");
     const context = useStudentProfileModule();
@@ -15,7 +15,27 @@ export const StudentProfileFilter = () => {
         : filterEnabled
             ? "true"
             : "false";
-    return (_jsx("div", { className: "space-y-4", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedCombobox, { id: "filterStatus", label: t("filterOptionStatus"), info: t("filterByStudentStatus"), options: [...STATUS_OPTIONS], value: filterStatus, onValueChange: (value) => handleChange("filterStatus", value) }), _jsx(EnhancedRadio, { label: t("filterOptionEnabled"), name: "filterEnabled", value: filterEnabledValue, options: [
+    const statusLabelMap = {
+        ACTIVE: t("formOptionActive"),
+        INACTIVE: t("formOptionInactive"),
+        GRADUATED: t("formOptionGraduated"),
+        TRANSFERRED: t("formOptionTransferred"),
+        EXPELLED: t("formOptionExpelled"),
+    };
+    const { enhancedComboboxElement: filterStatusCombo } = useEnhancedCombobox({
+        id: "filterStatus",
+        label: t("filterOptionStatus"),
+        info: t("filterByStudentStatus"),
+        options: [...STATUS_OPTIONS].map((opt) => ({
+            id: opt.value,
+            name: statusLabelMap[opt.value] || opt.label,
+        })),
+        value: "filterStatus",
+        onValueChange: (value) => handleChange("filterStatus", value),
+        searchEndpoint: STUDENT_PROFILE_API_ROUTES.UNIT,
+        placeholder: "",
+    });
+    return (_jsx("div", { className: "space-y-4", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [filterStatusCombo, _jsx(EnhancedRadio, { label: t("filterOptionEnabled"), name: "filterEnabled", value: filterEnabledValue, options: [
                         { label: t("filterOptionAll"), value: "undefined" },
                         { label: t("filterOptionEnabled"), value: "true" },
                         { label: t("filterOptionDisabled"), value: "false" },

package/base-modules/student-profile/form.js

@@ -1,19 +1,51 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
 import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useTranslations } from "next-intl";
 import { useStudentProfileModule } from "./context";
-import { STATUS_OPTIONS, GENDER_OPTIONS } from "./constants";
+import { STATUS_OPTIONS, GENDER_OPTIONS, STUDENT_PROFILE_API_ROUTES, } from "./constants";
 export const StudentProfileForm = () => {
     const t = useTranslations("studentProfile");
+    const genderLabelMap = {
+        MALE: t("formOptionMale"),
+        FEMALE: t("formOptionFemale"),
+        OTHER: t("formOptionOther"),
+    };
     const context = useStudentProfileModule();
     const { address, city, country, dateOfBirth, emergencyPhone, enabled, errors, firstName, gender, lastName, phone, postalCode, remarks, status, } = context.state;
     const stateValue = context.state.state;
     const { handleChange } = context;
+    const { enhancedComboboxElement: genderCombo } = useEnhancedCombobox({
+        id: "gender",
+        info: t("formGenderPlaceholder"),
+        label: t("formGenderLabel"),
+        onValueChange: (value) => handleChange("gender", value),
+        options: GENDER_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: genderLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: "",
+        searchEndpoint: STUDENT_PROFILE_API_ROUTES.UNIT,
+        value: gender,
+    });
+    const { enhancedComboboxElement: statusCombo } = useEnhancedCombobox({
+        id: "status",
+        info: t("formStudentStatusPlaceholder"),
+        label: t("formOptionStatus"),
+        onValueChange: (value) => handleChange("status", value),
+        options: STATUS_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: opt.label,
+        })),
+        placeholder: "",
+        required: true,
+        searchEndpoint: STUDENT_PROFILE_API_ROUTES.UNIT,
+        value: status,
+    });
     return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionPersonalInformation") }), _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.firstName, id: "firstName", info: t("formStudentsFirstNamePlaceholder"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("firstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, value: firstName }), _jsx(EnhancedInput, { error: errors.lastName, id: "lastName", info: t("formStudentsLastNamePlaceholder"), label: t("formLastNameLabel"), onChange: (e) => handleChange("lastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, value: lastName }), _jsx(EnhancedInput, { error: errors.dateOfBirth, id: "dateOfBirth", info: t("formDateOfBirthPlaceholder"), label: t("formDateOfBirthLabel"), onChange: (e) => handleChange("dateOfBirth", e.target.value), onClick: (e) => { var _a, _b; return (_b = (_a = e.currentTarget).showPicker) === null || _b === void 0 ? void 0 : _b.call(_a); }, type: "date", value: dateOfBirth
                                     ? new Date(dateOfBirth).toISOString().split("formTLabel")[0]
-                                    : "" }), _jsx(EnhancedCombobox, { error: errors.gender, id: "gender", info: t("formGenderPlaceholder"), label: t("formGenderLabel"), onValueChange: (value) => handleChange("gender", value), options: GENDER_OPTIONS.slice(1), value: gender })] })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionContactInformation") }), _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.phone, id: "phone", info: t("formStudentsPhoneNumberPlaceholder"), label: t("formPhoneLabel"), onChange: (e) => handleChange("phone", e.target.value), placeholder: t("formPhonePlaceholder"), type: "tel", value: phone || "" }), _jsx(EnhancedInput, { error: errors.emergencyPhone, id: "emergencyPhone", info: t("formStudentsEmergencyPhoneNumberPlaceholder"), label: t("formEmergencyPhoneLabel"), onChange: (e) => handleChange("emergencyPhone", e.target.value), placeholder: t("formEmergencyPhonePlaceholder"), type: "tel", value: emergencyPhone || "" })] }), _jsx(EnhancedInput, { error: errors.address, id: "address", info: t("formStudentsAddressPlaceholder"), label: t("formAddressLabel"), onChange: (e) => handleChange("address", e.target.value), placeholder: t("formAddressPlaceholder"), value: address || "" }), _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.city, id: "city", info: t("formStudentsCityPlaceholder"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), value: city || "" }), _jsx(EnhancedInput, { error: errors.state, id: "state", info: t("formStudentsStateOrProvincePlaceholder"), label: t("formStateProvinceLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: stateValue || "" }), _jsx(EnhancedInput, { error: errors.country, id: "country", info: t("formStudentsCountryPlaceholder"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), value: country || "" }), _jsx(EnhancedInput, { error: errors.postalCode, id: "postalCode", info: t("formStudentsPostalCodePlaceholder"), label: t("formPostalCodeLabel"), onChange: (e) => handleChange("postalCode", e.target.value), placeholder: t("formPostalCodePlaceholder"), value: postalCode || "" })] })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionAcademicInformation") }), _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedCombobox, { error: errors.status, id: "status", info: t("formStudentStatusPlaceholder"), label: t("formOptionStatus"), onValueChange: (value) => handleChange("status", value), options: STATUS_OPTIONS.slice(1), required: true, value: status }), _jsx(EnhancedTextarea, { error: errors.remarks, id: "remarks", info: t("formAnyAdditionalRemarksPlaceholder"), label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 4, value: remarks || "" })] }), _jsx(EnhancedCheckbox, { checked: enabled, info: t("actionToggleActivateOrDeactivate"), label: t("formActiveStudentLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] })] }));
+                                    : "" }), genderCombo] })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionContactInformation") }), _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.phone, id: "phone", info: t("formStudentsPhoneNumberPlaceholder"), label: t("formPhoneLabel"), onChange: (e) => handleChange("phone", e.target.value), placeholder: t("formPhonePlaceholder"), type: "tel", value: phone || "" }), _jsx(EnhancedInput, { error: errors.emergencyPhone, id: "emergencyPhone", info: t("formStudentsEmergencyPhoneNumberPlaceholder"), label: t("formEmergencyPhoneLabel"), onChange: (e) => handleChange("emergencyPhone", e.target.value), placeholder: t("formEmergencyPhonePlaceholder"), type: "tel", value: emergencyPhone || "" })] }), _jsx(EnhancedInput, { error: errors.address, id: "address", info: t("formStudentsAddressPlaceholder"), label: t("formAddressLabel"), onChange: (e) => handleChange("address", e.target.value), placeholder: t("formAddressPlaceholder"), value: address || "" }), _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: errors.city, id: "city", info: t("formStudentsCityPlaceholder"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), value: city || "" }), _jsx(EnhancedInput, { error: errors.state, id: "state", info: t("formStudentsStateOrProvincePlaceholder"), label: t("formStateProvinceLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: stateValue || "" }), _jsx(EnhancedInput, { error: errors.country, id: "country", info: t("formStudentsCountryPlaceholder"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), value: country || "" }), _jsx(EnhancedInput, { error: errors.postalCode, id: "postalCode", info: t("formStudentsPostalCodePlaceholder"), label: t("formPostalCodeLabel"), onChange: (e) => handleChange("postalCode", e.target.value), placeholder: t("formPostalCodePlaceholder"), value: postalCode || "" })] })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionAcademicInformation") }), _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [statusCombo, _jsx(EnhancedTextarea, { error: errors.remarks, id: "remarks", info: t("formAnyAdditionalRemarksPlaceholder"), label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 4, value: remarks || "" })] }), _jsx(EnhancedCheckbox, { checked: enabled, info: t("actionToggleActivateOrDeactivate"), label: t("formActiveStudentLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] })] }));
 };

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

@@ -127,6 +127,7 @@ export declare const useSubjectModule: () => {
         icon: import("react").ForwardRefExoticComponent<Omit<import("lucide-react").LucideProps, "ref"> & import("react").RefAttributes<SVGSVGElement>>;
     }[];
     listLoading: boolean;
+    resetRecordFormState: () => void;
     rowActions: RowAction[];
     updateLoading: boolean;
     handleCloseDrawer?: () => void;

package/base-modules/subject/context.js

@@ -10,7 +10,7 @@
  * Key responsibilities:
  * - expose `useSubjectModule()` which UI components call for actions
  * - keep the module-specific `apiParams` and callbacks in one place
- * - ensure cache invalidation and toast notifications on mutation
+ * - ensure toast notifications on mutation
  *
  * Exported utilities:
  * - `SubjectProvider` — provider component used by the page
@@ -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 { SUBJECT_API_ROUTES, pageLimit } from "./constants";
-import { getCachedSubjects, invalidateSubjectsCache } from "./cache";
 import { subjectFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { useTheme } from "next-themes";
@@ -87,10 +86,6 @@ export const useSubjectModule = () => {
     const workspace = getCachedWorkspaceSync();
     const listFetchNowRef = useRef(null);
     const debouncedQuery = useDebounce(state.searchQuery, 800);
-    // ============================================================================
-    // CACHE MANAGEMENT
-    // ============================================================================
-    // Load cached data synchronously to prevent UI blocking
     const schoolId = ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "";
     // ============================================================================
     // API PARAMETERS
@@ -139,6 +134,30 @@ export const useSubjectModule = () => {
             payload: { drawer: null },
         });
     }, [dispatch]);
+    const resetRecordFormState = useCallback(() => {
+        dispatch({
+            type: SUBJECT_ACTION_TYPES.SET_ERRORS,
+            payload: { errors: {} },
+        });
+        dispatch({
+            type: SUBJECT_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: false },
+        });
+        dispatch({
+            type: SUBJECT_ACTION_TYPES.SET_FORM_DATA,
+            payload: {
+                form: {
+                    code: "",
+                    description: "",
+                    enabled: true,
+                    filterEnabled: undefined,
+                    id: "",
+                    name: "",
+                    schoolId,
+                },
+            },
+        });
+    }, [dispatch, schoolId]);
     // ============================================================================
     // API CALLBACKS
     // ============================================================================
@@ -165,7 +184,6 @@ export const useSubjectModule = () => {
         }
         if (data) {
             showToast(t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateSubjectsCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -193,7 +211,6 @@ export const useSubjectModule = () => {
         }
         if (data) {
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateSubjectsCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -271,19 +288,21 @@ export const useSubjectModule = () => {
         });
     }, [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: SUBJECT_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: SUBJECT_DRAWER.VIEW_DRAWER },
         });
-    }, [dispatch, byIdFetchNow]);
+    }, [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: SUBJECT_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: SUBJECT_DRAWER.FORM_DRAWER },
         });
-    }, [dispatch, byIdFetchNow]);
+    }, [byIdFetchNow, dispatch, resetRecordFormState]);
     const handleDelete = useCallback((row) => {
         if (!confirm(t("messagesDeleteConfirmation")))
             return;
@@ -355,21 +374,21 @@ export const useSubjectModule = () => {
         {
             enabled: true,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 0,
             icon: MoreHorizontal,
         },
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 2,
             icon: Filter,
         },
         {
             enabled: true,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAdd"),
+            label: t("actionsButtonAdd"),
             order: 3,
             icon: Plus,
         },
@@ -378,21 +397,21 @@ export const useSubjectModule = () => {
         {
             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: Edit,
         },
         {
             enabled: (row) => !(row === null || row === void 0 ? void 0 : row.enabled),
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
             icon: Trash2,
             variant: "destructive",
@@ -408,43 +427,14 @@ export const useSubjectModule = () => {
     // ============================================================================
     // 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 getCachedSubjects({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: SUBJECT_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);
-        }
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
     }, [dispatch, listParams, schoolId, showToast, t]);
     // ============================================================================
     // RETURN
@@ -468,6 +458,7 @@ export const useSubjectModule = () => {
         handleView,
         headerActions,
         listLoading,
+        resetRecordFormState,
         rowActions,
         updateLoading });
 };

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

@@ -7,7 +7,6 @@ import converter from "json-2-csv";
 import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
 import { SUBJECT_API_ROUTES, pageLimit } from "./constants";
-import { invalidateSubjectsCache } from "./cache";
 import { SUBJECT_ACTION_TYPES, useSubjectContext } from "./context";
 import { useRef, useEffect, useCallback } from "react";
 const workspace = getCachedWorkspaceSync();
@@ -165,7 +164,6 @@ export const SubjectMoreActions = () => {
                 else {
                     showSuccessToast("Bulk operation completed successfully");
                 }
-                invalidateSubjectsCache();
                 const schoolId = ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id) || "";
                 fetch(`${SUBJECT_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {

package/base-modules/teacher/constants.d.ts

@@ -15,17 +15,11 @@ export declare const TEACHER_API_ROUTES: {
     readonly BULK_STATUS: (jobId: string) => string;
 };
 export declare const GENDER_OPTIONS: readonly [{
-    readonly label: "Select Gender";
-    readonly value: "";
-}, {
     readonly label: "Male";
     readonly value: "MALE";
 }, {
     readonly label: "Female";
     readonly value: "FEMALE";
-}, {
-    readonly label: "Other";
-    readonly value: "OTHER";
 }, {
     readonly label: "Prefer not to say";
     readonly value: "PREFER_NOT_TO_SAY";

package/base-modules/teacher/constants.js

@@ -24,10 +24,8 @@ export const TEACHER_API_ROUTES = {
 // GENDER OPTIONS
 // ============================================================================
 export const GENDER_OPTIONS = [
-    { label: "Select Gender", value: "" },
     { label: "Male", value: "MALE" },
     { label: "Female", value: "FEMALE" },
-    { label: "Other", value: "OTHER" },
     { label: "Prefer not to say", value: "PREFER_NOT_TO_SAY" },
 ];
 // ============================================================================

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

@@ -214,6 +214,7 @@ export declare const useTeacherModule: () => {
     }[];
     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;