Merged in feat/SW-1584-destination-content-blocks (pull request #1278)

Feat/SW-1584 destination content blocks

* feat(SW-1584): Added accordion and content blocks to destination city pages

* feat(SW-1584): Added accordion and content blocks to destination country pages


Approved-by: Matilda Landström

server/routers/contentstack/destinationCityPage/output.ts

@@ -1,7 +1,14 @@
 import { z } from "zod"
 
+import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
+
 import { removeMultipleSlashes } from "@/utils/url"
 
+import {
+  accordionRefsSchema,
+  accordionSchema,
+} from "../schemas/blocks/accordion"
+import { contentRefsSchema, contentSchema } from "../schemas/blocks/content"
 import { tempImageVaultAssetSchema } from "../schemas/imageVault"
 import {
   linkRefsUnionSchema,
@@ -15,6 +22,7 @@ import {
   TrackingChannelEnum,
   type TrackingSDKPageData,
 } from "@/types/components/tracking"
+import { DestinationCityPageEnum } from "@/types/enums/destinationCityPage"
 
 export const destinationCityListDataSchema = z
   .object({
@@ -54,6 +62,25 @@ export const destinationCityListDataSchema = z
     ({ all_destination_city_page }) => all_destination_city_page.items?.[0]
   )
 
+export const destinationCityPageContent = z
+  .object({
+    __typename: z.literal(DestinationCityPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(contentSchema)
+
+export const destinationCityPageAccordion = z
+  .object({
+    __typename: z.literal(
+      DestinationCityPageEnum.ContentStack.blocks.Accordion
+    ),
+  })
+  .merge(accordionSchema)
+
+export const blocksSchema = z.discriminatedUnion("__typename", [
+  destinationCityPageAccordion,
+  destinationCityPageContent,
+])
+
 export const destinationCityPageSchema = z
   .object({
     destination_city_page: z.object({
@@ -123,6 +150,7 @@ export const destinationCityPageSchema = z
           }),
         }),
       }),
+      blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
       system: systemSchema.merge(
         z.object({
           created_at: z.string(),
@@ -158,6 +186,25 @@ export const destinationCityPageSchema = z
   })
 
 /** REFS */
+const destinationCityPageContentRefs = z
+  .object({
+    __typename: z.literal(DestinationCityPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(contentRefsSchema)
+
+const destinationCityPageAccordionRefs = z
+  .object({
+    __typename: z.literal(
+      DestinationCityPageEnum.ContentStack.blocks.Accordion
+    ),
+  })
+  .merge(accordionRefsSchema)
+
+const blocksRefsSchema = z.discriminatedUnion("__typename", [
+  destinationCityPageAccordionRefs,
+  destinationCityPageContentRefs,
+])
+
 export const destinationCityPageRefsSchema = z.object({
   destination_city_page: z.object({
     sidepeek_content: z.object({
@@ -171,6 +218,7 @@ export const destinationCityPageRefsSchema = z.object({
         }),
       }),
     }),
+    blocks: discriminatedUnionArray(blocksRefsSchema.options).nullable(),
     system: systemSchema,
   }),
 })

server/routers/contentstack/destinationCityPage/utils.ts

@@ -4,13 +4,14 @@ import { getHotel } from "../../hotels/query"
 import { getHotelIdsByCityIdentifier } from "../../hotels/utils"
 import { getHotelPageUrl } from "../hotelPage/utils"
 
+import { DestinationCityPageEnum } from "@/types/enums/destinationCityPage"
 import type { HotelData } from "@/types/hotel"
 import type { System } from "@/types/requests/system"
-import type { GetDestinationCityPageRefsSchema } from "@/types/trpc/routers/contentstack/destinationCityPage"
+import type { DestinationCityPageRefs } from "@/types/trpc/routers/contentstack/destinationCityPage"
 import type { Lang } from "@/constants/languages"
 
 export function generatePageTags(
-  validatedData: GetDestinationCityPageRefsSchema,
+  validatedData: DestinationCityPageRefs,
   lang: Lang
 ): string[] {
   const connections = getConnections(validatedData)
@@ -22,8 +23,29 @@ export function generatePageTags(
 
 export function getConnections({
   destination_city_page,
-}: GetDestinationCityPageRefsSchema) {
+}: DestinationCityPageRefs) {
   const connections: System["system"][] = [destination_city_page.system]
+  if (destination_city_page.blocks) {
+    destination_city_page.blocks.forEach((block) => {
+      switch (block.__typename) {
+        case DestinationCityPageEnum.ContentStack.blocks.Accordion: {
+          if (block.accordion.length) {
+            connections.push(...block.accordion)
+          }
+          break
+        }
+        case DestinationCityPageEnum.ContentStack.blocks.Content:
+          {
+            if (block.content.length) {
+              // TS has trouble infering the filtered types
+              // @ts-ignore
+              connections.push(...block.content)
+            }
+          }
+          break
+      }
+    })
+  }
   if (destination_city_page.sidepeek_content) {
     destination_city_page.sidepeek_content.content.embedded_itemsConnection.edges.forEach(
       ({ node }) => {