Merge develop

server/routers/contentstack/contentPage/output.ts

@@ -19,7 +19,12 @@ import {
   shortcutsSchema,
 } from "../schemas/blocks/shortcuts"
 import { textColsRefsSchema, textColsSchema } from "../schemas/blocks/textCols"
+import { uspGridRefsSchema, uspGridSchema } from "../schemas/blocks/uspGrid"
 import { tempImageVaultAssetSchema } from "../schemas/imageVault"
+import {
+  linkAndTitleSchema,
+  linkConnectionRefs,
+} from "../schemas/linkConnection"
 import {
   contentRefsSchema as sidebarContentRefsSchema,
   contentSchema as sidebarContentSchema,
@@ -64,12 +69,19 @@ export const contentPageTextCols = z
   })
   .merge(textColsSchema)
 
+export const contentPageUspGrid = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.UspGrid),
+  })
+  .merge(uspGridSchema)
+
 export const blocksSchema = z.discriminatedUnion("__typename", [
   contentPageCards,
   contentPageContent,
   contentPageDynamicContent,
   contentPageShortcuts,
   contentPageTextCols,
+  contentPageUspGrid,
 ])
 
 export const contentPageSidebarContent = z
@@ -98,6 +110,22 @@ export const sidebarSchema = z.discriminatedUnion("__typename", [
   contentPageJoinLoyaltyContact,
 ])
 
+const navigationLinksSchema = z
+  .array(linkAndTitleSchema)
+  .nullable()
+  .transform((data) => {
+    if (!data) {
+      return null
+    }
+
+    return data
+      .filter((item) => !!item.link)
+      .map((item) => ({
+        url: item.link!.url,
+        title: item.title || item.link!.title,
+      }))
+  })
+
 // Content Page Schema and types
 export const contentPageSchema = z.object({
   content_page: z.object({
@@ -108,6 +136,7 @@ export const contentPageSchema = z.object({
     header: z.object({
       heading: z.string(),
       preamble: z.string(),
+      navigation_links: navigationLinksSchema,
     }),
     system: systemSchema.merge(
       z.object({
@@ -152,12 +181,19 @@ const contentPageTextColsRefs = z
   })
   .merge(textColsRefsSchema)
 
+const contentPageUspGridRefs = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.UspGrid),
+  })
+  .merge(uspGridRefsSchema)
+
 const contentPageBlockRefsItem = z.discriminatedUnion("__typename", [
   contentPageBlockContentRefs,
   contentPageShortcutsRefs,
   contentPageCardsRefs,
   contentPageDynamicContentRefs,
   contentPageTextColsRefs,
+  contentPageUspGridRefs,
 ])
 
 const contentPageSidebarContentRef = z
@@ -179,8 +215,13 @@ const contentPageSidebarRefsItem = z.discriminatedUnion("__typename", [
   contentPageSidebarJoinLoyaltyContactRef,
 ])
 
+const contentPageHeaderRefs = z.object({
+  navigation_links: z.array(linkConnectionRefs),
+})
+
 export const contentPageRefsSchema = z.object({
   content_page: z.object({
+    header: contentPageHeaderRefs,
     blocks: discriminatedUnionArray(
       contentPageBlockRefsItem.options
     ).nullable(),

server/routers/contentstack/contentPage/utils.ts

@@ -147,6 +147,12 @@ export function getConnections({ content_page }: ContentPageRefs) {
           }
           break
         }
+        case ContentPageEnum.ContentStack.blocks.UspGrid: {
+          if (block.usp_grid.length) {
+            connections.push(...block.usp_grid)
+          }
+          break
+        }
       }
     })
   }