@appcorp/fusion-storybook 0.2.91 → 0.2.94

package/base-modules/school/context.js

@@ -29,8 +29,8 @@ import { SCHOOL_API_ROUTES } from "../../constants";
 import { invalidateSchoolCache } from "./cache";
 import { schoolFormValidation } from "./validate";
 import { getCachedWorkspaceSync } from "../workspace/cache";
-import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
 import { formatPhoneDisplay } from "@react-pakistan/util-functions/general/format-phone-display";
+import { toE164Phone } from "../../utils/to-e164-phone";
 // ============================================================================
 // 1.1 DRAWER TYPES
 // ============================================================================
@@ -79,6 +79,7 @@ export const { actionTypes: SCHOOL_ACTION_TYPES, config: schoolModuleConfig, ini
 // 1.4 ENHANCED SCHOOL HOOK WITH API INTEGRATION
 // ============================================================================
 export const useSchoolModule = () => {
+    var _a;
     // ============================================================================
     // 1.4.1 STATE & CORE HOOKS
     // ============================================================================
@@ -91,24 +92,27 @@ export const useSchoolModule = () => {
     // ============================================================================
     // 1.4.2 API PARAMETERS
     // ============================================================================
-    const updateParams = useMemo(() => ({
-        address: state.address,
-        city: state.city,
-        code: state.code,
-        country: state.country,
-        currency: state.currency,
-        email: state.email,
-        enabled: state.enabled,
-        id: state.id,
-        logo: state.logo,
-        name: state.name,
-        phone: formatNumber(state.phone),
-        postalCode: state.postalCode,
-        principalId: state.principalId,
-        state: state.state,
-        website: state.website,
-        workspaceId: (workspace === null || workspace === void 0 ? void 0 : workspace.id) || "",
-    }), [
+    const updateParams = useMemo(() => {
+        var _a;
+        return ({
+            address: state.address,
+            city: state.city,
+            code: state.code,
+            country: state.country,
+            currency: state.currency,
+            email: state.email,
+            enabled: state.enabled,
+            id: state.id,
+            logo: state.logo,
+            name: state.name,
+            phone: toE164Phone(state.phone, (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.country),
+            postalCode: state.postalCode,
+            principalId: state.principalId,
+            state: state.state,
+            website: state.website,
+            workspaceId: (workspace === null || workspace === void 0 ? void 0 : workspace.id) || "",
+        });
+    }, [
         state.address,
         state.city,
         state.code,
@@ -125,6 +129,7 @@ export const useSchoolModule = () => {
         state.state,
         state.website,
         workspace === null || workspace === void 0 ? void 0 : workspace.id,
+        (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.country,
     ]);
     const byIdParams = useMemo(() => ({}), []);
     const deleteParams = useMemo(() => ({}), []);

package/base-modules/school/form.js

@@ -12,6 +12,7 @@ import { useSchoolModule } from "./context";
 import { CURRENCY } from "../../type";
 import { SCHOOL_API_ROUTES } from "../../constants";
 import { useTranslations } from "next-intl";
+import { formatPhone } from "@react-pakistan/util-functions/general/format-phone";
 import { getTranslatedError } from "../../utils/get-translated-error";
 export const SchoolForm = () => {
     const t = useTranslations("school");
@@ -57,5 +58,8 @@ export const SchoolForm = () => {
     //   searchPlaceholder: t("formPrincipalSearchPlaceholder"),
     //   value: principalId || "",
     // });
-    return (_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: t("formNameLabel"), value: name, onChange: (e) => handleChange("name", e.target.value), error: getTranslatedError({ errors, key: "name", t }), placeholder: t("formNamePlaceholder"), required: true }), _jsx(EnhancedInput, { id: "code", label: t("formCodeLabel"), value: code, onChange: (e) => handleChange("code", e.target.value), error: getTranslatedError({ errors, key: "code", t }), placeholder: t("formCodePlaceholder"), required: true, info: t("formCodeInfo") }), currencyCombo, _jsx(EnhancedInput, { id: "address", label: t("formAddressLabel"), value: address || "", onChange: (e) => handleChange("address", e.target.value), error: getTranslatedError({ errors, key: "address", t }), placeholder: t("formAddressPlaceholder") }), _jsx(EnhancedInput, { id: "city", label: t("formCityLabel"), value: city || "", onChange: (e) => handleChange("city", e.target.value), error: getTranslatedError({ errors, key: "city", t }), placeholder: t("formCityPlaceholder") }), _jsx(EnhancedInput, { id: "state", label: t("formStateLabel"), value: stateField || "", onChange: (e) => handleChange("state", e.target.value), error: getTranslatedError({ errors, key: "state", t }), placeholder: t("formStatePlaceholder") }), _jsx(EnhancedInput, { id: "country", label: t("formCountryLabel"), value: country || "", onChange: (e) => handleChange("country", e.target.value), error: getTranslatedError({ errors, key: "country", t }), placeholder: t("formCountryPlaceholder") }), _jsx(EnhancedInput, { id: "postalCode", label: t("formPostalCodeLabel"), value: postalCode || "", onChange: (e) => handleChange("postalCode", e.target.value), error: getTranslatedError({ errors, key: "postalCode", t }), placeholder: t("formPostalCodePlaceholder") }), _jsx(EnhancedInput, { id: "phone", label: t("formPhoneLabel"), value: phone || "", onChange: (e) => handleChange("phone", e.target.value), error: getTranslatedError({ errors, key: "phone", t }), placeholder: t("formPhonePlaceholder"), type: "tel" }), _jsx(EnhancedInput, { id: "email", label: t("formEmailLabel"), value: email || "", onChange: (e) => handleChange("email", e.target.value), error: getTranslatedError({ errors, key: "email", t }), placeholder: t("formEmailPlaceholder"), type: "email" })] }), _jsx(EnhancedInput, { id: "website", label: t("formWebsiteLabel"), value: website || "", onChange: (e) => handleChange("website", e.target.value), error: getTranslatedError({ errors, key: "website", t }), placeholder: t("formWebsitePlaceholder"), type: "url" }), _jsx(EnhancedInput, { id: "logo", label: t("formLogoLabel"), value: logo || "", onChange: (e) => handleChange("logo", e.target.value), error: getTranslatedError({ errors, key: "logo", t }), placeholder: t("formLogoPlaceholder"), type: "url" }), _jsx(EnhancedCheckbox, { id: "enabled", label: t("formEnabledLabel"), checked: enabled, error: getTranslatedError({ errors, key: "enabled", t }), onCheckedChange: (checked) => handleChange("enabled", checked), info: t("formEnabledInfo") })] }));
+    return (_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: t("formNameLabel"), value: name, onChange: (e) => handleChange("name", e.target.value), error: getTranslatedError({ errors, key: "name", t }), placeholder: t("formNamePlaceholder"), required: true }), _jsx(EnhancedInput, { id: "code", label: t("formCodeLabel"), value: code, onChange: (e) => handleChange("code", e.target.value), error: getTranslatedError({ errors, key: "code", t }), placeholder: t("formCodePlaceholder"), required: true, info: t("formCodeInfo") }), currencyCombo, _jsx(EnhancedInput, { id: "address", label: t("formAddressLabel"), value: address || "", onChange: (e) => handleChange("address", e.target.value), error: getTranslatedError({ errors, key: "address", t }), placeholder: t("formAddressPlaceholder") }), _jsx(EnhancedInput, { id: "city", label: t("formCityLabel"), value: city || "", onChange: (e) => handleChange("city", e.target.value), error: getTranslatedError({ errors, key: "city", t }), placeholder: t("formCityPlaceholder") }), _jsx(EnhancedInput, { id: "state", label: t("formStateLabel"), value: stateField || "", onChange: (e) => handleChange("state", e.target.value), error: getTranslatedError({ errors, key: "state", t }), placeholder: t("formStatePlaceholder") }), _jsx(EnhancedInput, { id: "country", label: t("formCountryLabel"), value: country || "", onChange: (e) => handleChange("country", e.target.value), error: getTranslatedError({ errors, key: "country", t }), placeholder: t("formCountryPlaceholder") }), _jsx(EnhancedInput, { id: "postalCode", label: t("formPostalCodeLabel"), value: postalCode || "", onChange: (e) => handleChange("postalCode", e.target.value), error: getTranslatedError({ errors, key: "postalCode", t }), placeholder: t("formPostalCodePlaceholder") }), _jsx(EnhancedInput, { id: "phone", label: t("formPhoneLabel"), value: phone || "", onChange: (e) => {
+                            var _a;
+                            return handleChange("phone", ((_a = formatPhone(e.target.value)) === null || _a === void 0 ? void 0 : _a.international) || e.target.value);
+                        }, error: getTranslatedError({ errors, key: "phone", t }), placeholder: t("formPhonePlaceholder"), type: "tel" }), _jsx(EnhancedInput, { id: "email", label: t("formEmailLabel"), value: email || "", onChange: (e) => handleChange("email", e.target.value), error: getTranslatedError({ errors, key: "email", t }), placeholder: t("formEmailPlaceholder"), type: "email" })] }), _jsx(EnhancedInput, { id: "website", label: t("formWebsiteLabel"), value: website || "", onChange: (e) => handleChange("website", e.target.value), error: getTranslatedError({ errors, key: "website", t }), placeholder: t("formWebsitePlaceholder"), type: "url" }), _jsx(EnhancedInput, { id: "logo", label: t("formLogoLabel"), value: logo || "", onChange: (e) => handleChange("logo", e.target.value), error: getTranslatedError({ errors, key: "logo", t }), placeholder: t("formLogoPlaceholder"), type: "url" }), _jsx(EnhancedCheckbox, { id: "enabled", label: t("formEnabledLabel"), checked: enabled, error: getTranslatedError({ errors, key: "enabled", t }), onCheckedChange: (checked) => handleChange("enabled", checked), info: t("formEnabledInfo") })] }));
 };

