@appcorp/fusion-storybook 0.2.91 → 0.2.94

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

@@ -11,12 +11,13 @@ import { ADMISSION_API_ROUTES } from "../../../constants";
 import { admissionFormValidation } from "../validate";
 import { getCachedWorkspaceSync } from "../../workspace/cache";
 import { generateAdmissionReceiptPDF, } from "../../../utils/admission-pdf";
-import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
+import { normalizeIdNumber } from "../../../utils/id-number";
+import { toE164Phone } from "../../../utils/to-e164-phone";
 import { formatPhoneDisplay } from "@react-pakistan/util-functions/general/format-phone-display";
 import { Filter, Plus } from "lucide-react";
 import { ADMISSION_DRAWER, ADMISSION_ACTION_TYPES, useAdmissionContext, } from "../context";
 export const useAdmissionModule = () => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     // ============================================================================
     // 1.4.1 STATE & CORE HOOKS
     // ============================================================================
@@ -51,7 +52,7 @@ export const useAdmissionModule = () => {
         (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id,
     ]);
     const updateParams = useMemo(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         return ({
             address: state.address || "",
             admissionNotes: state.admissionNotes || "",
@@ -67,32 +68,30 @@ export const useAdmissionModule = () => {
             fatherIdNumber: state.fatherIdNumber || "",
             fatherFirstName: state.fatherFirstName || "",
             fatherLastName: state.fatherLastName || "",
-            fatherMobile: formatNumber(state.fatherMobile),
+            fatherMobile: toE164Phone(state.fatherMobile, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.country),
             fatherOccupation: state.fatherOccupation || "",
             fatherOrganization: state.fatherOrganization || "",
             firstName: state.firstName || "",
             gender: state.gender || null,
-            hafiz: (_b = state.hafiz) !== null && _b !== void 0 ? _b : false,
+            hafiz: (_c = state.hafiz) !== null && _c !== void 0 ? _c : false,
             id: state.id || "",
             lastName: state.lastName || "",
             motherIdNumber: state.motherIdNumber || "",
             motherFirstName: state.motherFirstName || "",
             motherLastName: state.motherLastName || "",
-            motherMobile: formatNumber(state.motherMobile),
+            motherMobile: toE164Phone(state.motherMobile, (_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.country),
             notes: state.notes || "",
-            orphan: (_c = state.orphan) !== null && _c !== void 0 ? _c : false,
+            orphan: (_e = state.orphan) !== null && _e !== void 0 ? _e : false,
             postalCode: state.postalCode || "",
             previousSchool: state.previousSchool || "",
             registrationCode: state.registrationCode || "",
-            schoolId: ((_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id) || "",
+            schoolId: ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id) || "",
             siblings: state.siblings || "",
             state: state.state || "",
         });
     }, [
         state.address,
         state.admissionNotes,
-        state.status,
-        state.studentIdNumber,
         state.city,
         state.classForAdmission,
         state.country,
@@ -100,8 +99,8 @@ export const useAdmissionModule = () => {
         state.dob,
         state.emergencyContact,
         state.enabled,
-        state.fatherIdNumber,
         state.fatherFirstName,
+        state.fatherIdNumber,
         state.fatherLastName,
         state.fatherMobile,
         state.fatherOccupation,
@@ -111,8 +110,8 @@ export const useAdmissionModule = () => {
         state.hafiz,
         state.id,
         state.lastName,
-        state.motherIdNumber,
         state.motherFirstName,
+        state.motherIdNumber,
         state.motherLastName,
         state.motherMobile,
         state.notes,
@@ -122,7 +121,10 @@ export const useAdmissionModule = () => {
         state.registrationCode,
         state.siblings,
         state.state,
-        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id,
+        state.status,
+        state.studentIdNumber,
+        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.country,
+        (_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id,
     ]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
@@ -536,7 +538,7 @@ export const useAdmissionModule = () => {
             description: `${t("messagesAnalyzeSuccess")} ${(_c = result === null || result === void 0 ? void 0 : result.score) !== null && _c !== void 0 ? _c : "N/A"} — ${(_d = result === null || result === void 0 ? void 0 : result.status) !== null && _d !== void 0 ? _d : ""}`,
             variant: TOAST_VARIANT.SUCCESS,
         });
-    }, [(_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id, t, showToast, byIdFetchNow, dispatch]);
+    }, [(_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id, t, showToast, byIdFetchNow, dispatch]);
     const handleSubmit = useCallback(() => {
         dispatch({
             type: ADMISSION_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
@@ -556,7 +558,7 @@ export const useAdmissionModule = () => {
                             siblings: updateParams.siblings,
                         },
                         fatherDetails: {
-                            fatherIdNumber: updateParams.fatherIdNumber,
+                            fatherIdNumber: normalizeIdNumber(updateParams.fatherIdNumber),
                             fatherFirstName: updateParams.fatherFirstName,
                             fatherLastName: updateParams.fatherLastName,
                             fatherMobile: updateParams.fatherMobile,
@@ -565,7 +567,7 @@ export const useAdmissionModule = () => {
                             emergencyContact: updateParams.emergencyContact === "Father",
                         },
                         motherDetails: {
-                            motherIdNumber: updateParams.motherIdNumber || "",
+                            motherIdNumber: normalizeIdNumber(updateParams.motherIdNumber || ""),
                             motherFirstName: updateParams.motherFirstName || "N/A",
                             motherLastName: updateParams.motherLastName || "N/A",
                             motherMobile: updateParams.motherMobile,
@@ -583,7 +585,7 @@ export const useAdmissionModule = () => {
                             admissionNotes: updateParams.admissionNotes,
                         },
                         studentDetails: {
-                            studentIdNumber: updateParams.studentIdNumber,
+                            studentIdNumber: normalizeIdNumber(updateParams.studentIdNumber),
                             discountCode: updateParams.discountCode,
                             dob: updateParams.dob,
                             firstName: updateParams.firstName,
@@ -614,12 +616,12 @@ export const useAdmissionModule = () => {
         t,
         showToast,
         updateFetchNow,
-        (_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id,
+        (_e = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _e === void 0 ? void 0 : _e.id,
     ]);
     // ============================================================================
     // 1.4.8 HEADER & ROW ACTIONS
     // ============================================================================
-    const hasGeminiSecrets = Boolean(((_e = workspace === null || workspace === void 0 ? void 0 : workspace.secrets) === null || _e === void 0 ? void 0 : _e.GEMINI_API_KEY) && ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.secrets) === null || _f === void 0 ? void 0 : _f.GEMINI_MODEL));
+    const hasGeminiSecrets = Boolean(((_f = workspace === null || workspace === void 0 ? void 0 : workspace.secrets) === null || _f === void 0 ? void 0 : _f.GEMINI_API_KEY) && ((_g = workspace === null || workspace === void 0 ? void 0 : workspace.secrets) === null || _g === void 0 ? void 0 : _g.GEMINI_MODEL));
     const headerActions = useMemo(() => [
         {
             enabled: true,

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

@@ -9,7 +9,7 @@ export declare const admissionFormValidation: z.ZodObject<{
     registrationCode: z.ZodString;
     firstName: z.ZodString;
     lastName: z.ZodString;
-    studentIdNumber: z.ZodString;
+    studentIdNumber: z.ZodPipe<z.ZodString, z.ZodTransform<string | null | undefined, string>>;
     dob: z.ZodString;
     gender: z.ZodEnum<typeof GENDER>;
     discountCode: z.ZodOptional<z.ZodString>;
@@ -17,14 +17,14 @@ export declare const admissionFormValidation: z.ZodObject<{
     orphan: z.ZodOptional<z.ZodBoolean>;
     fatherFirstName: z.ZodString;
     fatherLastName: z.ZodString;
-    fatherIdNumber: z.ZodString;
-    fatherMobile: z.ZodString;
+    fatherIdNumber: z.ZodPipe<z.ZodString, z.ZodTransform<string | null | undefined, string>>;
+    fatherMobile: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     fatherOccupation: z.ZodOptional<z.ZodString>;
     fatherOrganization: z.ZodOptional<z.ZodString>;
     motherFirstName: z.ZodString;
     motherLastName: z.ZodString;
-    motherIdNumber: z.ZodString;
-    motherMobile: z.ZodString;
+    motherIdNumber: z.ZodPipe<z.ZodString, z.ZodTransform<string | null | undefined, string>>;
+    motherMobile: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     address: z.ZodString;
     city: z.ZodString;
     state: z.ZodString;

package/base-modules/admission/validate.js

@@ -5,12 +5,14 @@
  */
 import { z } from "zod";
 import { GENDER } from "../../type";
+import { normalizeIdNumber } from "../../utils/id-number";
+import { toE164Phone } from "../../utils/to-e164-phone";
 export const admissionFormValidation = z.object({
     // Student Information
     registrationCode: z.string().min(1, "Registration code is required"),
     firstName: z.string().min(1, "First name is required"),
     lastName: z.string().min(1, "Last name is required"),
-    studentIdNumber: z.string().min(1, "Student ID number is required"),
+    studentIdNumber: z.string().min(1, "Student ID number is required").transform(normalizeIdNumber),
     dob: z
         .string()
         .min(1, "Date of birth is required")
@@ -33,15 +35,21 @@ export const admissionFormValidation = z.object({
     // Father Information
     fatherFirstName: z.string().min(1, "Father's first name is required"),
     fatherLastName: z.string().min(1, "Father's last name is required"),
-    fatherIdNumber: z.string().min(1, "Father's ID number is required"),
-    fatherMobile: z.string().min(1, "Father's mobile number is required"),
+    fatherIdNumber: z.string().min(1, "Father's ID number is required").transform(normalizeIdNumber),
+    fatherMobile: z
+        .string()
+        .min(1, "Father's mobile number is required")
+        .transform((val) => { var _a; return (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val; }),
     fatherOccupation: z.string().optional(),
     fatherOrganization: z.string().optional(),
     // Mother Information
     motherFirstName: z.string().min(1, "Mother's first name is required"),
     motherLastName: z.string().min(1, "Mother's last name is required"),
-    motherIdNumber: z.string().min(1, "Mother's ID number is required"),
-    motherMobile: z.string().min(1, "Mother's mobile number is required"),
+    motherIdNumber: z.string().min(1, "Mother's ID number is required").transform(normalizeIdNumber),
+    motherMobile: z
+        .string()
+        .min(1, "Mother's mobile number is required")
+        .transform((val) => { var _a; return (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val; }),
     // Home Information
     address: z.string().min(1, "Home address is required"),
     city: z.string().min(1, "City is required"),

package/base-modules/campus/context.js

@@ -21,8 +21,8 @@ import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
-import { 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 { pageLimit } from "./constants";
 import { CAMPUS_API_ROUTES } from "../../constants";
 import { campusFormValidation } from "./validate";
@@ -75,7 +75,7 @@ export const { actionTypes: CAMPUS_ACTION_TYPES, config: campusModuleConfig, ini
 // 1.4 ENHANCED CAMPUS HOOK WITH API INTEGRATION
 // ============================================================================
 export const useCampusModule = () => {
-    var _a;
+    var _a, _b, _c, _d;
     // ============================================================================
     // 1.4.1 STATE & CORE HOOKS
     // ============================================================================
@@ -85,33 +85,51 @@ export const useCampusModule = () => {
     const t = useTranslations("campus");
     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 debouncedQuery = useDebounce(state.searchQuery, 800);
     const listFetchNowRef = useRef(null);
     // ============================================================================
     // 1.4.2 API PARAMETERS
     // ============================================================================
-    const listParams = useMemo(() => (Object.assign(Object.assign({ currentPage: state.currentPage, pageLimit: state.pageLimit, schoolId }, (debouncedQuery ? { searchQuery: debouncedQuery } : {})), (state.filterEnabled !== undefined
-        ? { filterEnabled: String(state.filterEnabled) }
-        : {}))), [
+    const listParams = useMemo(() => {
+        var _a;
+        return (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.currentPage,
         state.filterEnabled,
         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(() => {
+        var _a, _b;
+        return ({
+            address: state.address,
+            city: state.city,
+            code: state.code,
+            country: state.country,
+            enabled: state.enabled,
+            id: state.id,
+            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),
+            schoolId: state.schoolId || ((_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id) || "",
+            state: state.state,
+        });
+    }, [
+        state.address,
+        state.city,
+        state.code,
+        state.country,
+        state.enabled,
+        state.id,
+        state.name,
+        state.phone,
+        state.schoolId,
+        state.state,
+        (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.country,
+        (_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id,
     ]);
-    const updateParams = useMemo(() => ({
-        address: state.address,
-        city: state.city,
-        code: state.code,
-        country: state.country,
-        enabled: state.enabled,
-        id: state.id,
-        name: state.name,
-        phone: formatNumber(state.phone),
-        schoolId: state.schoolId || schoolId,
-        state: state.state,
-    }), [state, schoolId]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
     // ============================================================================
@@ -140,6 +158,7 @@ export const useCampusModule = () => {
         });
     }, [dispatch]);
     const resetRecordFormState = useCallback(() => {
+        var _a;
         dispatch({
             type: CAMPUS_ACTION_TYPES.SET_ERRORS,
             payload: { errors: {} },
@@ -161,12 +180,12 @@ export const useCampusModule = () => {
                     id: "",
                     name: "",
                     phone: null,
-                    schoolId,
+                    schoolId: ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "",
                     state: null,
                 },
             },
         });
-    }, [dispatch, schoolId]);
+    }, [dispatch, (_d = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _d === void 0 ? void 0 : _d.id]);
     // ============================================================================
     // 1.4.4 API CALLBACKS
     // ============================================================================

package/base-modules/campus/form.js

@@ -9,10 +9,14 @@ import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
 import { useCampusModule } from "./context";
 import { useTranslations } from "next-intl";
+import { formatPhone } from "@react-pakistan/util-functions/general/format-phone";
 import { getTranslatedError } from "../../utils/get-translated-error";
 export const CampusForm = () => {
     const { state, handleChange } = useCampusModule();
     const { address, city, code, country, enabled, errors, name, phone, state: campusState, } = state;
     const t = useTranslations("campus");
-    return (_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "name", t }), id: "name", info: t("formCampusNameInfo"), label: t("formCampusNameLabel"), onChange: (e) => handleChange("name", e.target.value), placeholder: t("formCampusNamePlaceholder"), required: true, value: name }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "code", t }), id: "code", info: t("formCampusCodeInfo"), label: t("formCampusCodeLabel"), onChange: (e) => handleChange("code", e.target.value), placeholder: t("formCampusCodePlaceholder"), required: true, value: code }), _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("formStateInfo"), label: t("formStateLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: campusState || "" }), _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: "phone", t }), id: "phone", info: t("formPhoneInfo"), label: t("formPhoneLabel"), onChange: (e) => handleChange("phone", e.target.value), placeholder: t("formPhonePlaceholder"), value: phone || "" }), _jsx(EnhancedCheckbox, { info: t("formActiveCampusInfo"), label: t("formActiveCampusLabel"), defaultChecked: enabled, onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
+    return (_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "name", t }), id: "name", info: t("formCampusNameInfo"), label: t("formCampusNameLabel"), onChange: (e) => handleChange("name", e.target.value), placeholder: t("formCampusNamePlaceholder"), required: true, value: name }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "code", t }), id: "code", info: t("formCampusCodeInfo"), label: t("formCampusCodeLabel"), onChange: (e) => handleChange("code", e.target.value), placeholder: t("formCampusCodePlaceholder"), required: true, value: code }), _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("formStateInfo"), label: t("formStateLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), value: campusState || "" }), _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: "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"), value: phone || "" }), _jsx(EnhancedCheckbox, { info: t("formActiveCampusInfo"), label: t("formActiveCampusLabel"), defaultChecked: enabled, onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
 };

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

@@ -19,6 +19,6 @@ export declare const campusFormValidation: z.ZodObject<{
     city: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     state: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     country: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    phone: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+    phone: z.ZodPipe<z.ZodNullable<z.ZodOptional<z.ZodString>>, z.ZodTransform<string | null | undefined, string | null | undefined>>;
     enabled: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;

package/base-modules/campus/validate.js

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { toE164Phone } from "../../utils/to-e164-phone";
 export const VALIDATION_KEYS = {
     nameRequired: "validationCampusNameRequired",
     nameMaxLength: "validationCampusNameMaxLength",
@@ -47,6 +48,7 @@ export const campusFormValidation = z.object({
         .string()
         .max(30, VALIDATION_KEYS.phoneMaxLength)
         .optional()
-        .nullable(),
+        .nullable()
+        .transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     enabled: z.boolean().optional(),
 });

package/base-modules/family-member/context.js

@@ -26,11 +26,12 @@ 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 { pageLimit } from "./constants";
+import { normalizeIdNumber } from "../../utils/id-number";
 import { FAMILY_MEMBER_API_ROUTES } from "../../constants";
 import { familyMemberFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
-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 { useTranslations } from "next-intl";
 import { getCachedWorkspaceSync } from "../workspace/cache";
 import { Eye, Filter, MoreHorizontal, Pencil, Plus } from "lucide-react";
@@ -95,7 +96,7 @@ export const useFamilyMemberModule = () => {
     // ============================================================================
     // 1.4.1 STATE & CORE HOOKS
     // ============================================================================
-    var _a, _b;
+    var _a, _b, _c;
     const context = useFamilyMemberContext();
     const { dispatch } = context;
     const state = context.state;
@@ -120,25 +121,28 @@ export const useFamilyMemberModule = () => {
         debouncedQuery,
         (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id,
     ]);
-    const updateParams = useMemo(() => ({
-        id: state.id,
-        familyId: state.familyId,
-        role: state.role,
-        firstName: state.firstName,
-        lastName: state.lastName,
-        dateOfBirth: state.dateOfBirth,
-        gender: state.gender,
-        bloodGroup: state.bloodGroup,
-        phone: formatNumber(state.phone),
-        email: state.email,
-        relationship: state.relationship,
-        occupation: state.occupation,
-        emergencyPhone: formatNumber(state.emergencyPhone),
-        idNumber: state.idNumber,
-        avatar: state.avatar,
-        isPrimary: state.isPrimary,
-        enabled: state.enabled,
-    }), [
+    const updateParams = useMemo(() => {
+        var _a, _b;
+        return ({
+            id: state.id,
+            familyId: state.familyId,
+            role: state.role,
+            firstName: state.firstName,
+            lastName: state.lastName,
+            dateOfBirth: state.dateOfBirth,
+            gender: state.gender,
+            bloodGroup: state.bloodGroup,
+            phone: toE164Phone(state.phone, (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.country),
+            email: state.email,
+            relationship: state.relationship,
+            occupation: state.occupation,
+            emergencyPhone: toE164Phone(state.emergencyPhone, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.country),
+            idNumber: state.idNumber,
+            avatar: state.avatar,
+            isPrimary: state.isPrimary,
+            enabled: state.enabled,
+        });
+    }, [
         state.avatar,
         state.bloodGroup,
         state.dateOfBirth,
@@ -156,6 +160,7 @@ export const useFamilyMemberModule = () => {
         state.phone,
         state.relationship,
         state.role,
+        (_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]);
@@ -407,7 +412,7 @@ export const useFamilyMemberModule = () => {
             schema: familyMemberFormValidation,
             successCallback: () => {
                 updateFetchNow(undefined, {
-                    body: JSON.stringify(updateParams),
+                    body: JSON.stringify(Object.assign(Object.assign({}, updateParams), { idNumber: normalizeIdNumber(updateParams.idNumber) })),
                 });
             },
             errorCallback: (errors) => {
@@ -476,7 +481,7 @@ export const useFamilyMemberModule = () => {
         if (!((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id))
             return;
         (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
-    }, [listParams, (_b = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _b === void 0 ? void 0 : _b.id]);
+    }, [listParams, (_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/family-member/form.js

@@ -9,10 +9,17 @@ import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { useFamilyMemberModule } from "./context";
 import { useTranslations } from "next-intl";
+import { formatPhone } from "@react-pakistan/util-functions/general/format-phone";
 import { getTranslatedError } from "../../utils/get-translated-error";
 export const FamilyMemberForm = () => {
     const { handleChange, state } = useFamilyMemberModule();
     const { bloodGroup, dateOfBirth, email, emergencyPhone, enabled, errors, firstName, gender, idNumber, isPrimary, lastName, occupation, phone, relationship, role, } = state;
     const t = useTranslations("familyMember");
-    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 md:grid-cols-2", 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 })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 md:grid-cols-2", children: [_jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "role", t }), id: "role", info: t("formRoleInfo"), label: t("formRoleLabel"), onChange: (e) => handleChange("role", e.target.value), placeholder: t("formRolePlaceholder"), required: true, value: role }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "dateOfBirth", t }), id: "dateOfBirth", info: t("formDateOfBirthInfo"), label: t("formDateOfBirthLabel"), onChange: (e) => handleChange("dateOfBirth", e.target.value), placeholder: "YYYY-MM-DD", type: "date", value: dateOfBirth })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 md:grid-cols-2", children: [_jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "gender", t }), id: "gender", info: t("formGenderInfo"), label: t("formGenderLabel"), onChange: (e) => handleChange("gender", e.target.value), placeholder: t("formGenderPlaceholder"), value: gender }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "bloodGroup", t }), id: "bloodGroup", info: t("formBloodGroupInfo"), label: t("formBloodGroupLabel"), onChange: (e) => handleChange("bloodGroup", e.target.value), placeholder: t("formBloodGroupPlaceholder"), value: bloodGroup })] }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "idNumber", t }), id: "idNumber", info: t("formIdNumberInfo"), label: t("formIdNumberLabel"), onChange: (e) => handleChange("idNumber", e.target.value), placeholder: t("formIdNumberPlaceholder"), value: idNumber })] }), _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 md:grid-cols-2", 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: "email", t }), id: "email", info: t("formEmailInfo"), label: t("formEmailLabel"), onChange: (e) => handleChange("email", e.target.value), placeholder: t("formEmailPlaceholder"), type: "email", value: email })] }), _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 })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionAdditionalInformation") }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "relationship", t }), id: "relationship", info: t("formRelationshipInfo"), label: t("formRelationshipLabel"), onChange: (e) => handleChange("relationship", e.target.value), placeholder: t("formRelationshipPlaceholder"), value: relationship }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "occupation", t }), id: "occupation", info: t("formOccupationInfo"), label: t("formOccupationLabel"), onChange: (e) => handleChange("occupation", e.target.value), placeholder: t("formOccupationPlaceholder"), value: occupation })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionStatus") }), _jsxs("div", { className: "flex items-center gap-4", children: [_jsx(EnhancedCheckbox, { checked: isPrimary, id: "isPrimary", label: t("formPrimaryContactLabel"), onCheckedChange: (checked) => handleChange("isPrimary", checked === true) }), _jsx(EnhancedCheckbox, { checked: enabled, id: "enabled", label: t("badgeActive"), onCheckedChange: (checked) => handleChange("enabled", checked === true) })] })] })] }));
+    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 md:grid-cols-2", 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 })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 md:grid-cols-2", children: [_jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "role", t }), id: "role", info: t("formRoleInfo"), label: t("formRoleLabel"), onChange: (e) => handleChange("role", e.target.value), placeholder: t("formRolePlaceholder"), required: true, value: role }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "dateOfBirth", t }), id: "dateOfBirth", info: t("formDateOfBirthInfo"), label: t("formDateOfBirthLabel"), onChange: (e) => handleChange("dateOfBirth", e.target.value), placeholder: "YYYY-MM-DD", type: "date", value: dateOfBirth })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 md:grid-cols-2", children: [_jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "gender", t }), id: "gender", info: t("formGenderInfo"), label: t("formGenderLabel"), onChange: (e) => handleChange("gender", e.target.value), placeholder: t("formGenderPlaceholder"), value: gender }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "bloodGroup", t }), id: "bloodGroup", info: t("formBloodGroupInfo"), label: t("formBloodGroupLabel"), onChange: (e) => handleChange("bloodGroup", e.target.value), placeholder: t("formBloodGroupPlaceholder"), value: bloodGroup })] }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "idNumber", t }), id: "idNumber", info: t("formIdNumberInfo"), label: t("formIdNumberLabel"), onChange: (e) => handleChange("idNumber", e.target.value), placeholder: t("formIdNumberPlaceholder"), value: idNumber })] }), _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 md:grid-cols-2", 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: "email", t }), id: "email", info: t("formEmailInfo"), label: t("formEmailLabel"), onChange: (e) => handleChange("email", e.target.value), placeholder: t("formEmailPlaceholder"), type: "email", value: email })] }), _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 })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionAdditionalInformation") }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "relationship", t }), id: "relationship", info: t("formRelationshipInfo"), label: t("formRelationshipLabel"), onChange: (e) => handleChange("relationship", e.target.value), placeholder: t("formRelationshipPlaceholder"), value: relationship }), _jsx(EnhancedInput, { error: getTranslatedError({ errors, key: "occupation", t }), id: "occupation", info: t("formOccupationInfo"), label: t("formOccupationLabel"), onChange: (e) => handleChange("occupation", e.target.value), placeholder: t("formOccupationPlaceholder"), value: occupation })] }), _jsxs("div", { className: "space-y-4", children: [_jsx("h3", { className: "text-lg font-semibold", children: t("formSectionStatus") }), _jsxs("div", { className: "flex items-center gap-4", children: [_jsx(EnhancedCheckbox, { checked: isPrimary, id: "isPrimary", label: t("formPrimaryContactLabel"), onCheckedChange: (checked) => handleChange("isPrimary", checked === true) }), _jsx(EnhancedCheckbox, { checked: enabled, id: "enabled", label: t("badgeActive"), onCheckedChange: (checked) => handleChange("enabled", checked === true) })] })] })] }));
 };

