Merged in SW-1382-start-page-offers-section (pull request #1221)

SW-1382 start page offers section

* feat(SW-1382): Add InfoCard component to CardsGrid and StartPage

* feat(SW-1382): Add dynamic image positioning for InfoCard in CardsGrid

* refactor(SW-1382): Update InfoCard data transformation and prop naming

* fix(SW-1382): Add flex display to InfoCard image container


Approved-by: Christian Andolf
Approved-by: Erik Tiekstra

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

@@ -157,6 +157,34 @@ const loyaltyCardBlockSchema = z.object({
   title: z.string().optional(),
 })
 
+export const infoCardBlockSchema = z.object({
+  __typename: z.literal(CardsGridEnum.cards.InfoCard),
+  scripted_top_title: z.string().optional(),
+  heading: z.string().optional().default(""),
+  body_text: z.string().optional().default(""),
+  image: tempImageVaultAssetSchema,
+  title: z.string().optional(),
+  primary_button: buttonSchema.optional().nullable(),
+  secondary_button: buttonSchema.optional().nullable(),
+  system: systemSchema,
+})
+
+export function transformInfoCardBlock(card: typeof infoCardBlockSchema._type) {
+  return {
+    __typename: card.__typename,
+    scriptedTopTitle: card.scripted_top_title,
+    heading: card.heading,
+    bodyText: card.body_text,
+    image: card.image,
+    title: card.title,
+    primaryButton: card.primary_button?.href ? card.primary_button : undefined,
+    secondaryButton: card.secondary_button?.href
+      ? card.secondary_button
+      : undefined,
+    system: card.system,
+  }
+}
+
 export const cardsGridSchema = z.object({
   typename: z
     .literal(BlocksEnums.block.CardsGrid)
@@ -171,6 +199,7 @@ export const cardsGridSchema = z.object({
               cardBlockSchema,
               loyaltyCardBlockSchema,
               teaserCardBlockSchema,
+              infoCardBlockSchema,
             ]),
           })
         ),
@@ -191,6 +220,8 @@ export const cardsGridSchema = z.object({
             return transformCardBlock(card.node)
           } else if (card.node.__typename === CardsGridEnum.cards.TeaserCard) {
             return transformTeaserCardBlock(card.node)
+          } else if (card.node.__typename === CardsGridEnum.cards.InfoCard) {
+            return transformInfoCardBlock(card.node)
           } else {
             return {
               __typename: card.node.__typename,
@@ -218,6 +249,7 @@ export function transformCardBlockRefs(
   card:
     | typeof cardBlockRefsSchema._type
     | typeof teaserCardBlockRefsSchema._type
+    | typeof infoCardBlockRefsSchema._type
 ) {
   const cards = [card.system]
   if (card.primary_button) {
@@ -242,6 +274,13 @@ export const teaserCardBlockRefsSchema = z.object({
   system: systemSchema,
 })
 
+export const infoCardBlockRefsSchema = z.object({
+  __typename: z.literal(CardsGridEnum.cards.InfoCard),
+  primary_button: linkConnectionRefsSchema,
+  secondary_button: linkConnectionRefsSchema,
+  system: systemSchema,
+})
+
 export const cardGridRefsSchema = z.object({
   cards_grid: z
     .object({
@@ -252,6 +291,7 @@ export const cardGridRefsSchema = z.object({
               cardBlockRefsSchema,
               loyaltyCardBlockRefsSchema,
               teaserCardBlockRefsSchema,
+              infoCardBlockRefsSchema,
             ]),
           })
         ),
@@ -262,7 +302,8 @@ export const cardGridRefsSchema = z.object({
         .map(({ node }) => {
           if (
             node.__typename === CardsGridEnum.cards.Card ||
-            node.__typename === CardsGridEnum.cards.TeaserCard
+            node.__typename === CardsGridEnum.cards.TeaserCard ||
+            node.__typename === CardsGridEnum.cards.InfoCard
           ) {
             return transformCardBlockRefs(node)
           } else {

server/routers/contentstack/schemas/imageVault.ts

@@ -136,6 +136,7 @@ export const imageVaultAssetTransformedSchema = imageVaultAssetSchema.transform(
 )
 
 export const tempImageVaultAssetSchema = imageVaultAssetSchema
+  .nullable()
   .optional()
   .or(
     // Temp since there is a bug in Contentstack

server/routers/contentstack/startPage/output.ts

@@ -1,10 +1,27 @@
 import { z } from "zod"
 
+import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
+
+import {
+  cardGridRefsSchema,
+  cardsGridSchema,
+} from "../schemas/blocks/cardsGrid"
 import { tempImageVaultAssetSchema } from "../schemas/imageVault"
 import { systemSchema } from "../schemas/system"
 
+import { StartPageEnum } from "@/types/enums/startPage"
+
+export const startPageCards = z
+  .object({
+    __typename: z.literal(StartPageEnum.ContentStack.blocks.CardsGrid),
+  })
+  .merge(cardsGridSchema)
+
+export const blocksSchema = z.discriminatedUnion("__typename", [startPageCards])
+
 export const startPageSchema = z.object({
   start_page: z.object({
+    blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
     title: z.string(),
     header: z.object({
       heading: z.string(),
@@ -23,8 +40,19 @@ export const startPageSchema = z.object({
 })
 
 /** REFS */
+const startPageCardsRefs = z
+  .object({
+    __typename: z.literal(StartPageEnum.ContentStack.blocks.CardsGrid),
+  })
+  .merge(cardGridRefsSchema)
+
+const startPageBlockRefsItem = z.discriminatedUnion("__typename", [
+  startPageCardsRefs,
+])
+
 export const startPageRefsSchema = z.object({
   start_page: z.object({
+    blocks: discriminatedUnionArray(startPageBlockRefsItem.options).nullable(),
     system: systemSchema,
   }),
 })