From c6f76b83ccdea18f9d9e74a4c719cf78c3f605f2 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@scandichotels.com>
Date: Wed, 15 Oct 2025 14:41:26 +0000
Subject: [PATCH] Merged in fix/BOOK-456-destination-city-validation-error
 (pull request #2975)

fix(BOOK-456): Added nullish() to destination pages content and sidepeek content schema to avoid unexpected errors

* fix(BOOK-456): Added nullish() to destination pages content and sidepeek content schema to avoid unexpected errors


Approved-by: Linus Flood
---
 .../DestinationPage/Sidepeek/index.tsx        |  4 +
 .../routers/contentstack/contentPage/utils.ts |  2 +-
 .../destinationCityPage/output.ts             | 54 +++++++------
 .../contentstack/destinationCityPage/utils.ts |  4 +-
 .../destinationCountryPage/output.ts          | 60 ++++++++-------
 .../destinationCountryPage/utils.ts           |  4 +-
 .../routers/contentstack/loyaltyPage/utils.ts |  2 +-
 .../contentstack/promoCampaignPage/utils.ts   |  2 +-
 .../contentstack/schemas/blocks/content.ts    | 77 ++++++++++---------
 9 files changed, 114 insertions(+), 95 deletions(-)

diff --git a/apps/scandic-web/components/ContentType/DestinationPage/Sidepeek/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/Sidepeek/index.tsx
index 6eda9bc0d..81603644b 100644
--- a/apps/scandic-web/components/ContentType/DestinationPage/Sidepeek/index.tsx
+++ b/apps/scandic-web/components/ContentType/DestinationPage/Sidepeek/index.tsx
@@ -35,6 +35,10 @@ export default function DestinationPageSidepeek({
     trackOpenSidePeekOnDestinationPagesEvent(location)
   }
 
+  if (!content) {
+    return null
+  }
+
   return (
     <div>
       <Button
diff --git a/packages/trpc/lib/routers/contentstack/contentPage/utils.ts b/packages/trpc/lib/routers/contentstack/contentPage/utils.ts
index 4960ad0c2..6a17fa9ae 100644
--- a/packages/trpc/lib/routers/contentstack/contentPage/utils.ts
+++ b/packages/trpc/lib/routers/contentstack/contentPage/utils.ts
@@ -93,7 +93,7 @@ export function getConnections({ content_page }: ContentPageRefs) {
         }
         case ContentPageEnum.ContentStack.blocks.Content:
           {
-            if (block.content.length) {
+            if (block?.content?.length) {
               connections.push(...block.content)
             }
           }
diff --git a/packages/trpc/lib/routers/contentstack/destinationCityPage/output.ts b/packages/trpc/lib/routers/contentstack/destinationCityPage/output.ts
index 24889484b..d90772544 100644
--- a/packages/trpc/lib/routers/contentstack/destinationCityPage/output.ts
+++ b/packages/trpc/lib/routers/contentstack/destinationCityPage/output.ts
@@ -144,22 +144,24 @@ export const destinationCityPageSchema = z.object({
     sidepeek_content: z
       .object({
         heading: z.string(),
-        content: z.object({
-          json: z.any(),
-          embedded_itemsConnection: z.object({
-            edges: z.array(
-              z.object({
-                node: linkUnionSchema.transform((data) => {
-                  const link = transformPageLink(data)
-                  if (link) {
-                    return link
-                  }
-                  return data
-                }),
-              })
-            ),
-          }),
-        }),
+        content: z
+          .object({
+            json: z.any(),
+            embedded_itemsConnection: z.object({
+              edges: z.array(
+                z.object({
+                  node: linkUnionSchema.transform((data) => {
+                    const link = transformPageLink(data)
+                    if (link) {
+                      return link
+                    }
+                    return data
+                  }),
+                })
+              ),
+            }),
+          })
+          .nullish(),
       })
       .nullish(),
     blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
@@ -251,15 +253,17 @@ export const destinationCityPageRefsSchema = z.object({
     destination_settings: destinationCityPageDestinationSettingsSchema,
     sidepeek_content: z
       .object({
-        content: z.object({
-          embedded_itemsConnection: z.object({
-            edges: z.array(
-              z.object({
-                node: linkRefsUnionSchema,
-              })
-            ),
-          }),
-        }),
+        content: z
+          .object({
+            embedded_itemsConnection: z.object({
+              edges: z.array(
+                z.object({
+                  node: linkRefsUnionSchema,
+                })
+              ),
+            }),
+          })
+          .nullish(),
       })
       .nullish(),
     blocks: discriminatedUnionArray(blocksRefsSchema.options).nullable(),
diff --git a/packages/trpc/lib/routers/contentstack/destinationCityPage/utils.ts b/packages/trpc/lib/routers/contentstack/destinationCityPage/utils.ts
index 18f4b4ba9..24868e49f 100644
--- a/packages/trpc/lib/routers/contentstack/destinationCityPage/utils.ts
+++ b/packages/trpc/lib/routers/contentstack/destinationCityPage/utils.ts
@@ -47,7 +47,7 @@ export function getConnections({
         }
         case DestinationCityPageEnum.ContentStack.blocks.Content:
           {
-            if (block.content.length) {
+            if (block?.content?.length) {
               // TS has trouble infering the filtered types
               // @ts-ignore
               connections.push(...block.content)
@@ -58,7 +58,7 @@ export function getConnections({
     })
   }
   if (destination_city_page.sidepeek_content) {
-    destination_city_page.sidepeek_content.content.embedded_itemsConnection.edges.forEach(
+    destination_city_page.sidepeek_content?.content?.embedded_itemsConnection.edges.forEach(
       ({ node }) => {
         connections.push(node.system)
       }
diff --git a/packages/trpc/lib/routers/contentstack/destinationCountryPage/output.ts b/packages/trpc/lib/routers/contentstack/destinationCountryPage/output.ts
index 2efa28183..11f903c58 100644
--- a/packages/trpc/lib/routers/contentstack/destinationCountryPage/output.ts
+++ b/packages/trpc/lib/routers/contentstack/destinationCountryPage/output.ts
@@ -73,22 +73,24 @@ export const destinationCountryPageSchema = z.object({
     sidepeek_content: z
       .object({
         heading: z.string(),
-        content: z.object({
-          json: z.any(),
-          embedded_itemsConnection: z.object({
-            edges: z.array(
-              z.object({
-                node: linkUnionSchema.transform((data) => {
-                  const link = transformPageLink(data)
-                  if (link) {
-                    return link
-                  }
-                  return data
-                }),
-              })
-            ),
-          }),
-        }),
+        content: z
+          .object({
+            json: z.any(),
+            embedded_itemsConnection: z.object({
+              edges: z.array(
+                z.object({
+                  node: linkUnionSchema.transform((data) => {
+                    const link = transformPageLink(data)
+                    if (link) {
+                      return link
+                    }
+                    return data
+                  }),
+                })
+              ),
+            }),
+          })
+          .nullish(),
       })
       .nullish(),
     blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
@@ -153,17 +155,21 @@ const blocksRefsSchema = z.discriminatedUnion("__typename", [
 ])
 export const destinationCountryPageRefsSchema = z.object({
   destination_country_page: z.object({
-    sidepeek_content: z.object({
-      content: z.object({
-        embedded_itemsConnection: z.object({
-          edges: z.array(
-            z.object({
-              node: linkRefsUnionSchema,
-            })
-          ),
-        }),
-      }),
-    }),
+    sidepeek_content: z
+      .object({
+        content: z
+          .object({
+            embedded_itemsConnection: z.object({
+              edges: z.array(
+                z.object({
+                  node: linkRefsUnionSchema,
+                })
+              ),
+            }),
+          })
+          .nullish(),
+      })
+      .nullish(),
     blocks: discriminatedUnionArray(blocksRefsSchema.options).nullable(),
     seo_filters: destinationFiltersRefsSchema,
     system: systemSchema,
diff --git a/packages/trpc/lib/routers/contentstack/destinationCountryPage/utils.ts b/packages/trpc/lib/routers/contentstack/destinationCountryPage/utils.ts
index 055ebb162..b502c37ef 100644
--- a/packages/trpc/lib/routers/contentstack/destinationCountryPage/utils.ts
+++ b/packages/trpc/lib/routers/contentstack/destinationCountryPage/utils.ts
@@ -45,7 +45,7 @@ export function getConnections({
         }
         case DestinationCountryPageEnum.ContentStack.blocks.Content:
           {
-            if (block.content.length) {
+            if (block?.content?.length) {
               // TS has trouble infering the filtered types
               // @ts-ignore
               connections.push(...block.content)
@@ -56,7 +56,7 @@ export function getConnections({
     })
   }
   if (destination_country_page.sidepeek_content) {
-    destination_country_page.sidepeek_content.content.embedded_itemsConnection.edges.forEach(
+    destination_country_page.sidepeek_content?.content?.embedded_itemsConnection.edges.forEach(
       ({ node }) => {
         connections.push(node.system)
       }
diff --git a/packages/trpc/lib/routers/contentstack/loyaltyPage/utils.ts b/packages/trpc/lib/routers/contentstack/loyaltyPage/utils.ts
index 0974b3dea..ba35034bc 100644
--- a/packages/trpc/lib/routers/contentstack/loyaltyPage/utils.ts
+++ b/packages/trpc/lib/routers/contentstack/loyaltyPage/utils.ts
@@ -15,7 +15,7 @@ export function getConnections({ loyalty_page }: LoyaltyPageRefs) {
           }
           break
         case LoyaltyPageEnum.ContentStack.blocks.Content:
-          if (block.content.length) {
+          if (block?.content?.length) {
             // TS has trouble infering the filtered types
             // @ts-ignore
             connections.push(...block.content)
diff --git a/packages/trpc/lib/routers/contentstack/promoCampaignPage/utils.ts b/packages/trpc/lib/routers/contentstack/promoCampaignPage/utils.ts
index bced5e46a..204522f7a 100644
--- a/packages/trpc/lib/routers/contentstack/promoCampaignPage/utils.ts
+++ b/packages/trpc/lib/routers/contentstack/promoCampaignPage/utils.ts
@@ -33,7 +33,7 @@ export function getConnections({ promo_campaign_page }: PromoCampaignPageRefs) {
         }
         case PromoCampaignPageEnum.ContentStack.blocks.Content:
           {
-            if (block.content.length) {
+            if (block?.content?.length) {
               connections.push(...block.content)
             }
           }
diff --git a/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts b/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts
index 73d84727a..298a15788 100644
--- a/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts
+++ b/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts
@@ -20,28 +20,30 @@ export const contentSchema = z.object({
     .default(BlocksEnums.block.Content),
   content: z
     .object({
-      content: z.object({
-        json: z.any(), // JSON
-        embedded_itemsConnection: z.object({
-          edges: z.array(
-            z.object({
-              node: z
-                .discriminatedUnion("__typename", [
-                  imageContainerSchema,
-                  sysAssetSchema,
-                  ...linkUnionSchema.options,
-                ])
-                .transform((data) => {
-                  const link = transformPageLink(data)
-                  if (link) {
-                    return link
-                  }
-                  return data
-                }),
-            })
-          ),
-        }),
-      }),
+      content: z
+        .object({
+          json: z.any(), // JSON
+          embedded_itemsConnection: z.object({
+            edges: z.array(
+              z.object({
+                node: z
+                  .discriminatedUnion("__typename", [
+                    imageContainerSchema,
+                    sysAssetSchema,
+                    ...linkUnionSchema.options,
+                  ])
+                  .transform((data) => {
+                    const link = transformPageLink(data)
+                    if (link) {
+                      return link
+                    }
+                    return data
+                  }),
+              })
+            ),
+          }),
+        })
+        .nullish(),
     })
     .nullish()
     .transform((data) => {
@@ -52,22 +54,25 @@ export const contentSchema = z.object({
 export const contentRefsSchema = z.object({
   content: z
     .object({
-      content: z.object({
-        embedded_itemsConnection: z.object({
-          edges: z.array(
-            z.object({
-              node: z.discriminatedUnion("__typename", [
-                sysAssetRefsSchema,
-                imageContainerRefsSchema,
-                ...linkRefsUnionSchema.options,
-              ]),
-            })
-          ),
-        }),
-      }),
+      content: z
+        .object({
+          embedded_itemsConnection: z.object({
+            edges: z.array(
+              z.object({
+                node: z.discriminatedUnion("__typename", [
+                  sysAssetRefsSchema,
+                  imageContainerRefsSchema,
+                  ...linkRefsUnionSchema.options,
+                ]),
+              })
+            ),
+          }),
+        })
+        .nullish(),
     })
+    .nullish()
     .transform((data) => {
-      return data.content.embedded_itemsConnection.edges
+      return data?.content?.embedded_itemsConnection.edges
         .filter(({ node }) => node.__typename !== ContentEnum.blocks.SysAsset)
         .map(({ node }) => {
           if ("system" in node) {