@timardex/cluemart-shared 1.0.20 → 1.0.22

package/dist/index.d.mts

@@ -215,9 +215,9 @@ interface DateTimeWithPriceType extends DateTimeType {
 }
 interface MarketInfoFormData {
     _id?: string;
-    active: boolean;
     applicationDeadlineHours: number;
     dateTime: DateTimeWithPriceType[];
+    marketId: string;
     paymentDueHours: number;
     paymentMethod: EnumPaymentMethod;
     paymentTarget: {
@@ -232,7 +232,7 @@ interface MarketFormData extends BaseResourceTypeFormData {
     dateTime: DateTimeType[];
     location: LocationType;
     provider: string;
-    tags?: string[] | null;
+    tags: string[];
 }
 interface CreateMarketInfoFormData {
     control: Control<MarketInfoFormData, any>;
@@ -261,11 +261,10 @@ interface MarketType extends BaseResourceType {
     location: MarketFormData["location"];
     marketInfoId: string;
     provider: string;
-    tags: string[] | null;
+    tags: string[];
 }
 interface MarketInfoType {
     _id: string;
-    active: boolean;
     applicationDeadlineHours: number;
     dateTime: DateTimeWithPriceType[];
     marketId: string;
@@ -315,7 +314,6 @@ type StallholderAttributes = {
 };
 type StallholderApplyFormFormData = {
     _id?: string;
-    active: boolean;
     electricity: StallholderAttributes;
     foodSafetyGradeFiles?: string[] | null;
     foodSafetyGradeFilesUpload?: string[] | null;
@@ -327,6 +325,7 @@ type StallholderApplyFormFormData = {
         min: number;
     };
     producedIn: string[];
+    stallholderId: string;
     stallSize: {
         depth: number;
         width: number;
@@ -354,7 +353,6 @@ interface StallholderType extends BaseResourceType {
 }
 interface StallholderApplyFormType {
     _id: string;
-    active: boolean;
     electricity: {
         details: string | null;
         isRequired: boolean;
@@ -1038,8 +1036,8 @@ declare const marketEndDateFields: FormDateField[];
 declare const availableTagTypes: string[];
 declare const tagOptions: OptionItem[];
 
-declare const stallApplicationInfo: FormField[];
-declare const stallApplicationInfoPaymentTarget: FormField[];
+declare const marketInfo: FormField[];
+declare const marketInfoPaymentTarget: FormField[];
 declare const marketPriceByDateFields: FormField[];
 declare const rejectionPolicyOptions: OptionItem[];
 
@@ -1054,4 +1052,4 @@ declare const profileFields: FormField[];
 declare const availableCategories: Category[];
 declare const categoryColors: Record<string, string>;
 
-export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateMarketInfoFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, EnumInviteStatus, EnumNotification, EnumPaymentMethod, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketInfoFormData, type MarketInfoType, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type Nullable, type OptionItem, type PlacePrediction, type PosterInputType, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, defaultMarketFormValues, defaultMarketInfoFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, loginFields, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketPriceByDateFields, marketStartDateFields, packagingOptions, paymentMethodOptions, producedIngOptions, profileFields, registerFields, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, resetPasswordFields, sortDatesByProximity, stallApplicationInfo, stallApplicationInfoPaymentTarget, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateMarketInfo, useCreatePoster, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketInfo, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useMarketInfoForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateMarketInfo, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, validateTokenFields };
+export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateMarketInfoFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, EnumInviteStatus, EnumNotification, EnumPaymentMethod, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketInfoFormData, type MarketInfoType, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type Nullable, type OptionItem, type PlacePrediction, type PosterInputType, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, defaultMarketFormValues, defaultMarketInfoFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, loginFields, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketInfo, marketInfoPaymentTarget, marketPriceByDateFields, marketStartDateFields, packagingOptions, paymentMethodOptions, producedIngOptions, profileFields, registerFields, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, resetPasswordFields, sortDatesByProximity, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateMarketInfo, useCreatePoster, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketInfo, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useMarketInfoForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateMarketInfo, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, validateTokenFields };

package/dist/index.d.ts

@@ -215,9 +215,9 @@ interface DateTimeWithPriceType extends DateTimeType {
 }
 interface MarketInfoFormData {
     _id?: string;
-    active: boolean;
     applicationDeadlineHours: number;
     dateTime: DateTimeWithPriceType[];
+    marketId: string;
     paymentDueHours: number;
     paymentMethod: EnumPaymentMethod;
     paymentTarget: {
@@ -232,7 +232,7 @@ interface MarketFormData extends BaseResourceTypeFormData {
     dateTime: DateTimeType[];
     location: LocationType;
     provider: string;
-    tags?: string[] | null;
+    tags: string[];
 }
 interface CreateMarketInfoFormData {
     control: Control<MarketInfoFormData, any>;
@@ -261,11 +261,10 @@ interface MarketType extends BaseResourceType {
     location: MarketFormData["location"];
     marketInfoId: string;
     provider: string;
-    tags: string[] | null;
+    tags: string[];
 }
 interface MarketInfoType {
     _id: string;
-    active: boolean;
     applicationDeadlineHours: number;
     dateTime: DateTimeWithPriceType[];
     marketId: string;
@@ -315,7 +314,6 @@ type StallholderAttributes = {
 };
 type StallholderApplyFormFormData = {
     _id?: string;
-    active: boolean;
     electricity: StallholderAttributes;
     foodSafetyGradeFiles?: string[] | null;
     foodSafetyGradeFilesUpload?: string[] | null;
@@ -327,6 +325,7 @@ type StallholderApplyFormFormData = {
         min: number;
     };
     producedIn: string[];
+    stallholderId: string;
     stallSize: {
         depth: number;
         width: number;
@@ -354,7 +353,6 @@ interface StallholderType extends BaseResourceType {
 }
 interface StallholderApplyFormType {
     _id: string;
-    active: boolean;
     electricity: {
         details: string | null;
         isRequired: boolean;
@@ -1038,8 +1036,8 @@ declare const marketEndDateFields: FormDateField[];
 declare const availableTagTypes: string[];
 declare const tagOptions: OptionItem[];
 
-declare const stallApplicationInfo: FormField[];
-declare const stallApplicationInfoPaymentTarget: FormField[];
+declare const marketInfo: FormField[];
+declare const marketInfoPaymentTarget: FormField[];
 declare const marketPriceByDateFields: FormField[];
 declare const rejectionPolicyOptions: OptionItem[];
 
@@ -1054,4 +1052,4 @@ declare const profileFields: FormField[];
 declare const availableCategories: Category[];
 declare const categoryColors: Record<string, string>;
 
-export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateMarketInfoFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, EnumInviteStatus, EnumNotification, EnumPaymentMethod, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketInfoFormData, type MarketInfoType, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type Nullable, type OptionItem, type PlacePrediction, type PosterInputType, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, defaultMarketFormValues, defaultMarketInfoFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, loginFields, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketPriceByDateFields, marketStartDateFields, packagingOptions, paymentMethodOptions, producedIngOptions, profileFields, registerFields, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, resetPasswordFields, sortDatesByProximity, stallApplicationInfo, stallApplicationInfoPaymentTarget, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateMarketInfo, useCreatePoster, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketInfo, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useMarketInfoForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateMarketInfo, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, validateTokenFields };
+export { type BaseResourceType, type BaseResourceTypeFormData, type Category, type ChatInput, type ChatMessageInput, type ChatMessageType, type ChatType, type CreateLoginFormData, type CreateMarketFormData, type CreateMarketInfoFormData, type CreateRegisterFormData, type CreateRequestPasswordResetFormData, type CreateResetPasswordFormData, type CreateStallholderApplyFormFormData, type CreateStallholderFormData, type CreateUserFormData, type CreateValidateTokenFormData, type DateTimeType, EnumInviteStatus, EnumNotification, EnumPaymentMethod, EnumRegions, EnumRejectionPolicy, EnumRelationResource, EnumResourceType, EnumResourceTypeIcon, EnumUserLicence, EnumUserRole, type FormDateField, type FormField, type GeocodeLocation, type ImageObjectType, ImageTypeEnum, type LocationType, type LoginFormData, type MapMultiLocation, type MarketFormData, type MarketInfoFormData, type MarketInfoType, type MarketType, type MarketWithConnectionDatesType, type NotificationType, type Nullable, type OptionItem, type PlacePrediction, type PosterInputType, type Region, type RegisterFormData, type RelationDate, type RelationLog, type RelationType, type RequestPasswordResetFormData, type ResetPasswordFormData, type ResourceConnectionsType, type ResourceImageType, type SatllholderWithConnectionDatesType, type StallholderApplyFormFormData, type StallholderApplyFormType, type StallholderAttributes, type StallholderFormData, type StallholderLocation, type StallholderType, type Subcategory, type UserFormData, type UserType, type ValidateTokenFormData, availableCategories, availableCityOptions, availableRegionOptions, availableRegionTypes, availableTagTypes, capitalizeFirstLetter, categoryColors, dateFormat, defaultMarketFormValues, defaultMarketInfoFormValues, defaultRegion, defaultStallholderApplyFormValues, defaultStallholderFormValues, formatDate, formatTimestamp, getCurrentAndFutureDates, getFutureDatesAfterThreshold, globalDefaultValues, loginFields, mapArrayToOptions, marketBasicInfoFields, marketEndDateFields, marketInfo, marketInfoPaymentTarget, marketPriceByDateFields, marketStartDateFields, packagingOptions, paymentMethodOptions, producedIngOptions, profileFields, registerFields, rejectionPolicyOptions, removeTypename, requestPasswordResetFields, resetPasswordFields, sortDatesByProximity, stallholderBasicInfoFields, stallholderElectricity, stallholderEndDateFields, stallholderFullAddress, stallholderGazebo, stallholderLocationDescription, stallholderMultiLocation, stallholderPackaging, stallholderPaymentMethod, stallholderPriceRange, stallholderProducedIn, stallholderStallSize, stallholderStartDateFields, stallholderTable, statusOptions, tagOptions, timeFormat, truncateText, useAddParticipantToChat, useAddUserFavouriteResource, useCreateChat, useCreateMarket, useCreateMarketInfo, useCreatePoster, useCreateRelation, useCreateStallholder, useCreateStallholderApplyForm, useCreateUser, useDeleteChat, useDeleteMarket, useDeleteRelation, useDeleteStallholder, useGetChat, useGetChatSubscription, useGetMarket, useGetMarketInfo, useGetMarketRelations, useGetMarkets, useGetMarketsByRegion, useGetMarketsNearMe, useGetNotification, useGetRelation, useGetRelationByMarketAndStallholder, useGetResourceConnections, useGetStallholder, useGetStallholderApplyForm, useGetStallholderRelations, useGetStallholders, useGetStallholdersByRegion, useGetUser, useGetUserChats, useGetUserFavourites, useGetUserMarkets, useGetUserNotifications, useGetUsers, useLocationSearch, useLogin, useLoginForm, useMarketForm, useMarketInfoForm, useRegister, useRegisterForm, useRemoveParticipantFromChat, useRemoveUserFavouriteResource, useRequestPasswordReset, useRequestPasswordResetForm, useResetPassword, useResetPasswordForm, useSearchMarkets, useSearchStallholders, useSendChatMessage, useStallholderApplyForm, useStallholderForm, useUpdateMarket, useUpdateMarketInfo, useUpdateRelation, useUpdateStallholder, useUpdateStallholderApplyForm, useUpdateUser, useUserForm, useValidateToken, useValidateTokenForm, validateTokenFields };

package/dist/index.mjs

@@ -392,12 +392,12 @@ var marketSchema = globalResourceSchema.shape({
   dateTime: yup2.array().of(dateTimeSchema).required("DateTime is required"),
   location: locationSchema,
   provider: yup2.string().trim().min(3).required("Provider is required"),
-  tags: yup2.array().of(yup2.string().defined()).nullable()
+  tags: yup2.array().of(yup2.string().defined()).min(1, "Tags are required").required("Tags are required")
 });
 var marketInfoSchema = yup2.object().shape({
-  active: yup2.boolean().required("Active is required"),
   applicationDeadlineHours: yup2.number().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"),
+  marketId: yup2.string().trim().required("Market ID is required"),
   paymentDueHours: yup2.number().typeError("Payment due hours must be a number").min(1, "Payment due hours must be at least 1").required("Payment due hours is required").test("no-leading-zeros", "", noLeadingZeros("Payment due hours")),
   paymentMethod: yup2.mixed().oneOf(Object.values(EnumPaymentMethod)).required("Please select a Payment method"),
   paymentTarget: yup2.object().when("paymentMethod", (paymentMethod, schema) => {
@@ -408,7 +408,9 @@ var marketInfoSchema = yup2.object().shape({
       return schema.shape({
         accountHolderName: yup2.string().notRequired(),
         accountNumber: yup2.string().notRequired(),
-        link: yup2.string().trim().required("Link is required for PayPal/Stripe")
+        link: yup2.string().trim().url("Link must be a valid URL").transform(
+          (value) => typeof value === "string" ? value.toLowerCase() : value
+        ).required("Link is required for PayPal/Stripe")
       });
     } else if (isBankTransfer) {
       return schema.shape({
@@ -417,7 +419,9 @@ var marketInfoSchema = yup2.object().shape({
           nzBankAccountRegex,
           "Account number must be in format: XX-XXXX-XXXXXXX-XX"
         ),
-        link: yup2.string().notRequired()
+        link: yup2.string().transform(
+          (value) => typeof value === "string" ? value.toLowerCase() : value
+        ).notRequired()
       });
     } else {
       return schema.shape({
@@ -451,7 +455,6 @@ var stallHolderSchema = globalResourceSchema.shape({
   products: yup3.array().of(yup3.string().defined()).min(1, "Product list must contain at least one item").required("Products are required")
 });
 var stallholderApplyFormSchema = yup3.object().shape({
-  active: yup3.boolean().required("Active is required"),
   electricity: yup3.object().shape({
     details: yup3.string().trim().test("details-required", "Please add details", function(value) {
       return !this.parent?.isRequired || (value?.trim().length ?? 0) > 0;
@@ -480,6 +483,7 @@ var stallholderApplyFormSchema = yup3.object().shape({
     min: yup3.number().min(1).required("Min price is required")
   }),
   producedIn: yup3.array().of(yup3.string().defined()).min(1, "Produced in list must contain at least one item").required("Produced in is required"),
+  stallholderId: yup3.string().trim().required("Stallholder ID is required"),
   stallSize: yup3.object().shape({
     depth: yup3.number().min(1).required("Depth is required"),
     width: yup3.number().min(1).required("Width is required")
@@ -583,10 +587,9 @@ var defaultMarketFormValues = {
     // Default type for GeoJSON
   },
   provider: "Provider name",
-  tags: null
+  tags: []
 };
 var defaultMarketInfoFormValues = {
-  active: false,
   applicationDeadlineHours: 0,
   dateTime: [
     {
@@ -604,6 +607,7 @@ var defaultMarketInfoFormValues = {
       startTime: "09:00"
     }
   ],
+  marketId: "",
   paymentDueHours: 0,
   paymentMethod: "",
   paymentTarget: {
@@ -619,11 +623,10 @@ var defaultStallholderFormValues = {
   categories: [],
   locations: null,
   multiLocation: false,
-  products: ["Prod uct 1", "Product 2"],
+  products: [],
   specialities: null
 };
 var defaultStallholderApplyFormValues = {
-  active: false,
   electricity: { details: null, isRequired: false },
   foodSafetyGradeFiles: null,
   foodSafetyGradeFilesUpload: null,
@@ -632,6 +635,7 @@ var defaultStallholderApplyFormValues = {
   paymentMethod: "",
   priceRange: { max: 0, min: 0 },
   producedIn: [],
+  stallholderId: "",
   stallSize: { depth: 0, width: 0 },
   table: { details: null, isRequired: false }
 };
@@ -744,7 +748,6 @@ function useStallholderApplyForm(data) {
     if (data) {
       reset({
         _id: data._id,
-        active: data.active,
         electricity: data.electricity,
         foodSafetyGradeFiles: data.foodSafetyGradeFiles,
         foodSafetyGradeFilesUpload: data.foodSafetyGradeFilesUpload,
@@ -753,6 +756,7 @@ function useStallholderApplyForm(data) {
         paymentMethod: data.paymentMethod,
         priceRange: data.priceRange,
         producedIn: data.producedIn,
+        stallholderId: data.stallholderId,
         stallSize: data.stallSize,
         table: data.table
       });
@@ -762,7 +766,6 @@ function useStallholderApplyForm(data) {
   }, [data]);
   const {
     _id,
-    active,
     electricity,
     foodSafetyGradeFiles,
     foodSafetyGradeFilesUpload,
@@ -771,6 +774,7 @@ function useStallholderApplyForm(data) {
     paymentMethod,
     priceRange,
     producedIn,
+    stallholderId,
     stallSize,
     table
   } = getValues();
@@ -778,7 +782,6 @@ function useStallholderApplyForm(data) {
     control,
     fields: {
       _id,
-      active,
       electricity,
       foodSafetyGradeFiles,
       foodSafetyGradeFilesUpload,
@@ -787,6 +790,7 @@ function useStallholderApplyForm(data) {
       paymentMethod,
       priceRange,
       producedIn,
+      stallholderId,
       stallSize,
       table
     },
@@ -904,9 +908,9 @@ function useMarketInfoForm(data) {
     if (data) {
       reset({
         _id: data._id,
-        active: data.active,
         applicationDeadlineHours: data.applicationDeadlineHours,
         dateTime: data.dateTime,
+        marketId: data.marketId,
         paymentDueHours: data.paymentDueHours,
         paymentMethod: data.paymentMethod,
         paymentTarget: data.paymentTarget,
@@ -919,9 +923,9 @@ function useMarketInfoForm(data) {
   }, [data]);
   const {
     _id,
-    active,
     applicationDeadlineHours,
     dateTime,
+    marketId,
     paymentDueHours,
     paymentMethod,
     paymentTarget,
@@ -932,9 +936,9 @@ function useMarketInfoForm(data) {
     control,
     fields: {
       _id,
-      active,
       applicationDeadlineHours,
       dateTime,
+      marketId,
       paymentDueHours,
       paymentMethod,
       paymentTarget,
@@ -1567,7 +1571,6 @@ var MARKET_LOCATION_FIELDS_FRAGMENT = gql5`
 var MARKET_INFO = gql5`
   fragment MarketInfoFields on MarketInfoType {
     _id
-    active
     applicationDeadlineHours
     dateTime {
       endDate
@@ -1788,7 +1791,6 @@ var STALLHOLDER = gql7`
 var STALLHOLDER_APPLY_FORM = gql7`
   fragment StallholderApplyFormFields on StallholderApplyFormType {
     _id
-    active
     electricity {
       details
       isRequired
@@ -2030,8 +2032,8 @@ var useGetMarketInfo = (marketId) => {
     skip: !marketId,
     variables: { marketId }
   });
-  const marketInfo = data?.marketInfo;
-  return { error, loading, marketInfo, refetch };
+  const marketInfo2 = data?.marketInfo;
+  return { error, loading, marketInfo: marketInfo2, refetch };
 };
 
 // src/graphql/hooks/poster.ts
@@ -3033,43 +3035,46 @@ var availableTagTypes = [
   "Near Playground",
   "Port Nearby"
 ];
-var tagOptions = mapArrayToOptions(availableTagTypes);
+var tagOptions = availableTagTypes.map((tag) => ({
+  label: tag,
+  value: tag
+}));
 
 // src/formFields/market/marketInfo.ts
-var stallApplicationInfo = [
+var marketInfo = [
   {
     helperText: "Application Deadline of the Market *",
     keyboardType: "number-pad",
-    name: "stallApplicationInfo.applicationDeadlineHours",
+    name: "applicationDeadlineHours",
     placeholder: "Application Deadline Hours"
   },
   {
     helperText: "Stall Capacity of the Market *",
     keyboardType: "number-pad",
-    name: "stallApplicationInfo.stallCapacity",
+    name: "stallCapacity",
     placeholder: "Stall Capacity"
   },
   {
     helperText: "Payment Due Hours of the Market *",
     keyboardType: "number-pad",
-    name: "stallApplicationInfo.paymentDueHours",
+    name: "paymentDueHours",
     placeholder: "Payment Due Hours"
   }
 ];
-var stallApplicationInfoPaymentTarget = [
+var marketInfoPaymentTarget = [
   {
     helperText: "Account holder name *",
-    name: "stallApplicationInfo.paymentTarget.accountHolderName",
+    name: "paymentTarget.accountHolderName",
     placeholder: "Account holder name"
   },
   {
     helperText: "Account number *",
-    name: "stallApplicationInfo.paymentTarget.accountNumber",
+    name: "paymentTarget.accountNumber",
     placeholder: "Account number"
   },
   {
     helperText: "Link to payment target *",
-    name: "stallApplicationInfo.paymentTarget.link",
+    name: "paymentTarget.link",
     placeholder: "Link to payment target"
   }
 ];
@@ -3540,6 +3545,8 @@ export {
   mapArrayToOptions,
   marketBasicInfoFields,
   marketEndDateFields,
+  marketInfo,
+  marketInfoPaymentTarget,
   marketPriceByDateFields,
   marketStartDateFields,
   packagingOptions,
@@ -3552,8 +3559,6 @@ export {
   requestPasswordResetFields,
   resetPasswordFields,
   sortDatesByProximity,
-  stallApplicationInfo,
-  stallApplicationInfoPaymentTarget,
   stallholderBasicInfoFields,
   stallholderElectricity,
   stallholderEndDateFields,