scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

54
server/routers/contentstack/base/output.ts
View File

@@ -369,16 +369,16 @@ export const validateFooterConfigSchema = z
all_footer: z.object({
items: z.array(
z.object({
main_links: validateLinks,
main_links: validateLinks.default([]),
app_downloads: z.object({
title: z.string(),
links: validateLinksWithType,
links: validateLinksWithType.default([]),
}),
secondary_links: validateSecondaryLinks,
secondary_links: validateSecondaryLinks.default([]),
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
.array(
z.object({
main_links: z.array(
z.object({
pageConnection: pageConnectionRefs,
})
),
secondary_links: z.array(
z.object({
links: z.array(
z.object({
pageConnection: pageConnectionRefs,
})
),
})
),
tertiary_links: z.array(
z.object({
pageConnection: pageConnectionRefs,
})
),
main_links: z
.array(
z.object({
pageConnection: pageConnectionRefs,
})
)
.nullable(),
secondary_links: z
.array(
z.object({
links: z.array(
z.object({
pageConnection: pageConnectionRefs,
})
),
})
)
.nullable(),
tertiary_links: z
.array(
z.object({
pageConnection: pageConnectionRefs,
})
)
.nullable(),
system: systemSchema,
})
)

5
server/routers/contentstack/schemas/blocks/hotelFaq.ts
View File

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