package/base-modules/school/validate.d.ts

@@ -21,7 +21,7 @@ export declare const schoolFormValidation: z.ZodObject<{
     state: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     country: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     postalCode: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    phone: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    phone: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string | null | undefined, string | null | undefined>>;
     email: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     website: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     logo: z.ZodOptional<z.ZodNullable<z.ZodString>>;

package/base-modules/school/validate.js

@@ -4,6 +4,7 @@
  * Zod validation schemas for account-school form data.
  */
 import { z } from "zod";
+import { toE164Phone } from "../../utils/to-e164-phone";
 // ============================================================================
 // VALIDATION KEYS
 // ============================================================================
@@ -27,7 +28,11 @@ export const schoolFormValidation = z.object({
     state: z.string().nullable().optional(),
     country: z.string().nullable().optional(),
     postalCode: z.string().nullable().optional(),
-    phone: z.string().nullable().optional(),
+    phone: z
+        .string()
+        .nullable()
+        .optional()
+        .transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     email: z.string().email(VALIDATION_KEYS.email).nullable().optional(),
     website: z.string().url(VALIDATION_KEYS.website).nullable().optional(),
     logo: z.string().nullable().optional(),

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

@@ -23,7 +23,7 @@ import { getTranslatedError } from "../../utils/get-translated-error";
 export const StudentFeeForm = () => {
     var _a, _b, _c, _d, _e;
     const { state, handleChange } = useStudentFeeModule();
-    const { amount, amountDue, amountPaid, discountAmount, discountCodeId, dueDate, enabled, errors, familyId, feeStructureId, remarks, status, studentProfileId, } = state;
+    const { amount, amountDue, amountPaid, discountAmount, discountCodeId, dueDate, enabled, errors, feeStructureId, remarks, status, studentProfileId, } = state;
     const workspace = getCachedWorkspaceSync();
     const currency = (_b = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency) !== null && _b !== void 0 ? _b : "";
     const t = useTranslations("studentFee");

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

@@ -6,50 +6,55 @@ import { useModuleEntityV2, } from "@react-pakistan/util-functions/hooks/use-mod
 import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 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 { toE164Phone } from "../../../utils/to-e164-phone";
 import { STUDENT_PROFILE_API_ROUTES } from "../../../constants";
 import { studentProfileFormValidation } from "../validate";
 import { getCachedWorkspaceSync } from "../../workspace/cache";
 import { useStudentProfileContext, STUDENT_PROFILE_ACTION_TYPES, STUDENT_PROFILE_DRAWER, } from "./module-base";
 export const useStudentProfileModule = () => {
-    var _a;
+    var _a, _b, _c;
     const context = useStudentProfileContext();
     const { dispatch } = context;
     const state = context.state;
     const t = useTranslations("studentProfile");
     const { theme } = useTheme();
     const workspace = getCachedWorkspaceSync();
-    const schoolId = ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "";
     const listFetchNowRef = useRef(null);
     const debouncedQuery = useDebounce(state.searchQuery, 800);
-    const listParams = useMemo(() => (Object.assign(Object.assign(Object.assign(Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (state.filterEnabled !== undefined
-        ? { filterEnabled: String(state.filterEnabled) }
-        : {})), (state.filterGender ? { filterGender: state.filterGender } : {})), (state.filterStatus ? { filterStatus: state.filterStatus } : {}))), [
+    const listParams = useMemo(() => {
+        var _a;
+        return (Object.assign(Object.assign(Object.assign(Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId: ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "" }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (state.filterEnabled !== undefined
+            ? { filterEnabled: String(state.filterEnabled) }
+            : {})), (state.filterGender ? { filterGender: state.filterGender } : {})), (state.filterStatus ? { filterStatus: state.filterStatus } : {})));
+    }, [
         state.currentPage,
         state.filterEnabled,
         state.filterGender,
         state.filterStatus,
         state.pageLimit,
         debouncedQuery,
-        schoolId,
+        (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id,
     ]);
-    const updateParams = useMemo(() => ({
-        avatar: state.avatar,
-        bloodGroup: state.bloodGroup,
-        dateOfBirth: state.dateOfBirth,
-        email: state.email,
-        emergencyPhone: formatNumber(state.emergencyPhone),
-        enabled: state.enabled,
-        familyMemberId: state.familyMemberId,
-        firstName: state.firstName,
-        gender: state.gender,
-        id: state.id,
-        lastName: state.lastName,
-        phone: formatNumber(state.phone),
-        status: state.status,
-        studentCode: state.studentCode,
-    }), [
+    const updateParams = useMemo(() => {
+        var _a, _b;
+        return ({
+            avatar: state.avatar,
+            bloodGroup: state.bloodGroup,
+            dateOfBirth: state.dateOfBirth,
+            email: state.email,
+            emergencyPhone: toE164Phone(state.emergencyPhone, (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.country),
+            enabled: state.enabled,
+            familyMemberId: state.familyMemberId,
+            firstName: state.firstName,
+            gender: state.gender,
+            id: state.id,
+            lastName: state.lastName,
+            phone: toE164Phone(state.phone, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.country),
+            status: state.status,
+            studentCode: state.studentCode,
+        });
+    }, [
         state.avatar,
         state.bloodGroup,
         state.dateOfBirth,
@@ -64,6 +69,7 @@ export const useStudentProfileModule = () => {
         state.phone,
         state.status,
         state.studentCode,
+        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.country,
     ]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
@@ -478,11 +484,11 @@ export const useStudentProfileModule = () => {
         listFetchNowRef.current = listFetchNow;
     }, [listFetchNow]);
     useEffect(() => {
-        var _a;
-        if (!schoolId)
+        var _a, _b;
+        if (!((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id))
             return;
-        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-    }, [dispatch, listParams, schoolId, showToast, t]);
+        (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
+    }, [dispatch, listParams, (_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id, showToast, t]);
     return Object.assign(Object.assign({}, context), { applyFilters,
         byIdLoading,
         clearFilters,

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

@@ -8,6 +8,7 @@ import { useTranslations } from "next-intl";
 import { useStudentProfileModule } from "./context";
 import { STATUS_OPTIONS, GENDER_OPTIONS } from "./constants";
 import { STUDENT_PROFILE_API_ROUTES } from "../../constants";
+import { formatPhone } from "@react-pakistan/util-functions/general/format-phone";
 import { getTranslatedError } from "../../utils/get-translated-error";
 export const StudentProfileForm = () => {
     const t = useTranslations("studentProfile");
@@ -63,5 +64,11 @@ export const StudentProfileForm = () => {
     });
     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: getTranslatedError({ errors, key: "firstName", t }), id: "firstName", info: t("formFirstNameInfo"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("firstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, value: firstName }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "lastName", t }), id: "lastName", info: t("formLastNameInfo"), label: t("formLastNameLabel"), onChange: (e) => handleChange("lastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, value: lastName }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "dateOfBirth", t }), id: "dateOfBirth", info: t("formDateOfBirthInfo"), 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]
-                                    : "" }), 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: getTranslatedError({ errors, key: "phone", t }), id: "phone", info: t("formPhoneInfo"), label: t("formPhoneLabel"), onChange: (e) => handleChange("phone", e.target.value), placeholder: t("formPhonePlaceholder"), type: "tel", value: phone || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "emergencyPhone", t }), id: "emergencyPhone", info: t("formEmergencyPhoneInfo"), label: t("formEmergencyPhoneLabel"), onChange: (e) => handleChange("emergencyPhone", e.target.value), placeholder: t("formEmergencyPhonePlaceholder"), type: "tel", value: emergencyPhone || "" })] }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "address", t }), id: "address", info: t("formAddressInfo"), 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: getTranslatedError({ errors, key: "city", t }), id: "city", info: t("formCityInfo"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), value: city || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "state", t }), id: "state", info: t("formStateInfo"), label: t("formStateProvinceLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: stateValue || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "country", t }), id: "country", info: t("formCountryInfo"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), value: country || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "postalCode", t }), id: "postalCode", info: t("formPostalCodeInfo"), 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: getTranslatedError({ errors, key: "remarks", t }), id: "remarks", info: t("formRemarksInfo"), label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 4, value: remarks || "" })] }), _jsx(EnhancedCheckbox, { checked: enabled, info: t("formEnabledInfo"), label: t("formEnabledLabel"), 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: getTranslatedError({ errors, key: "phone", t }), 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: t("formPhonePlaceholder"), type: "tel", value: phone || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "emergencyPhone", t }), id: "emergencyPhone", info: t("formEmergencyPhoneInfo"), label: t("formEmergencyPhoneLabel"), onChange: (e) => {
+                                    var _a;
+                                    return handleChange("emergencyPhone", ((_a = formatPhone(e.target.value)) === null || _a === void 0 ? void 0 : _a.international) || e.target.value);
+                                }, placeholder: t("formEmergencyPhonePlaceholder"), type: "tel", value: emergencyPhone || "" })] }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "address", t }), id: "address", info: t("formAddressInfo"), 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: getTranslatedError({ errors, key: "city", t }), id: "city", info: t("formCityInfo"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), value: city || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "state", t }), id: "state", info: t("formStateInfo"), label: t("formStateProvinceLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: stateValue || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "country", t }), id: "country", info: t("formCountryInfo"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), value: country || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "postalCode", t }), id: "postalCode", info: t("formPostalCodeInfo"), 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: getTranslatedError({ errors, key: "remarks", t }), id: "remarks", info: t("formRemarksInfo"), label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 4, value: remarks || "" })] }), _jsx(EnhancedCheckbox, { checked: enabled, info: t("formEnabledInfo"), label: t("formEnabledLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] })] }));
 };

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

