feat(SW-214): Setup connection to Contentstack

lib/graphql/Query/ContentPage/ContentPage.graphql

@@ -5,6 +5,7 @@
 #import "../../Fragments/Blocks/DynamicContent.graphql"
 #import "../../Fragments/Blocks/Shortcuts.graphql"
 #import "../../Fragments/Blocks/TextCols.graphql"
+#import "../../Fragments/Blocks/UspGrid.graphql"
 
 #import "../../Fragments/Sidebar/Content.graphql"
 #import "../../Fragments/Sidebar/DynamicContent.graphql"
@@ -25,6 +26,7 @@ query GetContentPage($locale: String!, $uid: String!) {
       ...DynamicContent_ContentPage
       ...Shortcuts_ContentPage
       ...TextCols_ContentPage
+      ...UspGrid_ContentPage
     }
     sidebar {
       __typename
@@ -49,6 +51,7 @@ query GetContentPageRefs($locale: String!, $uid: String!) {
       ...DynamicContent_ContentPageRefs
       ...Shortcuts_ContentPageRefs
       ...TextCols_ContentPageRef
+      ...UspGrid_ContentPageRefs
     }
     sidebar {
       __typename

server/routers/contentstack/contentPage/output.ts

@@ -18,6 +18,8 @@ import {
   shortcutsRefsSchema,
   shortcutsSchema,
 } from "../schemas/blocks/shortcuts"
+import { textColsRefsSchema, textColsSchema } from "../schemas/blocks/textCols"
+import { uspGridSchema } from "../schemas/blocks/uspGrid"
 import { tempImageVaultAssetSchema } from "../schemas/imageVault"
 import {
   contentRefsSchema as sidebarContentRefsSchema,
@@ -31,7 +33,6 @@ import {
 import { systemSchema } from "../schemas/system"
 
 import { ContentPageEnum } from "@/types/enums/contentPage"
-import { textColsRefsSchema, textColsSchema } from "../schemas/blocks/textCols"
 
 // Block schemas
 export const contentPageCards = z
@@ -58,9 +59,17 @@ export const contentPageShortcuts = z
   })
   .merge(shortcutsSchema)
 
-export const contentPageTextCols = z.object({
+export const contentPageTextCols = z
-  __typename: z.literal(ContentPageEnum.ContentStack.blocks.TextCols),
+  .object({
-}).merge(textColsSchema)
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.TextCols),
+  })
+  .merge(textColsSchema)
+
+export const contentPageUspGrid = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.UspGrid),
+  })
+  .merge(uspGridSchema)
 
 export const blocksSchema = z.discriminatedUnion("__typename", [
   contentPageCards,
@@ -68,6 +77,7 @@ export const blocksSchema = z.discriminatedUnion("__typename", [
   contentPageDynamicContent,
   contentPageShortcuts,
   contentPageTextCols,
+  contentPageUspGrid,
 ])
 
 export const contentPageSidebarContent = z

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

@@ -1,47 +1,48 @@
 import { z } from "zod"
 
 import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
 import { imageRefsSchema, imageSchema } from "./image"
 
 import { BlocksEnums } from "@/types/enums/blocks"
 import { ContentEnum } from "@/types/enums/content"
 
-export const textColsSchema = z
+export const textColsSchema = z.object({
-  .object({
+  typename: z
-    typename: z
+    .literal(BlocksEnums.block.TextCols)
-      .literal(BlocksEnums.block.TextCols)
+    .optional()
-      .optional()
+    .default(BlocksEnums.block.TextCols),
-      .default(BlocksEnums.block.TextCols),
+  text_cols: z.object({
-    text_cols: z.object({
+    columns: z.array(
-      columns: z.array(
+      z.object({
-        z.object({
+        title: z.string().optional().default(""),
-          title: z.string().optional().default(""),
+        text: z.object({
-          text: z.object({
+          json: z.any(), // JSON
-            json: z.any(), // JSON
+          embedded_itemsConnection: z.object({
-            embedded_itemsConnection: z.object({
+            edges: z.array(
-              edges: z.array(
+              z.object({
-                z.object({
+                node: z
-                  node: z.discriminatedUnion("__typename", [
+                  .discriminatedUnion("__typename", [
                     imageSchema,
                     pageLinks.contentPageSchema,
                     pageLinks.hotelPageSchema,
                     pageLinks.loyaltyPageSchema,
                   ])
-                    .transform((data) => {
+                  .transform((data) => {
-                      const link = pageLinks.transform(data)
+                    const link = pageLinks.transform(data)
-                      if (link) {
+                    if (link) {
-                        return link
+                      return link
-                      }
+                    }
-                      return data
+                    return data
-                    }),
+                  }),
-                })
+              })
-              ),
+            ),
-            }),
           }),
-        })
+        }),
-      ),
+      })
-    }),
+    ),
-  })
+  }),
+})
 
 const actualRefs = z.discriminatedUnion("__typename", [
   pageLinks.contentPageRefSchema,
@@ -53,9 +54,9 @@ type Refs = {
   node: z.TypeOf<typeof actualRefs>
 }
 
-export const textColsRefsSchema = z
+export const textColsRefsSchema = z.object({
-  .object({
+  text_cols: z
-    text_cols: z.object({
+    .object({
       columns: z.array(
         z.object({
           text: z.object({
@@ -65,20 +66,22 @@ export const textColsRefsSchema = z
                   node: z.discriminatedUnion("__typename", [
                     imageRefsSchema,
                     ...actualRefs.options,
-                  ])
+                  ]),
                 })
               ),
             }),
           }),
         })
       ),
-    }).transform(data => {
+    })
-      return data.columns.map(column => {
+    .transform((data) => {
-        const filtered = column.text.embedded_itemsConnection.edges
+      return data.columns
-          .filter(
+        .map((column) => {
-            block => block.node.__typename !== ContentEnum.blocks.SysAsset
+          const filtered = column.text.embedded_itemsConnection.edges.filter(
+            (block) => block.node.__typename !== ContentEnum.blocks.SysAsset
           ) as unknown as Refs[] // TS issue with filtered out types
-        return filtered.map(({ node }) => node.system)
+          return filtered.map(({ node }) => node.system)
-      }).flat()
+        })
+        .flat()
     }),
-  })
+})

types/enums/blocks.ts

@@ -6,5 +6,6 @@ export namespace BlocksEnums {
     Shortcuts = "Shortcuts",
     TextCols = "TextCols",
     TextContent = "TextContent",
+    UspGrid = "UspGrid",
   }
 }

types/enums/contentPage.ts

@@ -6,6 +6,7 @@ export namespace ContentPageEnum {
       DynamicContent = "ContentPageBlocksDynamicContent",
       Shortcuts = "ContentPageBlocksShortcuts",
       TextCols = "ContentPageBlocksTextCols",
+      UspGrid = "ContentPageBlocksUspGrid",
     }
 
     export const enum sidebar {