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/destinationCountryPage/output.ts

@@ -1,5 +1,12 @@
 import { z } from "zod"
 
+import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
+
+import {
+  accordionRefsSchema,
+  accordionSchema,
+} from "../schemas/blocks/accordion"
+import { contentRefsSchema, contentSchema } from "../schemas/blocks/content"
 import { tempImageVaultAssetSchema } from "../schemas/imageVault"
 import {
   linkRefsUnionSchema,
@@ -14,6 +21,28 @@ import {
   type TrackingSDKPageData,
 } from "@/types/components/tracking"
 import { Country } from "@/types/enums/country"
+import { DestinationCountryPageEnum } from "@/types/enums/destinationCountryPage"
+
+export const destinationCountryPageContent = z
+  .object({
+    __typename: z.literal(
+      DestinationCountryPageEnum.ContentStack.blocks.Content
+    ),
+  })
+  .merge(contentSchema)
+
+export const destinationCountryPageAccordion = z
+  .object({
+    __typename: z.literal(
+      DestinationCountryPageEnum.ContentStack.blocks.Accordion
+    ),
+  })
+  .merge(accordionSchema)
+
+export const blocksSchema = z.discriminatedUnion("__typename", [
+  destinationCountryPageAccordion,
+  destinationCountryPageContent,
+])
 
 export const destinationCountryPageSchema = z
   .object({
@@ -57,6 +86,7 @@ export const destinationCountryPageSchema = z
           }),
         }),
       }),
+      blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
       system: systemSchema.merge(
         z.object({
           created_at: z.string(),
@@ -91,6 +121,26 @@ export const destinationCountryPageSchema = z
   })
 
 /** REFS */
+const destinationCountryPageContentRefs = z
+  .object({
+    __typename: z.literal(
+      DestinationCountryPageEnum.ContentStack.blocks.Content
+    ),
+  })
+  .merge(contentRefsSchema)
+
+const destinationCountryPageAccordionRefs = z
+  .object({
+    __typename: z.literal(
+      DestinationCountryPageEnum.ContentStack.blocks.Accordion
+    ),
+  })
+  .merge(accordionRefsSchema)
+
+const blocksRefsSchema = z.discriminatedUnion("__typename", [
+  destinationCountryPageAccordionRefs,
+  destinationCountryPageContentRefs,
+])
 export const destinationCountryPageRefsSchema = z.object({
   destination_country_page: z.object({
     sidepeek_content: z.object({
@@ -104,6 +154,7 @@ export const destinationCountryPageRefsSchema = z.object({
         }),
       }),
     }),
+    blocks: discriminatedUnionArray(blocksRefsSchema.options).nullable(),
     system: systemSchema,
   }),
 })

server/routers/contentstack/destinationCountryPage/utils.ts

@@ -14,14 +14,15 @@ import {
 } from "./telemetry"
 
 import { ApiCountry, type Country } from "@/types/enums/country"
+import { DestinationCountryPageEnum } from "@/types/enums/destinationCountryPage"
 import type { RequestOptionsWithOutBody } from "@/types/fetch"
 import type { System } from "@/types/requests/system"
 import type { GetDestinationCityListDataResponse } from "@/types/trpc/routers/contentstack/destinationCityPage"
-import type { GetDestinationCountryPageRefsSchema } from "@/types/trpc/routers/contentstack/destinationCountryPage"
+import type { DestinationCountryPageRefs } from "@/types/trpc/routers/contentstack/destinationCountryPage"
 import type { Lang } from "@/constants/languages"
 
 export function generatePageTags(
-  validatedData: GetDestinationCountryPageRefsSchema,
+  validatedData: DestinationCountryPageRefs,
   lang: Lang
 ): string[] {
   const connections = getConnections(validatedData)
@@ -33,9 +34,29 @@ export function generatePageTags(
 
 export function getConnections({
   destination_country_page,
-}: GetDestinationCountryPageRefsSchema) {
+}: DestinationCountryPageRefs) {
   const connections: System["system"][] = [destination_country_page.system]
-
+  if (destination_country_page.blocks) {
+    destination_country_page.blocks.forEach((block) => {
+      switch (block.__typename) {
+        case DestinationCountryPageEnum.ContentStack.blocks.Accordion: {
+          if (block.accordion.length) {
+            connections.push(...block.accordion)
+          }
+          break
+        }
+        case DestinationCountryPageEnum.ContentStack.blocks.Content:
+          {
+            if (block.content.length) {
+              // TS has trouble infering the filtered types
+              // @ts-ignore
+              connections.push(...block.content)
+            }
+          }
+          break
+      }
+    })
+  }
   if (destination_country_page.sidepeek_content) {
     destination_country_page.sidepeek_content.content.embedded_itemsConnection.edges.forEach(
       ({ node }) => {