@appcorp/fusion-storybook 0.2.40 → 0.2.44

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

package/base-modules/user/view.js

@@ -1,5 +1,6 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useTranslations } from "next-intl";
 import { useUserModule } from "./context";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle, } from "@appcorp/shadcn/components/ui/card";
 import { Badge } from "@appcorp/shadcn/components/ui/badge";
@@ -19,7 +20,8 @@ const getInitials = (fullName) => {
         .slice(0, 2);
 };
 export const UserView = () => {
+    const t = useTranslations("user");
     const { state } = useUserModule();
     const { avatar, email, enabled, name, phone } = state;
-    return (_jsx("div", { className: "space-y-4", children: _jsxs(Card, { children: [_jsxs(CardHeader, { className: "pb-3", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(User, { className: "text-primary h-5 w-5" }), _jsx(CardTitle, { className: "text-lg", children: "User Information" })] }), _jsx(CardDescription, { children: "User account details" })] }), _jsx(Separator, {}), _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-6", children: [_jsxs("div", { className: "space-y-2", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: "Profile Picture" }), _jsxs(Avatar, { className: "h-20 w-20", children: [_jsx(AvatarImage, { src: avatar || undefined, alt: name || "User" }), _jsx(AvatarFallback, { className: "text-lg", children: getInitials(name) })] })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: "Name" }), _jsx("p", { className: "text-base", children: formatValue(name) })] }), _jsxs("div", { className: "space-y-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Mail, { className: "text-muted-foreground h-4 w-4" }), _jsx("p", { className: "text-muted-foreground text-sm font-medium", children: "Email Address" })] }), _jsx("p", { className: "text-base", children: formatValue(email) })] }), _jsxs("div", { className: "space-y-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Phone, { className: "text-muted-foreground h-4 w-4" }), _jsx("p", { className: "text-muted-foreground text-sm font-medium", children: "Phone Number" })] }), _jsx("p", { className: "text-base", children: formatPhoneDisplay(phone) || formatValue(phone) })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: "Status" }), _jsxs(Badge, { variant: enabled ? "default" : "destructive", className: "gap-1", children: [enabled ? (_jsx(CheckCircle2, { className: "h-3 w-3" })) : (_jsx(XCircle, { className: "h-3 w-3" })), enabled ? "Active" : "Inactive"] })] })] }) })] }) }));
+    return (_jsx("div", { className: "space-y-4", children: _jsxs(Card, { children: [_jsxs(CardHeader, { className: "pb-3", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(User, { className: "text-primary h-5 w-5" }), _jsx(CardTitle, { className: "text-lg", children: t("viewFieldUserInformation") })] }), _jsx(CardDescription, { children: t("viewUserAccountDetails") })] }), _jsx(Separator, {}), _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-6", children: [_jsxs("div", { className: "space-y-2", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldProfilePicture") }), _jsxs(Avatar, { className: "h-20 w-20", children: [_jsx(AvatarImage, { src: avatar || undefined, alt: name || t("viewFieldName") }), _jsx(AvatarFallback, { className: "text-lg", children: getInitials(name) })] })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldName") }), _jsx("p", { className: "text-base", children: formatValue(name) })] }), _jsxs("div", { className: "space-y-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Mail, { className: "text-muted-foreground h-4 w-4" }), _jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldEmailAddress") })] }), _jsx("p", { className: "text-base", children: formatValue(email) })] }), _jsxs("div", { className: "space-y-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Phone, { className: "text-muted-foreground h-4 w-4" }), _jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldPhoneNumber") })] }), _jsx("p", { className: "text-base", children: formatPhoneDisplay(phone) || formatValue(phone) })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldStatus") }), _jsxs(Badge, { variant: enabled ? "default" : "destructive", className: "gap-1", children: [enabled ? (_jsx(CheckCircle2, { className: "h-3 w-3" })) : (_jsx(XCircle, { className: "h-3 w-3" })), enabled ? t("badgeActive") : t("badgeInactive")] })] })] }) })] }) }));
 };

package/base-modules/workspace/form.js

