fix(SW-672): Added nullable and default values to schema to avoid validation issues from ContentStack with changed models

This commit is contained in:
Erik Tiekstra
2024-10-22 09:42:08 +02:00
parent 8381862af8
commit bcee55c359
4 changed files with 34 additions and 28 deletions

View File

@@ -88,7 +88,7 @@ export default function TabNavigation({
scroll={true} scroll={true}
onClick={pauseScrollSpy} onClick={pauseScrollSpy}
> >
{intl.formatMessage({ id: link.text })} {link.text}
</Link> </Link>
) )
})} })}

View File

@@ -11,7 +11,6 @@
"mapContainer"; "mapContainer";
margin: 0 auto; margin: 0 auto;
max-width: var(--max-width); max-width: var(--max-width);
z-index: 0;
} }
.hotelImages { .hotelImages {

View File

@@ -369,16 +369,16 @@ export const validateFooterConfigSchema = z
all_footer: z.object({ all_footer: z.object({
items: z.array( items: z.array(
z.object({ z.object({
main_links: validateLinks, main_links: validateLinks.default([]),
app_downloads: z.object({ app_downloads: z.object({
title: z.string(), title: z.string(),
links: validateLinksWithType, links: validateLinksWithType.default([]),
}), }),
secondary_links: validateSecondaryLinks, secondary_links: validateSecondaryLinks.default([]),
social_media: z.object({ social_media: z.object({
links: validateLinksWithType, links: validateLinksWithType.default([]),
}), }),
tertiary_links: validateLinks, tertiary_links: validateLinks.default([]),
}) })
), ),
}), }),
@@ -418,25 +418,31 @@ export const validateFooterRefConfigSchema = z.object({
items: z items: z
.array( .array(
z.object({ z.object({
main_links: z.array( main_links: z
z.object({ .array(
pageConnection: pageConnectionRefs, z.object({
}) pageConnection: pageConnectionRefs,
), })
secondary_links: z.array( )
z.object({ .nullable(),
links: z.array( secondary_links: z
z.object({ .array(
pageConnection: pageConnectionRefs, z.object({
}) links: z.array(
), z.object({
}) pageConnection: pageConnectionRefs,
), })
tertiary_links: z.array( ),
z.object({ })
pageConnection: pageConnectionRefs, )
}) .nullable(),
), tertiary_links: z
.array(
z.object({
pageConnection: pageConnectionRefs,
})
)
.nullable(),
system: systemSchema, system: systemSchema,
}) })
) )

View File

@@ -31,7 +31,8 @@ export const hotelFaqSchema = z
.object({ .object({
questions: accordionItemsSchema, questions: accordionItemsSchema,
}) })
.optional(), .optional()
.nullable(),
}) })
.transform((data) => { .transform((data) => {
const array = [] const array = []
@@ -51,7 +52,7 @@ export const hotelFaqRefsSchema = z
.optional() .optional()
.default(HotelPageEnum.ContentStack.blocks.Faq), .default(HotelPageEnum.ContentStack.blocks.Faq),
global_faqConnection: globalAccordionConnectionRefs.optional(), global_faqConnection: globalAccordionConnectionRefs.optional(),
specific_faq: specificAccordionConnectionRefs.optional(), specific_faq: specificAccordionConnectionRefs.optional().nullable(),
}) })
.transform((data) => { .transform((data) => {
const array = [] const array = []