@@ -13,8 +13,8 @@ export declare const VALIDATION_KEYS: {
 export declare const studentProfileFormValidation: z.ZodObject<{
     firstName: z.ZodString;
     lastName: z.ZodString;
-    phone: z.ZodOptional<z.ZodString>;
-    emergencyPhone: z.ZodOptional<z.ZodString>;
+    phone: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
+    emergencyPhone: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
     status: z.ZodString;
     dateOfBirth: z.ZodOptional<z.ZodString>;
     enrollmentDate: z.ZodOptional<z.ZodString>;

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

@@ -4,6 +4,7 @@
  * Zod validation schemas for student profile form data.
  */
 import { z } from "zod";
+import { toE164Phone } from "../../utils/to-e164-phone";
 export const VALIDATION_KEYS = {
     firstNameRequired: "validationStudentProfileFirstNameRequired",
     lastNameRequired: "validationStudentProfileLastNameRequired",
@@ -16,13 +17,11 @@ export const studentProfileFormValidation = z.object({
     phone: z
         .string()
         .optional()
-        .refine((val) => !val ||
-        /^([+]?[\s0-9]+)?(\d{3}|[(]?[0-9]+[)]?)?([-]?[\s]?[0-9])+$/.test(val), VALIDATION_KEYS.phoneInvalid),
+        .transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     emergencyPhone: z
         .string()
         .optional()
-        .refine((val) => !val ||
-        /^([+]?[\s0-9]+)?(\d{3}|[(]?[0-9]+[)]?)?([-]?[\s]?[0-9])+$/.test(val), VALIDATION_KEYS.phoneInvalid),
+        .transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     status: z.string().min(1, VALIDATION_KEYS.statusRequired),
     dateOfBirth: z.string().optional(),
     enrollmentDate: z.string().optional(),

package/base-modules/teacher/context.js

@@ -456,7 +456,7 @@ export const useTeacherModule = () => {
         finally {
             uploadInProgressRef.current = false;
         }
-    }, [dispatch, showToast, state.id, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
+    }, [dispatch, showToast, state.id, t, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
     const applyFilters = useCallback(() => {
         dispatch({
             type: TEACHER_ACTION_TYPES.SET_CURRENT_PAGE,

package/base-modules/teacher/form.js

@@ -9,6 +9,7 @@ import { useTranslations } from "next-intl";
 import { useTeacherModule } from "./context";
 import { GENDER_OPTIONS } from "./constants";
 import { TEACHER_API_ROUTES } from "../../constants";
+import { formatPhone } from "@react-pakistan/util-functions/general/format-phone";
 import { getTranslatedError } from "../../utils/get-translated-error";
 export const TeacherForm = () => {
     const t = useTranslations("teacher");
@@ -45,7 +46,13 @@ export const TeacherForm = () => {
                     ? new Date(joiningDate).toISOString().split("T")[0]
                     : "" }), genderCombo, _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "dateOfBirth", t }), id: "dateOfBirth", info: t("formDateOfBirthInfo"), 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("T")[0]
-                    : "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "phone", t }), id: "phone", info: t("formPhoneInfo"), label: t("formPhoneLabel"), onChange: (e) => handleChange("phone", e.target.value), placeholder: t("formPhonePlaceholder"), type: "tel", value: phone || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "emergencyPhone", t }), id: "emergencyPhone", info: t("formEmergencyPhoneInfo"), label: t("formEmergencyPhoneLabel"), onChange: (e) => handleChange("emergencyPhone", e.target.value), placeholder: t("formEmergencyPhonePlaceholder"), type: "tel", value: emergencyPhone || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "qualification", t }), id: "qualification", info: t("formQualificationInfo"), label: t("formQualificationLabel"), onChange: (e) => handleChange("qualification", e.target.value), placeholder: t("formQualificationPlaceholder"), value: qualification || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "specialization", t }), id: "specialization", info: t("formSpecializationInfo"), label: t("formSpecializationLabel"), onChange: (e) => handleChange("specialization", e.target.value), placeholder: t("formSpecializationPlaceholder"), value: specialization || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "experience", t }), id: "experience", info: t("formExperienceInfo"), 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: getTranslatedError({ errors, key: "address", t }), id: "address", info: t("formAddressInfo"), label: t("formAddressLabel"), onChange: (e) => handleChange("address", e.target.value), placeholder: t("formAddressPlaceholder"), value: address || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "city", t }), id: "city", info: t("formCityInfo"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), value: city || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "state", t }), id: "state", info: t("formStateProvinceInfo"), label: t("formStateProvinceLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: stateValue || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "country", t }), id: "country", info: t("formCountryInfo"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), value: country || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "postalCode", t }), id: "postalCode", info: t("formPostalCodeInfo"), label: t("formPostalCodeLabel"), onChange: (e) => handleChange("postalCode", e.target.value), placeholder: t("formPostalCodePlaceholder"), value: postalCode || "" }), _jsx(EnhancedDropzone, { accept: ["image/*"], error: getTranslatedError({ errors, key: "avatar", t }), id: "avatar", info: t("formAvatarInfo"), label: t("formAvatarLabel"), maxFiles: 1, maxSize: 100 * 1024, onChange: (files) => {
+                    : "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "phone", t }), 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: t("formPhonePlaceholder"), type: "tel", value: phone || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "emergencyPhone", t }), id: "emergencyPhone", info: t("formEmergencyPhoneInfo"), label: t("formEmergencyPhoneLabel"), onChange: (e) => {
+                    var _a;
+                    return handleChange("emergencyPhone", ((_a = formatPhone(e.target.value)) === null || _a === void 0 ? void 0 : _a.international) || e.target.value);
+                }, placeholder: t("formEmergencyPhonePlaceholder"), type: "tel", value: emergencyPhone || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "qualification", t }), id: "qualification", info: t("formQualificationInfo"), label: t("formQualificationLabel"), onChange: (e) => handleChange("qualification", e.target.value), placeholder: t("formQualificationPlaceholder"), value: qualification || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "specialization", t }), id: "specialization", info: t("formSpecializationInfo"), label: t("formSpecializationLabel"), onChange: (e) => handleChange("specialization", e.target.value), placeholder: t("formSpecializationPlaceholder"), value: specialization || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "experience", t }), id: "experience", info: t("formExperienceInfo"), 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: getTranslatedError({ errors, key: "address", t }), id: "address", info: t("formAddressInfo"), label: t("formAddressLabel"), onChange: (e) => handleChange("address", e.target.value), placeholder: t("formAddressPlaceholder"), value: address || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "city", t }), id: "city", info: t("formCityInfo"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), value: city || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "state", t }), id: "state", info: t("formStateProvinceInfo"), label: t("formStateProvinceLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: stateValue || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "country", t }), id: "country", info: t("formCountryInfo"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), value: country || "" }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "postalCode", t }), id: "postalCode", info: t("formPostalCodeInfo"), label: t("formPostalCodeLabel"), onChange: (e) => handleChange("postalCode", e.target.value), placeholder: t("formPostalCodePlaceholder"), value: postalCode || "" }), _jsx(EnhancedDropzone, { accept: ["image/*"], error: getTranslatedError({ errors, key: "avatar", t }), id: "avatar", info: t("formAvatarInfo"), label: t("formAvatarLabel"), maxFiles: 1, maxSize: 100 * 1024, onChange: (files) => {
                     if (files.length > 0) {
                         handleAvatarUpload === null || handleAvatarUpload === void 0 ? void 0 : handleAvatarUpload(files[0]);
                     }

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

@@ -15,7 +15,7 @@ export declare const teacherFormValidation: z.ZodObject<{
     city: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     country: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     dateOfBirth: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    emergencyPhone: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    emergencyPhone: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string | null | undefined, string | null | undefined>>;
     campusId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     experience: z.ZodNullable<z.ZodOptional<z.ZodNumber>>;
     firstName: z.ZodString;
@@ -27,7 +27,7 @@ export declare const teacherFormValidation: z.ZodObject<{
     }>>>>;
     joiningDate: z.ZodOptional<z.ZodString>;
     lastName: z.ZodString;
-    phone: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    phone: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string | null | undefined, string | null | undefined>>;
     postalCode: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     qualification: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     specialization: z.ZodNullable<z.ZodOptional<z.ZodString>>;

package/base-modules/teacher/validate.js

@@ -4,6 +4,7 @@
  * Zod validation schemas for teacher form data with i18n-ready error keys.
  */
 import { z } from "zod";
+import { toE164Phone } from "../../utils/to-e164-phone";
 // ============================================================================
 // VALIDATION KEYS
 // ============================================================================
@@ -21,7 +22,11 @@ export const teacherFormValidation = z.object({
     city: z.string().optional().nullable(),
     country: z.string().optional().nullable(),
     dateOfBirth: z.string().optional().nullable(),
-    emergencyPhone: z.string().nullable().optional(),
+    emergencyPhone: z
+        .string()
+        .nullable()
+        .optional()
+        .transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     campusId: z.string().optional().nullable(),
     experience: z.number().optional().nullable(),
     firstName: z.string().min(1, VALIDATION_KEYS.firstName),
@@ -32,7 +37,11 @@ export const teacherFormValidation = z.object({
         .nullable()),
     joiningDate: z.string().optional(),
     lastName: z.string().min(1, VALIDATION_KEYS.lastName),
-    phone: z.string().nullable().optional(),
+    phone: z
+        .string()
+        .nullable()
+        .optional()
+        .transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     postalCode: z.string().optional().nullable(),
     qualification: z.string().optional().nullable(),
     specialization: z.string().optional().nullable(),

package/base-modules/user/context/use-user-module.js

@@ -12,10 +12,11 @@ import { getCachedWorkspaceSync } from "../../workspace/cache";
 import { blobToWebP } from "webp-converter-browser";
 import { supabasePublicStorageUrl } from "../../../constants";
 import { toastNetworkError } from "../../../utils/toast-network-error";
-import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
 import { formatPhoneDisplay } from "@react-pakistan/util-functions/general/format-phone-display";
+import { toE164Phone } from "../../../utils/to-e164-phone";
 import { useUserContext, USER_ACTION_TYPES, USER_DRAWER } from "../context";
 export const useUserModule = () => {
+    var _a;
     // ============================================================================
     // 1.4.1 STATE & CORE HOOKS
     // ============================================================================
@@ -39,17 +40,20 @@ export const useUserModule = () => {
         debouncedQuery,
         workspace === null || workspace === void 0 ? void 0 : workspace.id,
     ]);
-    const updateParams = useMemo(() => ({
-        avatar: state.avatar,
-        email: (state.email || "").trim(),
-        enabled: state.enabled,
-        id: state.id,
-        name: (state.name || "").trim(),
-        password: state.password,
-        phone: formatNumber(state.phone),
-        userRole: state.userRole,
-        workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id,
-    }), [state, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
+    const updateParams = useMemo(() => {
+        var _a;
+        return ({
+            avatar: state.avatar,
+            email: (state.email || "").trim(),
+            enabled: state.enabled,
+            id: state.id,
+            name: (state.name || "").trim(),
+            password: state.password,
+            phone: toE164Phone(state.phone, (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.country),
+            userRole: state.userRole,
+            workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id,
+        });
+    }, [state, workspace === null || workspace === void 0 ? void 0 : workspace.id, (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.country]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
     // ============================================================================

package/base-modules/user/validate.d.ts

@@ -16,7 +16,7 @@ export declare const userFormValidation: z.ZodObject<{
     name: z.ZodString;
     email: z.ZodEmail;
     password: z.ZodOptional<z.ZodString>;
-    phone: z.ZodOptional<z.ZodString>;
+    phone: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
     avatar: z.ZodOptional<z.ZodString>;
     enabled: z.ZodOptional<z.ZodBoolean>;
     userRole: z.ZodEnum<typeof USER_ROLE> & z.ZodType<USER_ROLE.SUPER_ADMIN | USER_ROLE.TEACHER | USER_ROLE.STUDENT | USER_ROLE.PARENT | USER_ROLE.STAFF, USER_ROLE, z.core.$ZodTypeInternals<USER_ROLE.SUPER_ADMIN | USER_ROLE.TEACHER | USER_ROLE.STUDENT | USER_ROLE.PARENT | USER_ROLE.STAFF, USER_ROLE>>;

package/base-modules/user/validate.js

@@ -5,6 +5,7 @@
  */
 import { z } from "zod";
 import { USER_ROLE } from "../../type";
+import { toE164Phone } from "../../utils/to-e164-phone";
 // ============================================================================
 // VALIDATION KEYS
 // ============================================================================
@@ -25,8 +26,7 @@ export const userFormValidation = z.object({
     phone: z
         .string()
         .optional()
-        .refine((val) => !val ||
-        /^([+]?[\s0-9]+)?(\d{3}|[(]?[0-9]+[)]?)?([-]?[\s]?[0-9])+$/.test(val), VALIDATION_KEYS.phoneInvalid),
+        .transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     avatar: z.string().optional(),
     enabled: z.boolean().optional(),
     userRole: z

package/package.json

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