From 1b63dc0b649bc40650c7327492a2222e42dd3690 Mon Sep 17 00:00:00 2001
From: Fredrik Thorsson <fredrik.thorsson@scandichotels.com>
Date: Mon, 2 Dec 2024 17:14:38 +0100
Subject: [PATCH] feat(SW-962): add preamble

---
 .../HotelPage/SidePeeks/Activities/index.tsx   | 18 ++++++++----------
 components/ContentType/HotelPage/index.tsx     | 10 ++++++----
 lib/graphql/Query/HotelPage/HotelPage.graphql  |  7 ++++++-
 .../schemas/blocks/activitiesCard.ts           |  9 ++++++++-
 .../hotelPage/sidepeek/activities.ts           |  4 +---
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/components/ContentType/HotelPage/SidePeeks/Activities/index.tsx b/components/ContentType/HotelPage/SidePeeks/Activities/index.tsx
index 16a7ae0cb..2495cd0ad 100644
--- a/components/ContentType/HotelPage/SidePeeks/Activities/index.tsx
+++ b/components/ContentType/HotelPage/SidePeeks/Activities/index.tsx
@@ -13,7 +13,7 @@ import { ActivitiesSidePeekProps } from "@/types/components/hotelPage/sidepeek/a
 
 export default async function ActivitiesSidePeek({
   preamble,
-  contentPage,
+  contentPageLink,
 }: ActivitiesSidePeekProps) {
   const lang = getLang()
   const intl = await getIntl()
@@ -23,15 +23,13 @@ export default async function ActivitiesSidePeek({
       title={intl.formatMessage({ id: "Activities" })}
     >
       <Preamble className={styles.preamble}>{preamble}</Preamble>
-      {contentPage?.href && (
-        <div className={styles.buttonContainer}>
-          <Button theme="base" intent="secondary" asChild>
-            <Link href={contentPage.href} color="burgundy" weight="bold">
-              {intl.formatMessage({ id: "Show activities calendar" })}
-            </Link>
-          </Button>
-        </div>
-      )}
+      <div className={styles.buttonContainer}>
+        <Button theme="base" intent="secondary" asChild>
+          <Link href={contentPageLink} color="burgundy" weight="bold">
+            {intl.formatMessage({ id: "Show activities calendar" })}
+          </Link>
+        </Button>
+      </div>
     </SidePeek>
   )
 }
diff --git a/components/ContentType/HotelPage/index.tsx b/components/ContentType/HotelPage/index.tsx
index 6e278f3b6..b6fc20e26 100644
--- a/components/ContentType/HotelPage/index.tsx
+++ b/components/ContentType/HotelPage/index.tsx
@@ -200,10 +200,12 @@ export default async function HotelPage({ hotelId }: HotelPageProps) {
           Restaurant & Bar
         </SidePeek>
         <WellnessAndExerciseSidePeek healthFacilities={healthFacilities} />
-        <ActivitiesSidePeek
-          preamble="This is content about activites"
-          contentPage={activitiesCard?.contentPage}
-        />
+        {activitiesCard && (
+          <ActivitiesSidePeek
+            preamble={activitiesCard.preamble}
+            contentPageLink={activitiesCard.contentPage.href}
+          />
+        )}
         <SidePeek
           contentKey={meetingsAndConferences[lang]}
           title={intl.formatMessage({ id: "Meetings & Conferences" })}
diff --git a/lib/graphql/Query/HotelPage/HotelPage.graphql b/lib/graphql/Query/HotelPage/HotelPage.graphql
index d44e24f31..456d93764 100644
--- a/lib/graphql/Query/HotelPage/HotelPage.graphql
+++ b/lib/graphql/Query/HotelPage/HotelPage.graphql
@@ -56,7 +56,12 @@ query GetHotelPage($locale: String!, $uid: String!) {
             edges {
               node {
                 __typename
-                ...ContentPageLink
+                ... on ContentPage {
+                  ...ContentPageLink
+                  header {
+                    preamble
+                  }
+                }
               }
             }
           }
diff --git a/server/routers/contentstack/schemas/blocks/activitiesCard.ts b/server/routers/contentstack/schemas/blocks/activitiesCard.ts
index 079414948..f02a37a0c 100644
--- a/server/routers/contentstack/schemas/blocks/activitiesCard.ts
+++ b/server/routers/contentstack/schemas/blocks/activitiesCard.ts
@@ -25,7 +25,11 @@ export const activitiesCardSchema = z.object({
         edges: z.array(
           z.object({
             node: z.discriminatedUnion("__typename", [
-              pageLinks.contentPageSchema,
+              pageLinks.contentPageSchema.extend({
+                header: z.object({
+                  preamble: z.string(),
+                }),
+              }),
             ]),
           })
         ),
@@ -33,9 +37,11 @@ export const activitiesCardSchema = z.object({
     })
     .transform((data) => {
       let contentPage = { href: "" }
+      let preamble = ""
       if (data.hotel_page_activities_content_pageConnection.edges.length) {
         const page =
           data.hotel_page_activities_content_pageConnection.edges[0].node
+        preamble = page.header.preamble
         if (page.web.original_url) {
           contentPage = {
             href: page.web.original_url,
@@ -54,6 +60,7 @@ export const activitiesCardSchema = z.object({
         heading: data.heading,
         openInNewTab: !!data.open_in_new_tab,
         scriptedTopTitle: data.scripted_title,
+        preamble,
       }
     }),
 })
diff --git a/types/components/hotelPage/sidepeek/activities.ts b/types/components/hotelPage/sidepeek/activities.ts
index 8b6d9581b..e61fac277 100644
--- a/types/components/hotelPage/sidepeek/activities.ts
+++ b/types/components/hotelPage/sidepeek/activities.ts
@@ -1,6 +1,4 @@
 export type ActivitiesSidePeekProps = {
   preamble: string
-  contentPage?: {
-    href: string
-  }
+  contentPageLink: string
 }