diff --git a/lib/graphql/Fragments/Sidebar/ContentCard.graphql b/lib/graphql/Fragments/Sidebar/ContentCard.graphql index 08cf9db28..2aab57cad 100644 --- a/lib/graphql/Fragments/Sidebar/ContentCard.graphql +++ b/lib/graphql/Fragments/Sidebar/ContentCard.graphql @@ -29,6 +29,7 @@ fragment ContentCardSidebar_ContentPageRefs on ContentPageSidebarContentCard { content_cardConnection { edges { node { + __typename ...TeaserCardBlockRef } } diff --git a/lib/graphql/Fragments/Sidebar/QuickLinks.graphql b/lib/graphql/Fragments/Sidebar/QuickLinks.graphql index ff516e519..c471b0151 100644 --- a/lib/graphql/Fragments/Sidebar/QuickLinks.graphql +++ b/lib/graphql/Fragments/Sidebar/QuickLinks.graphql @@ -17,6 +17,7 @@ fragment QuickLinksSidebar_ContentPage on ContentPageSidebarShortcuts { fragment QuickLinksSidebar_ContentPageRefs on ContentPageSidebarShortcuts { shortcuts { + __typename ...ShortcutsRefs } } diff --git a/lib/graphql/Fragments/Sidebar/ScriptedCard.graphql b/lib/graphql/Fragments/Sidebar/ScriptedCard.graphql index 65781aaf7..8da37a196 100644 --- a/lib/graphql/Fragments/Sidebar/ScriptedCard.graphql +++ b/lib/graphql/Fragments/Sidebar/ScriptedCard.graphql @@ -24,11 +24,12 @@ fragment ScriptedCardSidebar_ContentPage on ContentPageSidebarScriptedCard { } } -fragment ScriptedCardSidebar_ContentPageRefs on ContentPageSidebarContentCard { +fragment ScriptedCardSidebar_ContentPageRefs on ContentPageSidebarScriptedCard { scripted_card { scripted_cardConnection { edges { node { + __typename ...CardBlockRef } } diff --git a/lib/graphql/Query/ContentPage/ContentPage.graphql b/lib/graphql/Query/ContentPage/ContentPage.graphql index 9552c53c4..e8ca9d5a4 100644 --- a/lib/graphql/Query/ContentPage/ContentPage.graphql +++ b/lib/graphql/Query/ContentPage/ContentPage.graphql @@ -96,7 +96,10 @@ query GetContentPageRefs($locale: String!, $uid: String!) { sidebar { __typename ...ContentSidebar_ContentPageRefs + ...ContentCardSidebar_ContentPageRefs ...JoinLoyaltyContactSidebar_ContentPageRefs + ...ScriptedCardSidebar_ContentPageRefs + ...QuickLinksSidebar_ContentPageRefs } system { ...System diff --git a/server/routers/contentstack/contentPage/output.ts b/server/routers/contentstack/contentPage/output.ts index 6b0baa553..44e786b28 100644 --- a/server/routers/contentstack/contentPage/output.ts +++ b/server/routers/contentstack/contentPage/output.ts @@ -34,14 +34,23 @@ import { contentRefsSchema as sidebarContentRefsSchema, contentSchema as sidebarContentSchema, } from "../schemas/sidebar/content" -import { contentCardsSchema } from "../schemas/sidebar/contentCard" +import { + contentCardRefschema, + contentCardsSchema, +} from "../schemas/sidebar/contentCard" import { dynamicContentSchema as sidebarDynamicContentSchema } from "../schemas/sidebar/dynamicContent" import { joinLoyaltyContactRefsSchema, joinLoyaltyContactSchema, } from "../schemas/sidebar/joinLoyaltyContact" -import { quickLinksSchema } from "../schemas/sidebar/quickLinks" -import { scriptedCardsSchema } from "../schemas/sidebar/scriptedCard" +import { + quickLinksRefschema, + quickLinksSchema, +} from "../schemas/sidebar/quickLinks" +import { + scriptedCardRefschema, + scriptedCardsSchema, +} from "../schemas/sidebar/scriptedCard" import { systemSchema } from "../schemas/system" import { ContentPageEnum } from "@/types/enums/contentPage" @@ -254,6 +263,12 @@ const contentPageSidebarContentRef = z }) .merge(sidebarContentRefsSchema) +const contentPageSidebarContentCardRef = z + .object({ + __typename: z.literal(ContentPageEnum.ContentStack.sidebar.ContentCard), + }) + .merge(contentCardRefschema) + const contentPageSidebarJoinLoyaltyContactRef = z .object({ __typename: z.literal( @@ -262,9 +277,24 @@ const contentPageSidebarJoinLoyaltyContactRef = z }) .merge(joinLoyaltyContactRefsSchema) +const contentPageSidebarScriptedCardRef = z + .object({ + __typename: z.literal(ContentPageEnum.ContentStack.sidebar.ScriptedCard), + }) + .merge(scriptedCardRefschema) + +const contentPageSidebarQuickLinksRef = z + .object({ + __typename: z.literal(ContentPageEnum.ContentStack.sidebar.QuickLinks), + }) + .merge(quickLinksRefschema) + const contentPageSidebarRefsItem = z.discriminatedUnion("__typename", [ contentPageSidebarContentRef, + contentPageSidebarContentCardRef, contentPageSidebarJoinLoyaltyContactRef, + contentPageSidebarScriptedCardRef, + contentPageSidebarQuickLinksRef, ]) const contentPageHeaderRefs = z.object({ diff --git a/server/routers/contentstack/schemas/sidebar/scriptedCard.ts b/server/routers/contentstack/schemas/sidebar/scriptedCard.ts index eddd2cd40..7878d1551 100644 --- a/server/routers/contentstack/schemas/sidebar/scriptedCard.ts +++ b/server/routers/contentstack/schemas/sidebar/scriptedCard.ts @@ -43,7 +43,7 @@ export const scriptedCardsSchema = z.object({ }) export const scriptedCardRefschema = z.object({ - cripted_card: z.object({ + scripted_card: z.object({ scripted_cardConnection: z.object({ edges: z.array( z.object({