feat(SW-285): Ship support for ContentPageBlocksContent

server/routers/contentstack/contentPage/output.ts

@@ -4,6 +4,43 @@ import { Lang } from "@/constants/languages"
 
 import { imageVaultAssetSchema } from "../schemas/imageVault"
 
+import { ContentBlocksTypenameEnum } from "@/types/components/content/enums"
+import { ImageVaultAsset } from "@/types/components/imageVault"
+import { Embeds } from "@/types/requests/embeds"
+import { EdgesWithTotalCount } from "@/types/requests/utils/edges"
+import { RTEDocument } from "@/types/rte/node"
+
+// Block Schema and types
+const contentPageBlockTextContent = z.object({
+  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksContent),
+  content: z.object({
+    content: z.object({
+      embedded_itemsConnection: z.object({
+        edges: z.array(z.any()),
+        totalCount: z.number(),
+      }),
+      json: z.any(),
+    }),
+  }),
+})
+
+const contentPageBlockItem = z.discriminatedUnion("__typename", [
+  contentPageBlockTextContent,
+])
+
+type BlockContentRaw = z.infer<typeof contentPageBlockTextContent>
+export interface RteBlockContent extends BlockContentRaw {
+  content: {
+    content: {
+      json: RTEDocument
+      embedded_itemsConnection: EdgesWithTotalCount<Embeds>
+    }
+  }
+}
+
+export type Block = RteBlockContent
+
+// Content Page Schema and types
 export const validateContentPageSchema = z.object({
   content_page: z.object({
     title: z.string(),
@@ -12,6 +49,7 @@ export const validateContentPageSchema = z.object({
       preamble: z.string(),
     }),
     hero_image: imageVaultAssetSchema.nullable().optional(),
+    blocks: z.array(contentPageBlockItem).nullable(),
     system: z.object({
       uid: z.string(),
       locale: z.nativeEnum(Lang),
@@ -20,3 +58,11 @@ export const validateContentPageSchema = z.object({
     }),
   }),
 })
+
+export type ContentPageDataRaw = z.infer<typeof validateContentPageSchema>
+type ContentPageRaw = ContentPageDataRaw["content_page"]
+
+export type ContentPage = Omit<ContentPageRaw, "blocks" | "hero_image"> & {
+  heroImage?: ImageVaultAsset
+  blocks: Block[]
+}

server/routers/contentstack/contentPage/query.ts

@@ -7,17 +7,19 @@ import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 import { generateTag } from "@/utils/generateTag"
 import { makeImageVaultImage } from "@/utils/imageVault"
 
-import { validateContentPageSchema } from "./output"
+import { removeEmptyObjects } from "../../utils"
+import {
+  Block,
+  ContentPage,
+  ContentPageDataRaw,
+  validateContentPageSchema,
+} from "./output"
 
-import { ImageVaultAsset } from "@/types/components/imageVault"
+import { ContentBlocksTypenameEnum } from "@/types/components/content/enums"
 import {
   TrackingChannelEnum,
   TrackingSDKPageData,
 } from "@/types/components/tracking"
-import {
-  ContentPage,
-  ContentPageDataRaw,
-} from "@/types/trpc/routers/contentstack/contentPage"
 
 export const contentPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
@@ -32,15 +34,28 @@ export const contentPageQueryRouter = router({
       { cache: "force-cache", next: { tags: [generateTag(lang, uid)] } }
     )
 
-    const { content_page } = response.data
+    const { content_page } = removeEmptyObjects(response.data)
     if (!content_page) {
       throw notFound(response)
     }
 
+    const processedBlocks = content_page.blocks
+      ? content_page.blocks.map((block: any) => {
+          switch (block.__typename) {
+            case ContentBlocksTypenameEnum.ContentPageBlocksContent:
+              return block
+            default:
+              return block
+          }
+        })
+      : null
+
+    const heroImage = makeImageVaultImage(content_page.hero_image)
     const validatedContentPage = validateContentPageSchema.safeParse({
       content_page: {
         ...content_page,
-        hero_image: makeImageVaultImage(content_page.hero_image),
+        blocks: processedBlocks,
+        hero_image: heroImage,
       },
     })
 
@@ -52,14 +67,13 @@ export const contentPageQueryRouter = router({
       return null
     }
 
-    // Destructure hero_image and rename it to heroImage
-    const { hero_image: heroImage, ...restContentPage } =
+    const { hero_image, blocks, ...restContentPage } =
       validatedContentPage.data.content_page
 
-    // Construct the contentPage object with the correct structure
     const contentPage: ContentPage = {
       ...restContentPage,
-      heroImage: heroImage as ImageVaultAsset | undefined,
+      heroImage,
+      blocks: blocks as Block[],
     }
 
     const tracking: TrackingSDKPageData = {