@@ -10,9 +10,9 @@ import { useWorkspaceModule } from "./context";
 import { useTranslations } from "next-intl";
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { Shield, Eye, EyeOff } from "lucide-react";
-import { secretKeys } from "./constants";
+import { secretKeys, WORKSPACE_API_ROUTES } from "./constants";
 const SecretsEditor = ({ secrets, errors, onChange, secretPlaceholder, }) => {
     const [visibleMap, setVisibleMap] = useState(() => Object.fromEntries(secretKeys.map((k) => [k, false])));
     const toggle = (key) => setVisibleMap((s) => (Object.assign(Object.assign({}, s), { [key]: !s[key] })));
@@ -31,10 +31,20 @@ export const WorkspaceForm = () => {
     const handleSecretChange = (key, value) => {
         handleChange("secrets", Object.assign(Object.assign({}, secrets), { [key]: value }));
     };
-    return (_jsxs("div", { className: "space-y-6", children: [_jsx(EnhancedInput, { id: "name", label: t("formNameLabel"), value: state.name, onChange: (e) => handleChange("name", e.target.value), error: state.errors.name, placeholder: t("formNamePlaceholder"), required: true, readOnly: true }), _jsx(EnhancedInput, { id: "subdomain", label: t("formSubdomainLabel"), value: state.subdomain, onChange: (e) => handleChange("subdomain", e.target.value), error: state.errors.subdomain, placeholder: t("formSubdomainPlaceholder"), required: true, info: t("formSubdomainUrlInfo", { subdomain: state.subdomain }), readOnly: true }), _jsx(EnhancedTextarea, { id: "description", label: t("formDescriptionLabel"), value: state.description || "", onChange: (e) => handleChange("description", e.target.value), error: state.errors.description, placeholder: t("formDescriptionPlaceholder"), rows: 3 }), _jsx(EnhancedInput, { id: "logo", label: t("formLogoLabel"), value: state.logo || "", onChange: (e) => handleChange("logo", e.target.value), error: state.errors.logo, placeholder: t("formLogoPlaceholder"), type: "url", readOnly: true }), _jsx(EnhancedCombobox, { id: "planId", label: t("formPlanLabel"), value: state.planId || "", onValueChange: (value) => handleChange("planId", value), options: plans
-                    .filter(({ name }) => name.match("PKR"))
-                    .map((plan) => ({
-                    label: plan.name,
-                    value: plan.id,
-                })), error: state.errors.planId, placeholder: t("formPlanPlaceholder"), info: t("formPlanInfo") }), _jsxs("div", { className: "mt-6 border-t pt-6", children: [_jsxs("div", { className: "mb-4 flex items-center gap-2", children: [_jsx(Shield, { className: "text-primary h-5 w-5" }), _jsx("h3", { className: "text-lg font-semibold", children: t("formSecretsTitleLabel") })] }), _jsx("p", { className: "text-muted-foreground mb-4 text-sm", children: t("formSecretsDescriptionLabel") }), _jsx(SecretsEditor, { secrets: secrets, errors: state.errors, onChange: handleSecretChange, secretPlaceholder: t("formSecretPlaceholder") })] })] }));
+    const { enhancedComboboxElement: planIdCombo } = useEnhancedCombobox({
+        id: "planId",
+        label: t("formPlanLabel"),
+        value: state.planId || "",
+        onValueChange: (value) => handleChange("planId", value),
+        options: plans
+            .filter(({ name }) => name.match("PKR"))
+            .map((plan) => ({
+            id: plan.id,
+            name: plan.name,
+        })),
+        placeholder: t("formPlanPlaceholder"),
+        info: t("formPlanInfo"),
+        searchEndpoint: WORKSPACE_API_ROUTES.UNIT,
+    });
+    return (_jsxs("div", { className: "space-y-6", children: [_jsx(EnhancedInput, { id: "name", label: t("formNameLabel"), value: state.name, onChange: (e) => handleChange("name", e.target.value), error: state.errors.name, placeholder: t("formNamePlaceholder"), required: true, readOnly: true }), _jsx(EnhancedInput, { id: "subdomain", label: t("formSubdomainLabel"), value: state.subdomain, onChange: (e) => handleChange("subdomain", e.target.value), error: state.errors.subdomain, placeholder: t("formSubdomainPlaceholder"), required: true, info: t("formSubdomainUrlInfo", { subdomain: state.subdomain }), readOnly: true }), _jsx(EnhancedTextarea, { id: "description", label: t("formDescriptionLabel"), value: state.description || "", onChange: (e) => handleChange("description", e.target.value), error: state.errors.description, placeholder: t("formDescriptionPlaceholder"), rows: 3 }), _jsx(EnhancedInput, { id: "logo", label: t("formLogoLabel"), value: state.logo || "", onChange: (e) => handleChange("logo", e.target.value), error: state.errors.logo, placeholder: t("formLogoPlaceholder"), type: "url", readOnly: true }), planIdCombo, _jsxs("div", { className: "mt-6 border-t pt-6", children: [_jsxs("div", { className: "mb-4 flex items-center gap-2", children: [_jsx(Shield, { className: "text-primary h-5 w-5" }), _jsx("h3", { className: "text-lg font-semibold", children: t("formSecretsTitleLabel") })] }), _jsx("p", { className: "text-muted-foreground mb-4 text-sm", children: t("formSecretsDescriptionLabel") }), _jsx(SecretsEditor, { secrets: secrets, errors: state.errors, onChange: handleSecretChange, secretPlaceholder: t("formSecretPlaceholder") })] })] }));
 };

package/base-modules/workspace-user/context.d.ts

@@ -9,7 +9,7 @@
  * Key responsibilities:
  * - Expose `useWorkspaceUserModule()` 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:
  * - `WorkspaceUserProvider` — provider component used by the page
@@ -150,6 +150,7 @@ export declare const useWorkspaceUserModule: () => {
         icon: import("react").ForwardRefExoticComponent<Omit<import("lucide-react").LucideProps, "ref"> & import("react").RefAttributes<SVGSVGElement>>;
     }[];
     listLoading: boolean;
+    resetRecordFormState: () => void;
     rowActions: RowAction[];
     updateLoading: boolean;
     state: {

package/base-modules/workspace-user/context.js

@@ -9,7 +9,7 @@
  * Key responsibilities:
  * - Expose `useWorkspaceUserModule()` 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:
  * - `WorkspaceUserProvider` — provider component used by the page
@@ -26,7 +26,6 @@ import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { WORKSPACE_USER_API_ROUTES, pageLimit } from "./constants";
-import { getCachedWorkspaceUsers, invalidateWorkspaceUsersCache, } from "./cache";
 import { workspaceUserFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { useTranslations } from "next-intl";
@@ -111,10 +110,6 @@ export const useWorkspaceUserModule = () => {
     }), [state.enabled, state.id, state.roleId, state.userId, 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
     // ============================================================================
@@ -139,6 +134,31 @@ export const useWorkspaceUserModule = () => {
             payload: { drawer: null },
         });
     }, [dispatch]);
