@appcorp/fusion-storybook 0.2.40 → 0.2.42

package/base-modules/teacher/context.js

@@ -9,7 +9,7 @@
  * Key responsibilities:
  * - Expose `useTeacherModule()` 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:
  * - `TeacherProvider` — provider component used by the page
@@ -29,7 +29,6 @@ import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-ut
 import { GENDER } from "../../type";
 import { TEACHER_API_ROUTES, pageLimit } from "./constants";
 import { teacherFormValidation } from "./validate";
-import { getCachedTeachers, invalidateTeachersCache } from "./cache";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 import { processAvatarFile } from "./avatar-upload";
 // ============================================================================
@@ -146,10 +145,6 @@ export const useTeacherModule = () => {
     }), [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
     // ============================================================================
@@ -175,6 +170,46 @@ export const useTeacherModule = () => {
             payload: { drawer: null },
         });
     }, [dispatch]);
+    const resetRecordFormState = useCallback(() => {
+        dispatch({
+            type: TEACHER_ACTION_TYPES.SET_ERRORS,
+            payload: { errors: {} },
+        });
+        dispatch({
+            type: TEACHER_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: false },
+        });
+        dispatch({
+            type: TEACHER_ACTION_TYPES.SET_FORM_DATA,
+            payload: {
+                form: {
+                    address: null,
+                    avatar: null,
+                    bio: null,
+                    city: null,
+                    country: null,
+                    dateOfBirth: null,
+                    emergencyPhone: "",
+                    enabled: true,
+                    experience: null,
+                    filterEnabled: undefined,
+                    firstName: "",
+                    gender: GENDER.MALE,
+                    id: "",
+                    joiningDate: new Date().toISOString().split("T")[0],
+                    lastName: "",
+                    phone: "",
+                    postalCode: null,
+                    qualification: null,
+                    schoolId,
+                    specialization: null,
+                    state: null,
+                    teacherCode: "",
+                    userId: null,
+                },
+            },
+        });
+    }, [dispatch, schoolId]);
     // ============================================================================
     // 1.4.4 API CALLBACKS
     // ============================================================================
@@ -200,7 +235,6 @@ export const useTeacherModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateTeachersCache();
             showToast(isCreated ? t("messagesCreateSuccess") : t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -228,7 +262,6 @@ export const useTeacherModule = () => {
             return;
         }
         if (data) {
-            invalidateTeachersCache();
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -281,21 +314,23 @@ export const useTeacherModule = () => {
         });
     }, [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: TEACHER_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: TEACHER_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: TEACHER_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: TEACHER_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 }),
@@ -479,19 +514,19 @@ export const useTeacherModule = () => {
         {
             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]);
