@appcorp/fusion-storybook 0.2.90 → 0.2.93

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

@@ -11,6 +11,7 @@ import { ADMISSION_API_ROUTES } from "../../../constants";
 import { admissionFormValidation } from "../validate";
 import { getCachedWorkspaceSync } from "../../workspace/cache";
 import { generateAdmissionReceiptPDF, } from "../../../utils/admission-pdf";
+import { normalizeIdNumber } from "../../../utils/id-number";
 import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
 import { formatPhoneDisplay } from "@react-pakistan/util-functions/general/format-phone-display";
 import { Filter, Plus } from "lucide-react";
@@ -556,7 +557,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 +566,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 +584,7 @@ export const useAdmissionModule = () => {
                             admissionNotes: updateParams.admissionNotes,
                         },
                         studentDetails: {
-                            studentIdNumber: updateParams.studentIdNumber,
+                            studentIdNumber: normalizeIdNumber(updateParams.studentIdNumber),
                             discountCode: updateParams.discountCode,
                             dob: updateParams.dob,
                             firstName: updateParams.firstName,

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,13 +17,13 @@ export declare const admissionFormValidation: z.ZodObject<{
     orphan: z.ZodOptional<z.ZodBoolean>;
     fatherFirstName: z.ZodString;
     fatherLastName: z.ZodString;
-    fatherIdNumber: z.ZodString;
+    fatherIdNumber: z.ZodPipe<z.ZodString, z.ZodTransform<string | null | undefined, string>>;
     fatherMobile: z.ZodString;
     fatherOccupation: z.ZodOptional<z.ZodString>;
     fatherOrganization: z.ZodOptional<z.ZodString>;
     motherFirstName: z.ZodString;
     motherLastName: z.ZodString;
-    motherIdNumber: z.ZodString;
+    motherIdNumber: z.ZodPipe<z.ZodString, z.ZodTransform<string | null | undefined, string>>;
     motherMobile: z.ZodString;
     address: z.ZodString;
     city: z.ZodString;

package/base-modules/admission/validate.js

@@ -5,12 +5,13 @@
  */
 import { z } from "zod";
 import { GENDER } from "../../type";
+import { normalizeIdNumber } from "../../utils/id-number";
 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,14 +34,14 @@ 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"),
+    fatherIdNumber: z.string().min(1, "Father's ID number is required").transform(normalizeIdNumber),
     fatherMobile: z.string().min(1, "Father's mobile number is required"),
     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"),
+    motherIdNumber: z.string().min(1, "Mother's ID number is required").transform(normalizeIdNumber),
     motherMobile: z.string().min(1, "Mother's mobile number is required"),
     // Home Information
     address: z.string().min(1, "Home address is required"),

package/base-modules/family/context.js

@@ -426,15 +426,15 @@ export const useFamilyModule = () => {
     // ==========================================================================
     // 1.4.9 EFFECTS
     // ==========================================================================
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
     useEffect(() => {
         var _a, _b;
         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]);
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    }, [listFetchNow]);
     // ==========================================================================
     // 1.4.10 RETURN
     // ==========================================================================

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

@@ -26,6 +26,7 @@ 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";
@@ -407,7 +408,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) => {
@@ -468,15 +469,15 @@ export const useFamilyMemberModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
+    useEffect(() => {
+        listFetchNowRef.current = listFetchNow;
+    }, [listFetchNow]);
     useEffect(() => {
         var _a, _b;
         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]);
-    useEffect(() => {
-        listFetchNowRef.current = listFetchNow;
-    }, [listFetchNow]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

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

@@ -25,7 +25,7 @@ export declare const familyMemberFormValidation: z.ZodObject<{
     relationship: z.ZodOptional<z.ZodString>;
     occupation: z.ZodOptional<z.ZodString>;
     emergencyPhone: z.ZodOptional<z.ZodString>;
-    idNumber: z.ZodOptional<z.ZodString>;
+    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,7 @@
  * Zod validation schemas for family-member form data.
  */
 import { z } from "zod";
+import { normalizeIdNumber } from "../../utils/id-number";
 // ============================================================================
 // VALIDATION KEYS (used as Zod error messages, translated via getTranslatedError)
 // ============================================================================
@@ -35,7 +36,7 @@ export const familyMemberFormValidation = z.object({
     relationship: z.string().optional(),
     occupation: z.string().optional(),
     emergencyPhone: z.string().optional(),
-    idNumber: z.string().optional(),
+    idNumber: z.string().optional().transform((val) => (val ? normalizeIdNumber(val) : val)),
     avatar: z.string().optional(),
     isPrimary: z.boolean().optional(),
     enabled: z.boolean().optional(),

package/package.json

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