Merged in feat/SW-1084-spa-page (pull request #1117)

Feat/SW-1084 Spa page option on Hotel page

* chore(SW-1084): add separate spa page from CS for hotel page

* fix(SW-1084): Cleanup


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson

server/routers/contentstack/contentPage/output.ts

@@ -209,12 +209,6 @@ export const contentPageSchema = z.object({
   }),
 })
 
-export const contentPageSchemaBlocks = z.object({
-  content_page: z.object({
-    blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
-  }),
-})
-
 /** REFS */
 const contentPageCardsRefs = z
   .object({

server/routers/contentstack/hotelPage/output.ts

@@ -9,9 +9,14 @@ import {
   activitiesCardSchema,
 } from "../schemas/blocks/activitiesCard"
 import { hotelFaqRefsSchema, hotelFaqSchema } from "../schemas/blocks/hotelFaq"
+import { spaPageRefSchema, spaPageSchema } from "../schemas/blocks/spaPage"
 import { systemSchema } from "../schemas/system"
 
 import { HotelPageEnum } from "@/types/enums/hotelPage"
+import type {
+  ActivitiesCard,
+  SpaPage,
+} from "@/types/trpc/routers/contentstack/hotelPage"
 
 const contentBlockActivities = z
   .object({
@@ -19,13 +24,38 @@ const contentBlockActivities = z
   })
   .merge(activitiesCardSchema)
 
+const contentBlockSpaPage = z
+  .object({
+    __typename: z.literal(HotelPageEnum.ContentStack.blocks.SpaPage),
+  })
+  .merge(spaPageSchema)
+
 export const contentBlock = z.discriminatedUnion("__typename", [
   contentBlockActivities,
+  contentBlockSpaPage,
 ])
 
 export const hotelPageSchema = z.object({
   hotel_page: z.object({
-    content: discriminatedUnionArray(contentBlock.options).nullable(),
+    content: discriminatedUnionArray(contentBlock.options)
+      .nullable()
+      .transform((data) => {
+        let spaPage: SpaPage | undefined
+        let activitiesCard: ActivitiesCard | undefined
+        data?.map((block) => {
+          switch (block.typename) {
+            case HotelPageEnum.ContentStack.blocks.ActivitiesCard:
+              activitiesCard = block
+              break
+            case HotelPageEnum.ContentStack.blocks.SpaPage:
+              spaPage = block
+              break
+            default:
+              break
+          }
+        })
+        return { spaPage, activitiesCard }
+      }),
     faq: hotelFaqSchema,
     hotel_page_id: z.string(),
     title: z.string(),
@@ -40,14 +70,21 @@ export const hotelPageSchema = z.object({
 })
 
 /** REFS */
-const hotelPageActiviesCardRefs = z
+const hotelPageActivitiesCardRefs = z
   .object({
     __typename: z.literal(HotelPageEnum.ContentStack.blocks.ActivitiesCard),
   })
   .merge(activitiesCardRefSchema)
 
+const hotelPageSpaPageRefs = z
+  .object({
+    __typename: z.literal(HotelPageEnum.ContentStack.blocks.SpaPage),
+  })
+  .merge(spaPageRefSchema)
+
 const hotelPageBlockRefsItem = z.discriminatedUnion("__typename", [
-  hotelPageActiviesCardRefs,
+  hotelPageActivitiesCardRefs,
+  hotelPageSpaPageRefs,
 ])
 
 export const hotelPageRefsSchema = z.object({

server/routers/contentstack/schemas/blocks/spaPage.ts

@@ -0,0 +1,68 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+import { removeMultipleSlashes } from "@/utils/url"
+
+import { HotelPageEnum } from "@/types/enums/hotelPage"
+
+export const spaPageSchema = z.object({
+  typename: z
+    .literal(HotelPageEnum.ContentStack.blocks.SpaPage)
+    .optional()
+    .default(HotelPageEnum.ContentStack.blocks.SpaPage),
+  spa_page: z
+    .object({
+      button_cta: z.string(),
+      pageConnection: z.object({
+        edges: z.array(
+          z.object({
+            node: z.object({
+              title: z.string(),
+              url: z.string(),
+              system: z.object({
+                content_type_uid: z.string(),
+                locale: z.string(),
+                uid: z.string(),
+              }),
+              web: z.object({ original_url: z.string() }),
+            }),
+          })
+        ),
+      }),
+    })
+    .transform((data) => {
+      let url = ""
+      if (data.pageConnection.edges.length) {
+        const page = data.pageConnection.edges[0].node
+        if (page.web.original_url) {
+          url = page.web.original_url
+        } else {
+          url = removeMultipleSlashes(`/${page.system.locale}/${page.url}`)
+        }
+      }
+      return {
+        buttonCTA: data.button_cta,
+        url: url,
+      }
+    }),
+})
+
+export const spaPageRefSchema = z.object({
+  spa_page: z
+    .object({
+      pageConnection: z.object({
+        edges: z.array(
+          z.object({
+            node: z.discriminatedUnion("__typename", [
+              pageLinks.contentPageRefSchema,
+              pageLinks.collectionPageRefSchema,
+            ]),
+          })
+        ),
+      }),
+    })
+    .transform((data) => {
+      return data.pageConnection.edges.flatMap(({ node }) => node.system) || []
+    }),
+})