@@ -499,58 +534,41 @@ export const useTeacherModule = () => {
         {
             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
     // ============================================================================
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
         if (!schoolId)
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedTeachers({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: TEACHER_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]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================
@@ -576,6 +594,7 @@ export const useTeacherModule = () => {
         headerActions,
         listFetchNow,
         listLoading,
+        resetRecordFormState,
         rowActions,
         toggleStatus,
         updateLoading });

package/base-modules/teacher/form.js

@@ -3,27 +3,62 @@ 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 { EnhancedDropzone } from "@appcorp/shadcn/components/enhanced-dropzone";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
 import { useTranslations } from "next-intl";
-import { USER_ROLE } from "../../type";
-import { getCachedUsersSync } from "../user/cache";
 import { useTeacherModule } from "./context";
-import { GENDER_OPTIONS } from "./constants";
+import { GENDER_OPTIONS, TEACHER_API_ROUTES } from "./constants";
 export const TeacherForm = () => {
-    var _a;
     const t = useTranslations("teacher");
+    const genderLabelMap = {
+        MALE: t("formOptionMale"),
+        FEMALE: t("formOptionFemale"),
+        PREFER_NOT_TO_SAY: t("formOptionPreferNotToSay"),
+    };
     const context = useTeacherModule();
-    const { address, avatar, bio, city, country, dateOfBirth, emergencyPhone, enabled, errors, experience, firstName, gender, joiningDate, lastName, phone, postalCode, qualification, specialization, userId, } = context.state;
+    const { address, avatar, bio, city, country, dateOfBirth, emergencyPhone, enabled, errors, experience, firstName, gender, joiningDate, lastName, phone, postalCode, qualification, specialization,
+    // userId,
+     } = context.state;
     const stateValue = context.state.state;
     const { handleChange, handleAvatarUpload } = context;
-    const users = getCachedUsersSync();
+    // const users = getCachedUsersSync();
+    // const { enhancedComboboxElement: userIdCombo } = useEnhancedCombobox({
+    //   emptyText: t("formNoTeacherUsersEmpty"),
+    //   id: "userId",
+    //   info: t("formLinkedSystemUserLabel"),
+    //   label: t("formTeacherUserPlaceholder"),
+    //   onValueChange: (value) => handleChange("userId", value || null),
+    //   options: users.items
+    //     ?.filter(
+    //       ({ workspaces }) =>
+    //         workspaces?.filter(({ role }) => role?.userRole === USER_ROLE.TEACHER)
+    //           .length
+    //     )
+    //     .map((u) => ({
+    //       id: u.id,
+    //       name: u?.name || u?.email || u.id,
+    //     })),
+    //   placeholder: t("formSelectLinkedUserPlaceholder"),
+    //   searchEndpoint: TEACHER_API_ROUTES.UNIT,
+    //   searchPlaceholder: t("formSearchUsersPlaceholder"),
+    //   value: userId || "",
+    // });
+    const { enhancedComboboxElement: genderCombo } = useEnhancedCombobox({
+        id: "gender",
+        info: t("formTeachersGenderPlaceholder"),
+        label: t("formGenderLabel"),
+        onValueChange: (value) => handleChange("gender", value || null),
+        options: GENDER_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: genderLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: "",
+        searchEndpoint: TEACHER_API_ROUTES.UNIT,
+        value: gender || "",
+    });
     return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.firstName, id: "firstName", info: t("formTeachersFirstNameLabel"), 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("formTeachersLastNameLabel"), label: t("formLastNameLabel"), onChange: (e) => handleChange("lastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, value: lastName }), _jsx(EnhancedInput, { error: errors.joiningDate, id: "joiningDate", info: t("formDateTeacherJoinedTheSchoolLabel"), label: t("formJoiningDateLabel"), onChange: (e) => handleChange("joiningDate", e.target.value), onClick: (e) => { var _a, _b; return (_b = (_a = e.currentTarget).showPicker) === null || _b === void 0 ? void 0 : _b.call(_a); }, required: true, type: "date", value: joiningDate
                     ? new Date(joiningDate).toISOString().split("formTLabel")[0]
-                    : "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoTeacherUsersEmpty"), error: errors.userId, id: "userId", info: t("formLinkedSystemUserLabel"), label: t("formTeacherUserPlaceholder"), onValueChange: (value) => handleChange("userId", value || null), options: (_a = users.items) === null || _a === void 0 ? void 0 : _a.filter(({ workspaces }) => workspaces === null || workspaces === void 0 ? void 0 : workspaces.filter(({ role }) => (role === null || role === void 0 ? void 0 : role.userRole) === USER_ROLE.TEACHER).length).map((u) => ({
-                    label: (u === null || u === void 0 ? void 0 : u.name) || (u === null || u === void 0 ? void 0 : u.email) || u.id,
-                    value: u.id,
-                })), placeholder: t("formSelectLinkedUserPlaceholder"), searchPlaceholder: t("formSearchUsersPlaceholder"), value: userId || "" }), _jsx(EnhancedCombobox, { error: errors.gender, id: "gender", info: t("formTeachersGenderPlaceholder"), label: t("formGenderLabel"), onValueChange: (value) => handleChange("gender", value || null), options: GENDER_OPTIONS.slice(1), value: gender || "" }), _jsx(EnhancedInput, { error: errors.dateOfBirth, id: "dateOfBirth", info: t("formTeachersDateOfBirthLabel"), 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
+                    : "" }), genderCombo, _jsx(EnhancedInput, { error: errors.dateOfBirth, id: "dateOfBirth", info: t("formTeachersDateOfBirthLabel"), 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(EnhancedInput, { error: errors.phone, id: "phone", info: t("formTeachersPhoneNumberLabel"), 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("formEmergencyContactNumberLabel"), label: t("formEmergencyPhoneLabel"), onChange: (e) => handleChange("emergencyPhone", e.target.value), placeholder: t("formEmergencyPhonePlaceholder"), type: "tel", value: emergencyPhone || "" }), _jsx(EnhancedInput, { error: errors.qualification, id: "qualification", info: t("formTeachersEducationalQualificationLabel"), label: t("formQualificationLabel"), onChange: (e) => handleChange("qualification", e.target.value), placeholder: t("formQualificationPlaceholder"), value: qualification || "" }), _jsx(EnhancedInput, { error: errors.specialization, id: "specialization", info: t("formTeachersAreaOfSpecializationLabel"), label: t("formSpecializationLabel"), onChange: (e) => handleChange("specialization", e.target.value), placeholder: t("formSpecializationPlaceholder"), value: specialization || "" }), _jsx(EnhancedInput, { error: errors.experience, id: "experience", info: t("formYearsOfTeachingExperienceLabel"), label: t("formExperienceLabel"), onChange: (e) => handleChange("experience", parseInt(e.target.value) || null), placeholder: t("formExperiencePlaceholder"), type: "number", value: (experience === null || experience === void 0 ? void 0 : experience.toString()) || "" }), _jsx(EnhancedInput, { error: errors.address, id: "address", info: t("formStreetAddressLabel"), label: t("formAddressLabel"), onChange: (e) => handleChange("address", e.target.value), placeholder: t("formAddressPlaceholder"), value: address || "" }), _jsx(EnhancedInput, { error: errors.city, id: "city", info: t("formCityNameLabel"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), value: city || "" }), _jsx(EnhancedInput, { error: errors.state, id: "state", info: t("formStateOrProvinceLabel"), label: t("formStateProvinceLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: stateValue || "" }), _jsx(EnhancedInput, { error: errors.country, id: "country", info: t("formCountryNameLabel"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), value: country || "" }), _jsx(EnhancedInput, { error: errors.postalCode, id: "postalCode", info: t("formPostalOrZipCodeLabel"), label: t("formPostalCodeLabel"), onChange: (e) => handleChange("postalCode", e.target.value), placeholder: t("formPostalCodePlaceholder"), value: postalCode || "" }), _jsx(EnhancedDropzone, { accept: ["image/*"], error: errors.avatar, id: "avatar", info: t("formUploadTeachersPhoto"), label: t("formAvatarLabel"), maxFiles: 1, maxSize: 100 * 1024, onChange: (files) => {
                     if (files.length > 0) {

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

@@ -8,7 +8,6 @@ import { Timeline } from "../../components/timeline";
 import { useTranslations } from "next-intl";
 import { teacherFormValidation } from "./validate";
 import { TEACHER_API_ROUTES, pageLimit } from "./constants";
-import { invalidateTeachersCache } from "./cache";
 import { TEACHER_ACTION_TYPES, useTeacherContext } from "./context";
 import { useRef, useEffect, useCallback } from "react";
 const workspace = getCachedWorkspaceSync();
@@ -174,7 +173,6 @@ export const TeacherMoreActions = () => {
                 else {
                     showSuccessToast("Bulk operation completed successfully");
                 }
-                invalidateTeachersCache();
                 const schoolId = ((_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id) || "";
                 fetch(`${TEACHER_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {

package/base-modules/user/context/use-user-module.d.ts

@@ -27,6 +27,7 @@ export declare const useUserModule: () => {
     }[];
     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/user/context/use-user-module.js

@@ -6,11 +6,9 @@ import { isCreatedOrUpdated, validateForm, API_METHODS, fetchData, } from "@reac
 import { useModuleEntityV2, } from "@react-pakistan/util-functions/hooks/use-module-entity-v2";
 import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
-import { USER_API_ROUTES, pageLimit } from "../constants";
+import { USER_API_ROUTES } from "../constants";
 import { userFormValidation } from "../validate";
-import { getCachedUsers, invalidateUsersCache } from "../cache";
 import { getCachedWorkspaceSync } from "../../workspace/cache";
-import { invalidateWorkspaceUsersCache } from "../../workspace-user/cache";
 import { blobToWebP } from "webp-converter-browser";
 import { supabasePublicStorageUrl } from "../../../constants";
 import { toastNetworkError } from "../../../utils/toast-network-error";
@@ -54,10 +52,6 @@ export const useUserModule = () => {
     }), [state, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
     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
     // ============================================================================
@@ -83,6 +77,32 @@ export const useUserModule = () => {
             payload: { drawer: null },
         });
     }, [dispatch]);
+    const resetRecordFormState = useCallback(() => {
+        dispatch({
+            type: USER_ACTION_TYPES.SET_ERRORS,
+            payload: { errors: {} },
+        });
+        dispatch({
+            type: USER_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: false },
+        });
+        dispatch({
+            type: USER_ACTION_TYPES.SET_FORM_DATA,
+            payload: {
+                form: {
+                    avatar: "",
+                    email: "",
+                    enabled: true,
+                    filterEnabled: undefined,
+                    id: "",
+                    name: "",
+                    password: "",
+                    phone: "",
+                    userRole: null,
+                },
+            },
+        });
+    }, [dispatch]);
     // ============================================================================
     // 1.4.4 API CALLBACKS
     // ============================================================================
@@ -108,8 +128,6 @@ export const useUserModule = () => {
         }
         if (data) {
             const isCreated = isCreatedOrUpdated(data);
-            invalidateUsersCache();
-            invalidateWorkspaceUsersCache();
             showToast(isCreated ? t("messagesUserCreated") : t("messagesUserUpdated"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -163,8 +181,6 @@ export const useUserModule = () => {
             return;
         }
         if (data) {
-            invalidateUsersCache();
-            invalidateWorkspaceUsersCache();
             showToast(t("messagesUserDeleted"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -223,19 +239,21 @@ export const useUserModule = () => {
         });
     }, [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: USER_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: USER_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: USER_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: USER_DRAWER.FORM_DRAWER },
         });
-    }, [byIdFetchNow, dispatch]);
+    }, [byIdFetchNow, dispatch, resetRecordFormState]);
     const handleDelete = useCallback((row) => {
         if (!confirm(t("messagesDeleteConfirmation")))
             return;
@@ -492,30 +510,15 @@ export const useUserModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
         if (!(workspace === null || workspace === void 0 ? void 0 : workspace.id))
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedUsers({ params: listParams });
-                    dispatch({
-                        type: USER_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, workspace === null || workspace === void 0 ? void 0 : workspace.id, showToast, t]);
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    }, [listFetchNow]);
+    }, [dispatch, listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id, showToast, t]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================
@@ -540,6 +543,7 @@ export const useUserModule = () => {
         headerActions,
         listFetchNow,
         listLoading,
+        resetRecordFormState,
         rowActions,
         toggleStatus,
         updateLoading });

package/base-modules/user/context.js

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

package/base-modules/user/filter.js

@@ -1,8 +1,10 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useTranslations } from "next-intl";
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
 import { useUserModule } from "./context";
 export const UserFilter = () => {
+    const t = useTranslations("user");
     const { handleChange, state } = useUserModule();
     const { filterEnabled } = state;
     const filterEnabledValue = filterEnabled === undefined
@@ -10,10 +12,10 @@ export const UserFilter = () => {
         : filterEnabled
             ? "true"
             : "false";
-    return (_jsx("div", { className: "space-y-4", children: _jsx("div", { className: "grid grid-cols-1 gap-4", children: _jsx(EnhancedRadio, { label: "Enabled", name: "filterEnabled", value: filterEnabledValue, options: [
-                    { label: "All", value: "undefined" },
-                    { label: "Enabled", value: "true" },
-                    { label: "Disabled", value: "false" },
+    return (_jsx("div", { className: "space-y-4", children: _jsx("div", { className: "grid grid-cols-1 gap-4", children: _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" },
                 ], onValueChange: (next) => {
                     const parsed = next === "true" ? true : next === "false" ? false : undefined;
                     handleChange("filterEnabled", parsed);

package/base-modules/user/form.js

@@ -1,28 +1,52 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useTranslations } from "next-intl";
 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 { EnhancedDropzone } from "@appcorp/shadcn/components/enhanced-dropzone";
 import { useUserModule } from "./context";
 import { USER_ROLE } from "../../type";
+import { USER_API_ROUTES } from "./constants";
 import { formatPhone } from "@react-pakistan/util-functions/general/format-phone";
 import { useState } from "react";
 import { Eye, EyeOff } from "lucide-react";
 export const UserForm = () => {
+    const t = useTranslations("user");
     const { handleAvatar, handleChange, state } = useUserModule();
     const { avatar, email, enabled, errors, name, password, phone, userRole } = state;
+    const roleLabelMap = {
+        SCHOOL_ADMIN: t("formOptionAdmin"),
+        TEACHER: t("formOptionTeacher"),
+        STAFF: t("formOptionStaff"),
+    };
     const [passwordVisible, setPasswordVisible] = useState(false);
     const roleOptions = Object.values(USER_ROLE)
         .filter((roleOption) => roleOption !== USER_ROLE.SUPER_ADMIN &&
         roleOption !== USER_ROLE.STUDENT &&
         roleOption !== USER_ROLE.PARENT)
         .map((roleOption) => ({
-        label: roleOption.replace(/_/g, " "),
-        value: roleOption,
+        id: roleOption,
+        name: roleLabelMap[roleOption] || roleOption.replace(/_/g, " "),
     }));
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.name, id: "name", info: "Enter user's full name", label: "Name", onChange: (e) => handleChange("name", e.target.value), placeholder: "John Doe", required: true, value: name || "" }), _jsx(EnhancedInput, { error: errors.email, id: "email", info: "Enter user's email address", label: "Email Address", onChange: (e) => handleChange("email", e.target.value), placeholder: "john.doe@example.com", required: true, type: "email", value: email }), _jsxs("div", { className: "relative", children: [_jsx(EnhancedInput, { error: errors.password, id: "password", info: "Enter user's password (optional for updates)", label: "Password", onChange: (e) => handleChange("password", e.target.value), placeholder: "Enter password", type: passwordVisible ? "text" : "password", value: password || "" }), _jsx("button", { type: "button", "aria-label": passwordVisible ? "Hide password" : "Show password", onClick: () => setPasswordVisible(!passwordVisible), className: "text-muted-foreground hover:text-foreground absolute inset-y-0 top-1 right-3 flex items-center justify-center p-1 text-sm", children: passwordVisible ? (_jsx(EyeOff, { className: "h-4 w-4" })) : (_jsx(Eye, { className: "h-4 w-4" })) })] }), _jsx(EnhancedInput, { error: errors.phone, id: "phone", info: "Enter user's phone number, include country code to autoformat", label: "Phone Number", onChange: (e) => {
+    const { enhancedComboboxElement: userRoleCombo } = useEnhancedCombobox({
+        emptyText: t("formNoRoleEmpty"),
+        id: "userRole",
+        info: t("formRoleIdInfo"),
+        label: t("formRoleIdLabel"),
+        onValueChange: (value) => handleChange("userRole", value),
+        options: roleOptions.map((opt) => ({
+            id: opt.id,
+            name: opt.name,
+        })),
+        placeholder: t("formRoleIdPlaceholder"),
+        required: true,
+        searchEndpoint: USER_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchRolePlaceholder"),
+        value: userRole !== null && userRole !== void 0 ? userRole : "",
+    });
+    return (_jsxs("div", { className: "space-y-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(EnhancedInput, { error: errors.email, id: "email", info: t("formEmailInfo"), label: t("formEmailLabel"), onChange: (e) => handleChange("email", e.target.value), placeholder: t("formEmailPlaceholder"), required: true, type: "email", value: email }), _jsxs("div", { className: "relative", children: [_jsx(EnhancedInput, { error: errors.password, id: "password", info: t("formPasswordInfo"), label: t("formPasswordLabel"), onChange: (e) => handleChange("password", e.target.value), placeholder: t("formPasswordPlaceholder"), type: passwordVisible ? "text" : "password", value: password || "" }), _jsx("button", { type: "button", "aria-label": passwordVisible ? t("hidePassword") : t("showPassword"), onClick: () => setPasswordVisible(!passwordVisible), className: "text-muted-foreground hover:text-foreground absolute inset-y-0 top-1 right-3 flex items-center justify-center p-1 text-sm", children: passwordVisible ? (_jsx(EyeOff, { className: "h-4 w-4" })) : (_jsx(Eye, { className: "h-4 w-4" })) })] }), _jsx(EnhancedInput, { error: errors.phone, id: "phone", info: t("formPhoneInfo"), label: t("formPhoneLabel"), onChange: (e) => {
                     var _a;
                     return handleChange("phone", ((_a = formatPhone(e.target.value)) === null || _a === void 0 ? void 0 : _a.international) || e.target.value);
-                }, placeholder: "+1 (555) 123-4567", type: "tel", value: phone || "" }), _jsx(EnhancedDropzone, { accept: ["image/*"], error: errors.avatar, id: "avatar", info: "Upload an avatar image (JPG, PNG, GIF, etc.)", label: "Avatar", maxFiles: 1, maxSize: 0.25 * 1024 * 1024, onChange: handleAvatar, onRemoveRemote: () => handleChange("avatar", ""), resize: true, value: avatar ? [avatar] : [] }), _jsx(EnhancedCheckbox, { checked: enabled, error: errors.enabled, id: "enabled", info: "Toggle to enable or disable the user account", label: "Active User", onCheckedChange: (checked) => handleChange("enabled", checked) }), _jsx(EnhancedCombobox, { disabled: userRole === USER_ROLE.SCHOOL_ADMIN, emptyText: "No role found", error: errors.userRole, id: "userRole", info: "Select the user role", label: "Role", onValueChange: (value) => handleChange("userRole", value), options: roleOptions, placeholder: "Select role", required: true, searchPlaceholder: "Search role...", value: userRole !== null && userRole !== void 0 ? userRole : "" })] }));
+                }, placeholder: t("formPhonePlaceholder"), type: "tel", value: phone || "" }), _jsx(EnhancedDropzone, { accept: ["image/*"], error: errors.avatar, id: "avatar", info: t("formAvatarInfo"), label: t("formAvatarLabel"), maxFiles: 1, maxSize: 0.25 * 1024 * 1024, onChange: handleAvatar, onRemoveRemote: () => handleChange("avatar", ""), resize: true, value: avatar ? [avatar] : [] }), _jsx(EnhancedCheckbox, { checked: enabled, error: errors.enabled, id: "enabled", info: t("formEnabledInfo"), label: t("formActiveUserLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) }), userRoleCombo] }));
 };

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

@@ -1,10 +1,12 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useTranslations } from "next-intl";
 import { downloadFromUrl, API_METHODS } from "@react-pakistan/util-functions";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 import converter from "json-2-csv";
 import { Timeline } from "../../components/timeline";
 export const UserMoreActions = () => {
+    const t = useTranslations("user");
     const workspace = getCachedWorkspaceSync();
     const handleGetAllRecords = async (schoolId) => {
         const response = await fetch(`/api/user?pageLimit=1000&currentPage=1&schoolId=${schoolId}`, { method: API_METHODS.GET });
@@ -16,33 +18,33 @@ export const UserMoreActions = () => {
     const create = [
         {
             id: "1",
-            title: "Download empty csv template",
+            title: t("moreActionsDownloadEmptyCsvTemplate"),
             handleOnClick: async () => {
                 await downloadFromUrl("https://nwolvgylwmjuqxsngjxt.supabase.co/storage/v1/object/public/public-blob/common-assets/user.csv", "user-template.csv");
             },
         },
-        { id: "2", title: "Add your data to the csv" },
+        { id: "2", title: t("moreActionsAddYourDataToTheCsv") },
         {
             id: "3",
-            title: "Upload the completed csv to the system",
+            title: t("moreActionsUploadTheCompletedCsvToTheSystem"),
             handleOnClick: () => { },
         },
     ];
     const update = [
         {
             id: "1",
-            title: "Download populated csv template",
+            title: t("moreActionsDownloadPopulatedCsvTemplate"),
             handleOnClick: async () => {
                 var _a;
                 await handleGetAllRecords(((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "");
             },
         },
-        { id: "2", title: "Update your data to the csv" },
+        { id: "2", title: t("moreActionsUpdateYourDataToTheCsv") },
         {
             id: "3",
-            title: "Upload the completed csv to the system",
+            title: t("moreActionsUploadTheCompletedCsvToTheSystem"),
             handleOnClick: () => { },
         },
     ];
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(Timeline, { events: create, heading: "Bulk Create" }), _jsx(Timeline, { events: update, heading: "Bulk Update" })] }));
+    return (_jsxs("div", { className: "space-y-4", children: [_jsx(Timeline, { events: create, heading: t("moreActionsBulkCreate") }), _jsx(Timeline, { events: update, heading: t("moreActionsBulkUpdate") })] }));
 };