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

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

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)
             }
           }

packages/trpc/lib/routers/contentstack/destinationCityPage/output.ts

@@ -144,7 +144,8 @@ export const destinationCityPageSchema = z.object({
     sidepeek_content: z
       .object({
         heading: z.string(),
-        content: z.object({
+        content: z
+          .object({
             json: z.any(),
             embedded_itemsConnection: z.object({
               edges: z.array(
@@ -159,7 +160,8 @@ export const destinationCityPageSchema = z.object({
                 })
               ),
             }),
-        }),
+          })
+          .nullish(),
       })
       .nullish(),
     blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
@@ -251,7 +253,8 @@ export const destinationCityPageRefsSchema = z.object({
     destination_settings: destinationCityPageDestinationSettingsSchema,
     sidepeek_content: z
       .object({
-        content: z.object({
+        content: z
+          .object({
             embedded_itemsConnection: z.object({
               edges: z.array(
                 z.object({
@@ -259,7 +262,8 @@ export const destinationCityPageRefsSchema = z.object({
                 })
               ),
             }),
-        }),
+          })
+          .nullish(),
       })
       .nullish(),
     blocks: discriminatedUnionArray(blocksRefsSchema.options).nullable(),

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)
       }

packages/trpc/lib/routers/contentstack/destinationCountryPage/output.ts

@@ -73,7 +73,8 @@ export const destinationCountryPageSchema = z.object({
     sidepeek_content: z
       .object({
         heading: z.string(),
-        content: z.object({
+        content: z
+          .object({
             json: z.any(),
             embedded_itemsConnection: z.object({
               edges: z.array(
@@ -88,7 +89,8 @@ export const destinationCountryPageSchema = z.object({
                 })
               ),
             }),
-        }),
+          })
+          .nullish(),
       })
       .nullish(),
     blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
@@ -153,8 +155,10 @@ const blocksRefsSchema = z.discriminatedUnion("__typename", [
 ])
 export const destinationCountryPageRefsSchema = z.object({
   destination_country_page: z.object({
-    sidepeek_content: z.object({
+    sidepeek_content: z
-      content: z.object({
+      .object({
+        content: z
+          .object({
             embedded_itemsConnection: z.object({
               edges: z.array(
                 z.object({
@@ -162,8 +166,10 @@ export const destinationCountryPageRefsSchema = z.object({
                 })
               ),
             }),
-      }),
+          })
-    }),
+          .nullish(),
+      })
+      .nullish(),
     blocks: discriminatedUnionArray(blocksRefsSchema.options).nullable(),
     seo_filters: destinationFiltersRefsSchema,
     system: systemSchema,

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)
       }

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)

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)
             }
           }

packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts

@@ -20,7 +20,8 @@ export const contentSchema = z.object({
     .default(BlocksEnums.block.Content),
   content: z
     .object({
-      content: z.object({
+      content: z
+        .object({
           json: z.any(), // JSON
           embedded_itemsConnection: z.object({
             edges: z.array(
@@ -41,7 +42,8 @@ export const contentSchema = z.object({
               })
             ),
           }),
-      }),
+        })
+        .nullish(),
     })
     .nullish()
     .transform((data) => {
@@ -52,7 +54,8 @@ export const contentSchema = z.object({
 export const contentRefsSchema = z.object({
   content: z
     .object({
-      content: z.object({
+      content: z
+        .object({
           embedded_itemsConnection: z.object({
             edges: z.array(
               z.object({
@@ -64,10 +67,12 @@ export const contentRefsSchema = z.object({
               })
             ),
           }),
-      }),
         })
+        .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) {