package/base-modules/family-member/validate.d.ts

@@ -20,12 +20,12 @@ export declare const familyMemberFormValidation: z.ZodObject<{
     dateOfBirth: z.ZodOptional<z.ZodString>;
     gender: z.ZodOptional<z.ZodString>;
     bloodGroup: z.ZodOptional<z.ZodString>;
-    phone: z.ZodOptional<z.ZodString>;
+    phone: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
     email: z.ZodUnion<[z.ZodOptional<z.ZodString>, z.ZodLiteral<"">]>;
     relationship: z.ZodOptional<z.ZodString>;
     occupation: z.ZodOptional<z.ZodString>;
-    emergencyPhone: z.ZodOptional<z.ZodString>;
-    idNumber: z.ZodOptional<z.ZodString>;
+    emergencyPhone: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
+    idNumber: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | null | undefined, string | undefined>>;
     avatar: z.ZodOptional<z.ZodString>;
     isPrimary: z.ZodOptional<z.ZodBoolean>;
     enabled: z.ZodOptional<z.ZodBoolean>;

package/base-modules/family-member/validate.js

@@ -4,6 +4,8 @@
  * Zod validation schemas for family-member form data.
  */
 import { z } from "zod";
+import { normalizeIdNumber } from "../../utils/id-number";
+import { toE164Phone } from "../../utils/to-e164-phone";
 // ============================================================================
 // VALIDATION KEYS (used as Zod error messages, translated via getTranslatedError)
 // ============================================================================
@@ -26,7 +28,7 @@ export const familyMemberFormValidation = z.object({
     dateOfBirth: z.string().optional(),
     gender: z.string().optional(),
     bloodGroup: z.string().optional(),
-    phone: z.string().optional(),
+    phone: z.string().optional().transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
     email: z
         .string()
         .email(VALIDATION_KEYS.emailInvalid)
@@ -34,8 +36,8 @@ export const familyMemberFormValidation = z.object({
         .or(z.literal("")),
     relationship: z.string().optional(),
     occupation: z.string().optional(),
-    emergencyPhone: z.string().optional(),
-    idNumber: z.string().optional(),
+    emergencyPhone: z.string().optional().transform((val) => { var _a; return (val ? (_a = toE164Phone(val)) !== null && _a !== void 0 ? _a : val : val); }),
+    idNumber: z.string().optional().transform((val) => (val ? normalizeIdNumber(val) : val)),
     avatar: z.string().optional(),
     isPrimary: z.boolean().optional(),
     enabled: z.boolean().optional(),