From 7bdcfc7681fdeeeefbbeea266c78f7b17dcad05f Mon Sep 17 00:00:00 2001
From: Linus Flood <linus.flood@scandichotels.com>
Date: Fri, 26 Sep 2025 10:51:19 +0000
Subject: [PATCH] Merged in feat/book-396-validationerror (pull request #2871)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(BOOK-396): city page validation error

* feat(BOOK-396): city page validation error

* feat(BOOK-396): city page validation error


Approved-by: Erik Tiekstra
Approved-by: Joakim Jäderberg
---
 apps/scandic-web/components/Blocks/index.tsx                   | 1 +
 .../components/ContentType/DestinationPage/Blocks/index.tsx    | 1 +
 apps/scandic-web/components/Webviews/LoyaltyPage/Blocks.tsx    | 1 +
 .../trpc/lib/routers/contentstack/schemas/blocks/content.ts    | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/scandic-web/components/Blocks/index.tsx b/apps/scandic-web/components/Blocks/index.tsx
index 24adb047b..4c53b1dfd 100644
--- a/apps/scandic-web/components/Blocks/index.tsx
+++ b/apps/scandic-web/components/Blocks/index.tsx
@@ -39,6 +39,7 @@ export default function Blocks({ blocks }: BlocksProps) {
           />
         )
       case BlocksEnums.block.Content:
+        if (!block.content) return null
         return (
           <JsonToHtml
             key={`${block.typename}-${idx}`}
diff --git a/apps/scandic-web/components/ContentType/DestinationPage/Blocks/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/Blocks/index.tsx
index 0e2715b3c..2cccd26a2 100644
--- a/apps/scandic-web/components/ContentType/DestinationPage/Blocks/index.tsx
+++ b/apps/scandic-web/components/ContentType/DestinationPage/Blocks/index.tsx
@@ -31,6 +31,7 @@ export default function Blocks({ blocks }: BlocksProps) {
           />
         )
       case BlocksEnums.block.Content:
+        if (!block.content) return null
         return (
           <JsonToHtml
             key={`${block.typename}-${idx}`}
diff --git a/apps/scandic-web/components/Webviews/LoyaltyPage/Blocks.tsx b/apps/scandic-web/components/Webviews/LoyaltyPage/Blocks.tsx
index 224bc3558..be87edb7d 100644
--- a/apps/scandic-web/components/Webviews/LoyaltyPage/Blocks.tsx
+++ b/apps/scandic-web/components/Webviews/LoyaltyPage/Blocks.tsx
@@ -23,6 +23,7 @@ export default async function Blocks({ blocks }: BlocksProps) {
             />
           )
         case BlocksEnums.block.Content:
+          if (!block.content) return null
           return (
             <JsonToHtml
               key={`${block.__typename}-${idx}`}
diff --git a/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts b/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts
index 8ec245e7c..73d84727a 100644
--- a/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts
+++ b/packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts
@@ -43,8 +43,9 @@ export const contentSchema = z.object({
         }),
       }),
     })
+    .nullish()
     .transform((data) => {
-      return data.content
+      return data?.content
     }),
 })