@timardex/cluemart-shared 1.2.6 → 1.2.8

package/dist/hooks/index.mjs

@@ -124,6 +124,33 @@ var noLeadingZeros = (fieldName, options = {}) => {
 };
 dayjs.extend(isSameOrAfter);
 dayjs.extend(customParseFormat);
+var emailRequiredSchema = yup.string().email("Invalid email address").required("Email is required").label("Email").transform(
+  (value) => typeof value === "string" ? value.trim().toLowerCase() : value
+);
+var emailOptionalSchema = yup.string().nullable().notRequired().transform(
+  (value) => typeof value === "string" ? value.trim().toLowerCase() : value
+).test(
+  "is-valid-email",
+  "Invalid email address",
+  (value) => !value || yup.string().email().isValidSync(value)
+).label("Email");
+var mobileRegex = /^02\d{7,9}$/;
+var landlineRegex = /^(0(3|4|6|7|9)[0-9]{7})$/;
+var contactDetailsSchema = yup.object({
+  email: emailOptionalSchema,
+  mobilePhone: yup.string().label("Mobile Phone").nullable().notRequired().test(
+    "mobile-phone",
+    "Mobile must start with 02 and be 9\u201311 digits",
+    (value) => !value || mobileRegex.test(value)
+    // skip empty values
+  ),
+  landlinePhone: yup.string().label("Landline Phone").nullable().notRequired().test(
+    "landline-phone",
+    "Landline must start with 03, 04, 06, 07, or 09 (not 090) and have 7 digits after area code",
+    (value) => !value || landlineRegex.test(value)
+    // skip empty values
+  )
+}).nullable().optional().label("Contact Details");
 var endDateNotInPastTest = yup.string().test("not-in-past", "End date cannot be in the past", (value) => {
   const now = dayjs();
   return value ? dayjs(value, dateFormat, true).isSameOrAfter(now, "day") : false;
@@ -219,16 +246,6 @@ var locationSchema = yup.object().shape({
   region: yup.string().label("Region").required("Region is required"),
   type: yup.string().oneOf(["Point"], "Type must be 'Point'").default("Point").required("Type is required")
 });
-var emailRequiredSchema = yup.string().email("Invalid email address").required("Email is required").label("Email").transform(
-  (value) => typeof value === "string" ? value.trim().toLowerCase() : value
-);
-var emailOptionalSchema = yup.string().nullable().notRequired().transform(
-  (value) => typeof value === "string" ? value.trim().toLowerCase() : value
-).test(
-  "is-valid-email",
-  "Invalid email address",
-  (value) => !value || yup.string().email().isValidSync(value)
-).label("Email");
 var passwordSchema = yup.string().trim().label("Password").min(8, "Password must be at least 8 characters long").required("Password is required");
 var socialMediaSchema = yup.object({
   name: yup.mixed().oneOf(Object.values(EnumSocialMedia)).label("Social Media Name").optional(),
@@ -245,6 +262,7 @@ var globalResourceSchema = yup.object().shape({
     source: yup.string().label("Cover").required("Cover is required"),
     title: yup.string().label("Cover Title").required("Cover is required")
   }),
+  contactDetails: contactDetailsSchema,
   description: yup.string().label("Description").trim().min(3).required("Description is required"),
   name: yup.string().label("Name").trim().min(3).max(40).required("Name is required"),
   region: yup.string().label("Region").required("Region is required"),
@@ -276,23 +294,6 @@ var categorySchema = yup.array().of(
     ).min(1, "At least one subcategory is required").required("Subcategories are required")
   })
 );
-var mobileRegex = /^02\d{7,9}$/;
-var landlineRegex = /^(0(3|4|6|7|9)[0-9]{7})$/;
-var contactDetailsSchema = yup.object({
-  email: emailOptionalSchema,
-  mobilePhone: yup.string().label("Mobile Phone").nullable().notRequired().test(
-    "mobile-phone",
-    "Mobile must start with 02 and be 9\u201311 digits",
-    (value) => !value || mobileRegex.test(value)
-    // skip empty values
-  ),
-  landlinePhone: yup.string().label("Landline Phone").nullable().notRequired().test(
-    "landline-phone",
-    "Landline must start with 03, 04, 06, 07, or 09 (not 090) and have 7 digits after area code",
-    (value) => !value || landlineRegex.test(value)
-    // skip empty values
-  )
-}).nullable().optional().label("Contact Details");
 
 // src/yupSchema/event.ts
 import * as yup2 from "yup";
@@ -343,7 +344,6 @@ var paymentInfoSchema = yup2.object({
   })
 });
 var eventInfoSchema = yup2.object().shape({
-  contactDetails: contactDetailsSchema,
   applicationDeadlineHours: yup2.number().label("Application Deadline Hours").nullable().transform((value, originalValue) => originalValue === "" ? null : value).typeError("Application deadline hours must be a number").min(1, "Application deadline hours must be at least 1").required("Application deadline hours is required").test("no-leading-zeros", "", noLeadingZeros("Application deadline hours")),
   dateTime: yup2.array().of(dateTimeWithPriceSchema).required("DateTime is required"),
   eventId: yup2.string().trim().required("Event ID is required"),
@@ -374,7 +374,6 @@ var vendorSchema = globalResourceSchema.shape({
   vendorType: yup3.mixed().oneOf(Object.values(EnumVendorType)).required("Please select a Vendor type")
 });
 var vendorInfoSchema = yup3.object().shape({
-  contactDetails: contactDetailsSchema,
   product: yup3.object().shape({
     foodFlavors: yup3.array().of(
       yup3.mixed().oneOf(Object.values(EnumFoodFlavor), "Invalid flavor selected").required("Flavor is required")
@@ -531,6 +530,11 @@ var adSchema = yup7.object().shape({
 // src/hooks/utils.ts
 var globalDefaultValues = {
   active: false,
+  contactDetails: {
+    email: null,
+    landlinePhone: null,
+    mobilePhone: null
+  },
   cover: {
     source: "",
     title: ""
@@ -552,14 +556,7 @@ var globalDefaultValues = {
 };
 var defaultEventFormValues = {
   ...globalDefaultValues,
-  dateTime: [
-    {
-      endDate: "",
-      endTime: "",
-      startDate: "",
-      startTime: ""
-    }
-  ],
+  dateTime: [],
   eventType: "market" /* MARKET */,
   location: {
     city: "",
@@ -580,20 +577,7 @@ var defaultEventFormValues = {
 };
 var defaultEventInfoFormValues = {
   applicationDeadlineHours: 24,
-  contactDetails: {
-    email: null,
-    landlinePhone: null,
-    mobilePhone: null
-  },
-  dateTime: [
-    {
-      endDate: "",
-      endTime: "",
-      stallTypes: [],
-      startDate: "",
-      startTime: ""
-    }
-  ],
+  dateTime: [],
   eventId: "",
   packInTime: 2,
   // e.g., 2 hours before event opens
@@ -616,11 +600,6 @@ var defaultVendorFormValues = {
 };
 var defaultVendorInfoFormValues = {
   compliance: { foodBeverageLicense: false, liabilityInsurance: false },
-  contactDetails: {
-    email: null,
-    landlinePhone: null,
-    mobilePhone: null
-  },
   documents: null,
   documentsUpload: null,
   product: {
@@ -643,6 +622,7 @@ function mapBaseResourceTypeToFormData(data) {
   return {
     _id: data._id,
     active: data.active,
+    contactDetails: data.contactDetails,
     cover: data.cover,
     coverUpload: data.coverUpload,
     description: data.description,
@@ -766,7 +746,6 @@ function useVendorInfoForm(data) {
       reset({
         _id: data._id,
         compliance: data.compliance,
-        contactDetails: data.contactDetails,
         documents: data.documents,
         documentsUpload: data.documentsUpload,
         product: data.product,
@@ -781,7 +760,6 @@ function useVendorInfoForm(data) {
   const {
     _id,
     compliance,
-    contactDetails,
     documents,
     documentsUpload,
     product,
@@ -794,7 +772,6 @@ function useVendorInfoForm(data) {
     fields: {
       _id,
       compliance,
-      contactDetails,
       documents,
       documentsUpload,
       product,
@@ -923,7 +900,6 @@ function useEventInfoForm(data) {
       reset({
         _id: data._id,
         applicationDeadlineHours: data.applicationDeadlineHours,
-        contactDetails: data.contactDetails,
         dateTime: data.dateTime,
         eventId: data.eventId,
         packInTime: data.packInTime,
@@ -938,7 +914,6 @@ function useEventInfoForm(data) {
   const {
     _id,
     applicationDeadlineHours,
-    contactDetails,
     dateTime,
     eventId,
     packInTime,
@@ -951,7 +926,6 @@ function useEventInfoForm(data) {
     fields: {
       _id,
       applicationDeadlineHours,
-      contactDetails,
       dateTime,
       eventId,
       packInTime,
@@ -1009,7 +983,8 @@ function useUserForm(data) {
         lastName: data.lastName,
         password: data.password,
         preferredRegion: data.preferredRegion,
-        role: data.role
+        role: data.role,
+        termsAgreement: data.termsAgreement
       });
     } else {
       reset(defaultValues);
@@ -1026,7 +1001,8 @@ function useUserForm(data) {
     lastName,
     password,
     preferredRegion,
-    role
+    role,
+    termsAgreement
   } = getValues();
   return {
     control,
@@ -1041,7 +1017,8 @@ function useUserForm(data) {
       lastName,
       password,
       preferredRegion,
-      role
+      role,
+      termsAgreement
     },
     formState: { errors },
     handleSubmit,