+    const resetRecordFormState = useCallback(() => {
+        dispatch({
+            type: WORKSPACE_USER_ACTION_TYPES.SET_ERRORS,
+            payload: { errors: {} },
+        });
+        dispatch({
+            type: WORKSPACE_USER_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: false },
+        });
+        dispatch({
+            type: WORKSPACE_USER_ACTION_TYPES.SET_FORM_DATA,
+            payload: {
+                form: {
+                    enabled: true,
+                    filterEnabled: undefined,
+                    id: "",
+                    roleId: null,
+                    userId: "",
+                    workspaceId: "",
+                    role: undefined,
+                    workspace: undefined,
+                },
+            },
+        });
+    }, [dispatch]);
     // ============================================================================
     // 1.4.4 API CALLBACKS
     // ============================================================================
@@ -167,7 +187,6 @@ export const useWorkspaceUserModule = () => {
         }
         if (data) {
             showToast(t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateWorkspaceUsersCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -192,7 +211,6 @@ export const useWorkspaceUserModule = () => {
         }
         if (data) {
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
-            invalidateWorkspaceUsersCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -338,14 +356,14 @@ export const useWorkspaceUserModule = () => {
         {
             enabled: false,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 1,
             icon: Filter,
         },
         {
             enabled: false,
             handleOnClick: handleMoreActions,
-            label: t("actionHeaderMoreActions"),
+            label: t("actionsButtonMoreActions"),
             order: 2,
             icon: Plus,
         },
@@ -354,7 +372,7 @@ export const useWorkspaceUserModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
             icon: Eye,
         },
@@ -366,25 +384,8 @@ export const useWorkspaceUserModule = () => {
         var _a;
         if (!(workspace === null || workspace === void 0 ? void 0 : workspace.id))
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedWorkspaceUsers({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: WORKSPACE_USER_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, workspace === null || workspace === void 0 ? void 0 : workspace.id, showToast, t]);
+    }, [dispatch, listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id, showToast, t]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================
@@ -406,6 +407,7 @@ export const useWorkspaceUserModule = () => {
         handleView,
         headerActions,
         listLoading,
+        resetRecordFormState,
         rowActions,
         updateLoading });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.2.40",
+  "version": "0.2.44",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",