diff --git a/components/Sidebar/index.tsx b/components/Sidebar/index.tsx index 155af47ba..36774a205 100644 --- a/components/Sidebar/index.tsx +++ b/components/Sidebar/index.tsx @@ -30,15 +30,12 @@ export default function Sidebar({ blocks }: SidebarProps) { ) case SidebarEnums.blocks.ContentCard: - console.log("EEE", block.content_card) return ( ) diff --git a/server/routers/contentstack/contentPage/utils.ts b/server/routers/contentstack/contentPage/utils.ts index 30a947717..755d8d61b 100644 --- a/server/routers/contentstack/contentPage/utils.ts +++ b/server/routers/contentstack/contentPage/utils.ts @@ -171,17 +171,30 @@ export function getConnections({ content_page }: ContentPageRefs) { connections.push(...block.content) } break - + case ContentPageEnum.ContentStack.sidebar.ContentCard: + if (block.content_card?.length) { + connections.push(...block.content_card) + } + break case ContentPageEnum.ContentStack.sidebar.JoinLoyaltyContact: if (block.join_loyalty_contact?.button) { connections.push(block.join_loyalty_contact.button) } break + case ContentPageEnum.ContentStack.sidebar.ScriptedCard: + if (block.scripted_card?.length) { + connections.push(...block.scripted_card) + } + break + case ContentPageEnum.ContentStack.sidebar.QuickLinks: + if (block.shortcuts.shortcuts.length) { + connections.push(...block.shortcuts.shortcuts) + } + break default: break } }) } - return connections } diff --git a/server/routers/contentstack/schemas/sidebar/contentCard.ts b/server/routers/contentstack/schemas/sidebar/contentCard.ts index 4d415eece..d52a0c96f 100644 --- a/server/routers/contentstack/schemas/sidebar/contentCard.ts +++ b/server/routers/contentstack/schemas/sidebar/contentCard.ts @@ -3,6 +3,7 @@ import { z } from "zod" import { teaserCardBlockRefsSchema, teaserCardBlockSchema, + transformCardBlockRefs, transformTeaserCardBlock, } from "../blocks/cardsGrid" @@ -15,7 +16,7 @@ export const contentCardsSchema = z.object({ .default(SidebarEnums.blocks.ContentCard), content_card: z .object({ - theme: z.enum(["gray", "white"]).nullable().default("gray"), + theme: z.enum(["featured", "default"]).nullable().default("default"), content_cardConnection: z.object({ edges: z.array( z.object({ @@ -33,13 +34,21 @@ export const contentCardsSchema = z.object({ }) export const contentCardRefschema = z.object({ - content_card: z.object({ - content_cardConnection: z.object({ - edges: z.array( - z.object({ - node: teaserCardBlockRefsSchema, - }) - ), + content_card: z + .object({ + content_cardConnection: z.object({ + edges: z.array( + z.object({ + node: teaserCardBlockRefsSchema, + }) + ), + }), + }) + .transform((data) => { + let card = null + if (data.content_cardConnection.edges.length) { + card = transformCardBlockRefs(data.content_cardConnection.edges[0].node) + } + return card }), - }), }) diff --git a/server/routers/contentstack/schemas/sidebar/quickLinks.ts b/server/routers/contentstack/schemas/sidebar/quickLinks.ts index fe673b7a3..c8bc61b78 100644 --- a/server/routers/contentstack/schemas/sidebar/quickLinks.ts +++ b/server/routers/contentstack/schemas/sidebar/quickLinks.ts @@ -13,6 +13,4 @@ export const quickLinksSchema = z }) .merge(shortcutsSchema) -export const quickLinksSRefschema = z.object({ - shortcutsRefsSchema, -}) +export const quickLinksRefschema = shortcutsRefsSchema diff --git a/server/routers/contentstack/schemas/sidebar/scriptedCard.ts b/server/routers/contentstack/schemas/sidebar/scriptedCard.ts index 7878d1551..0579a4be4 100644 --- a/server/routers/contentstack/schemas/sidebar/scriptedCard.ts +++ b/server/routers/contentstack/schemas/sidebar/scriptedCard.ts @@ -4,6 +4,7 @@ import { cardBlockRefsSchema, cardBlockSchema, transformCardBlock, + transformCardBlockRefs, } from "../blocks/cardsGrid" import { SidebarEnums } from "@/types/enums/sidebar" @@ -43,13 +44,23 @@ export const scriptedCardsSchema = z.object({ }) export const scriptedCardRefschema = z.object({ - scripted_card: z.object({ - scripted_cardConnection: z.object({ - edges: z.array( - z.object({ - node: cardBlockRefsSchema, - }) - ), + scripted_card: z + .object({ + scripted_cardConnection: z.object({ + edges: z.array( + z.object({ + node: cardBlockRefsSchema, + }) + ), + }), + }) + .transform((data) => { + let card = null + if (data.scripted_cardConnection.edges.length) { + card = transformCardBlockRefs( + data.scripted_cardConnection.edges[0].node + ) + } + return card }), - }), })