feat: add new cards grid block

server/routers/contentstack/loyaltyPage/output.ts

@@ -13,37 +13,22 @@ import { PageLinkEnum } from "@/types/requests/pageLinks"
 import { EdgesWithTotalCount } from "@/types/requests/utils/edges"
 import { RTEDocument } from "@/types/rte/node"
 
-const loyaltyPageBlockCardGrid = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardGrid),
-  card_grid: z.object({
-    title: z.string().nullable(),
-    subtitle: z.string().nullable(),
-    cards: z.array(
-      z.object({
-        title: z.string().nullable(),
-        subtitle: z.string().nullable(),
-        referenceConnection: z.object({
-          edges: z.array(
-            z.object({
-              node: z.object({
-                system: z.object({
-                  uid: z.string(),
-                  locale: z.nativeEnum(Lang),
-                }),
-                url: z.string(),
-                title: z.string(),
-                __typename: z.string(),
-              }),
-            })
-          ),
-          totalCount: z.number(),
+const pageLink = z.object({
+  edges: z.array(
+    z.object({
+      node: z.object({
+        system: z.object({
+          uid: z.string(),
+          locale: z.nativeEnum(Lang),
         }),
-        open_in_new_tab: z.boolean(),
-        cta_text: z.string().nullable(),
-      })
-    ),
-  }),
+        url: z.string(),
+        title: z.string(),
+        __typename: z.string(),
+      }),
+    })
+  ),
 })
+
 const loyaltyPageDynamicContent = z.object({
   __typename: z.literal(
     LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent
@@ -93,7 +78,8 @@ const loyaltyPageShortcuts = z.object({
                   .object({
                     original_url: z.string().nullable(),
                   })
-                  .nullable(),
+                  .nullable()
+                  .optional(),
                 title: z.string(),
               }),
             })
@@ -107,6 +93,59 @@ const loyaltyPageShortcuts = z.object({
   }),
 })
 
+const cardBlock = z.object({
+  heading: z.string().nullable(),
+  body_text: z.string().nullable(),
+  background_image: z.any(),
+  scripted_top_title: z.string().nullable(),
+  primary_button: z
+    .object({
+      is_contentstack_link: z.boolean(),
+      cta_text: z.string().nullable(),
+      open_in_new_tab: z.boolean(),
+      external_link: z.object({
+        title: z.string().nullable(),
+        href: z.string().nullable(),
+      }),
+      linkConnection: pageLink,
+    })
+    .nullable(),
+  secondary_button: z
+    .object({
+      is_contentstack_link: z.boolean(),
+      cta_text: z.string().nullable(),
+      open_in_new_tab: z.boolean().nullable(),
+      external_link: z.object({
+        title: z.string().nullable(),
+        href: z.string().nullable(),
+      }),
+      linkConnection: pageLink,
+    })
+    .nullable(),
+
+  system: z.object({
+    locale: z.nativeEnum(Lang),
+    uid: z.string(),
+  }),
+})
+
+const loyaltyPageCards = z.object({
+  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid),
+  cards_grid: z.object({
+    title: z.string().nullable(),
+    preamble: z.string().nullable(),
+    layout: z.enum(["twoColumnGrid", "threeColumnGrid", "twoPlusOne"]),
+    theme: z.enum(["one", "two", "three"]).nullable(),
+    cardConnection: z.object({
+      edges: z.array(
+        z.object({
+          node: cardBlock,
+        })
+      ),
+    }),
+  }),
+})
+
 const loyaltyPageBlockTextContent = z.object({
   __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksContent),
   content: z.object({
@@ -121,10 +160,10 @@ const loyaltyPageBlockTextContent = z.object({
 })
 
 const loyaltyPageBlockItem = z.discriminatedUnion("__typename", [
-  loyaltyPageBlockCardGrid,
   loyaltyPageDynamicContent,
   loyaltyPageBlockTextContent,
   loyaltyPageShortcuts,
+  loyaltyPageCards,
 ])
 
 const loyaltyPageSidebarTextContent = z.object({
@@ -178,26 +217,6 @@ export const validateLoyaltyPageSchema = z.object({
 })
 
 // Block types
-type CardGridRaw = z.infer<typeof loyaltyPageBlockCardGrid>
-
-export type CardGridCard = Omit<
-  CardGridRaw["card_grid"]["cards"][number],
-  "referenceConnection"
-> & {
-  link:
-    | {
-        href: string
-        title: string
-      }
-    | undefined
-}
-
-export type CardGrid = Omit<CardGridRaw, "card_grid"> & {
-  card_grid: Omit<CardGridRaw["card_grid"], "cards"> & {
-    cards: CardGridCard[]
-  }
-}
-
 type DynamicContentRaw = z.infer<typeof loyaltyPageDynamicContent>
 
 export type DynamicContent = Omit<DynamicContentRaw, "dynamic_content"> & {
@@ -222,6 +241,43 @@ export interface RteBlockContent extends BlockContentRaw {
   }
 }
 
+type CardsGridRaw = z.infer<typeof loyaltyPageCards>
+
+export type CardsGrid = Omit<CardsGridRaw, "cards_grid"> & {
+  cards_grid: Omit<CardsGridRaw["cards_grid"], "cardConnection"> & {
+    cards: {
+      system: {
+        locale: Lang
+        uid: string
+      }
+      heading: string | null
+      body_text: string | null
+      scripted_top_title: string | null
+      primaryButton:
+        | {
+            open_in_new_tab: boolean
+            link: {
+              title: string
+              href: string
+            }
+            isExternal: boolean
+          }
+        | undefined
+      secondaryButton:
+        | {
+            open_in_new_tab: boolean
+            link: {
+              title: string
+              href: string
+            }
+            isExternal: boolean
+          }
+        | undefined
+      background_image?: any
+    }[]
+  }
+}
+
 type ShortcutsRaw = z.infer<typeof loyaltyPageShortcuts>
 
 export type Shortcuts = Omit<ShortcutsRaw, "shortcuts"> & {
@@ -235,7 +291,7 @@ export type Shortcuts = Omit<ShortcutsRaw, "shortcuts"> & {
   }
 }
 
-export type Block = CardGrid | RteBlockContent | DynamicContent | Shortcuts
+export type Block = RteBlockContent | DynamicContent | Shortcuts | CardsGrid
 
 // Sidebar block types
 type SidebarContentRaw = z.infer<typeof loyaltyPageSidebarTextContent>
@@ -275,14 +331,34 @@ const pageConnectionRefs = z.object({
   ),
 })
 
-const loyaltyPageBlockCardGridRefs = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardGrid),
-  card_grid: z.object({
-    cards: z.array(
-      z.object({
-        referenceConnection: pageConnectionRefs,
-      })
-    ),
+const cardBlockRefs = z.object({
+  primary_button: z
+    .object({
+      linkConnection: pageConnectionRefs,
+    })
+    .nullable(),
+  secondary_button: z
+    .object({
+      linkConnection: pageConnectionRefs,
+    })
+    .nullable(),
+
+  system: z.object({
+    content_type_uid: z.string(),
+    uid: z.string(),
+  }),
+})
+
+const loyaltyPageCardsRefs = z.object({
+  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid),
+  cards_grid: z.object({
+    cardConnection: z.object({
+      edges: z.array(
+        z.object({
+          node: cardBlockRefs,
+        })
+      ),
+    }),
   }),
 })
 
@@ -318,10 +394,10 @@ const loyaltyPageBlockTextContentRefs = z.object({
 })
 
 const loyaltyPageBlocRefsItem = z.discriminatedUnion("__typename", [
-  loyaltyPageBlockCardGridRefs,
   loyaltyPageDynamicContentRefs,
   loyaltyPageBlockTextContentRefs,
   loyaltyPageShortcutsRefs,
+  loyaltyPageCardsRefs,
 ])
 
 const loyaltyPageSidebarTextContentRef = z.object({