From c52275c536405627d46c46ce04fda485a0d7e0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Wed, 29 May 2024 14:30:10 +0200 Subject: [PATCH] fix: prepare for removing the old breadcrumbs --- .../Fragments/LoyaltyPage/Breadcrumbs.graphql | 6 ++++-- .../Fragments/MyPages/Breadcrumbs.graphql | 6 ++++-- .../Refs/LoyaltyPage/Breadcrumbs.graphql | 6 ++++-- .../Fragments/Refs/MyPages/Breadcrumbs.graphql | 6 ++++-- .../routers/contentstack/breadcrumbs/output.ts | 18 ++++++++++-------- .../routers/contentstack/breadcrumbs/query.ts | 4 ++-- types/requests/currentBlockPage.ts | 4 ++-- types/requests/myPages/breadcrumbs.ts | 14 ++++++++------ 8 files changed, 38 insertions(+), 26 deletions(-) diff --git a/lib/graphql/Fragments/LoyaltyPage/Breadcrumbs.graphql b/lib/graphql/Fragments/LoyaltyPage/Breadcrumbs.graphql index d0a49cf73..ee622ba53 100644 --- a/lib/graphql/Fragments/LoyaltyPage/Breadcrumbs.graphql +++ b/lib/graphql/Fragments/LoyaltyPage/Breadcrumbs.graphql @@ -6,8 +6,10 @@ fragment LoyaltyPageBreadcrumbs on LoyaltyPage { edges { node { ... on AccountPage { - breadcrumbs { - title + web { + breadcrumbs { + title + } } system { locale diff --git a/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql b/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql index acc30cdbc..a2396bc18 100644 --- a/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql +++ b/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql @@ -6,8 +6,10 @@ fragment MyPagesBreadcrumbs on AccountPage { edges { node { ... on AccountPage { - breadcrumbs { - title + web { + breadcrumbs { + title + } } system { locale diff --git a/lib/graphql/Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql b/lib/graphql/Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql index eeb80896c..e4b56c0d4 100644 --- a/lib/graphql/Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql +++ b/lib/graphql/Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql @@ -8,8 +8,10 @@ fragment LoyaltyPageBreadcrumbsRefs on LoyaltyPage { edges { node { ... on AccountPage { - breadcrumbs { - title + web { + breadcrumbs { + title + } } system { ...System diff --git a/lib/graphql/Fragments/Refs/MyPages/Breadcrumbs.graphql b/lib/graphql/Fragments/Refs/MyPages/Breadcrumbs.graphql index 37e2c17ca..03fe9c485 100644 --- a/lib/graphql/Fragments/Refs/MyPages/Breadcrumbs.graphql +++ b/lib/graphql/Fragments/Refs/MyPages/Breadcrumbs.graphql @@ -8,8 +8,10 @@ fragment MyPagesBreadcrumbsRefs on AccountPage { edges { node { ... on AccountPage { - breadcrumbs { - title + web { + breadcrumbs { + title + } } system { ...System diff --git a/server/routers/contentstack/breadcrumbs/output.ts b/server/routers/contentstack/breadcrumbs/output.ts index d8cbf27bf..3f3f1245b 100644 --- a/server/routers/contentstack/breadcrumbs/output.ts +++ b/server/routers/contentstack/breadcrumbs/output.ts @@ -10,7 +10,7 @@ export const getBreadcrumbsSchema = z.array( }) ) -const breadCrumbsRefsItems = z.object({ +const breadcrumbsRefsItems = z.object({ items: z.array( z.object({ web: z.object({ @@ -38,14 +38,14 @@ const breadCrumbsRefsItems = z.object({ }) export const validateMyPagesBreadcrumbsRefsContentstackSchema = z.object({ - all_account_page: breadCrumbsRefsItems, + all_account_page: breadcrumbsRefsItems, }) export const validateLoyaltyPageBreadcrumbsRefsContentstackSchema = z.object({ - all_loyalty_page: breadCrumbsRefsItems, + all_loyalty_page: breadcrumbsRefsItems, }) -const breadCrumbsItems = z.object({ +const breadcrumbsItems = z.object({ items: z.array( z.object({ web: z.object({ @@ -55,8 +55,10 @@ const breadCrumbsItems = z.object({ edges: z.array( z.object({ node: z.object({ - breadcrumbs: z.object({ - title: z.string(), + web: z.object({ + breadcrumbs: z.object({ + title: z.string(), + }), }), system: z.object({ locale: z.nativeEnum(Lang), @@ -77,9 +79,9 @@ const breadCrumbsItems = z.object({ }) export const validateMyPagesBreadcrumbsContentstackSchema = z.object({ - all_account_page: breadCrumbsItems, + all_account_page: breadcrumbsItems, }) export const validateLoyaltyPageBreadcrumbsContentstackSchema = z.object({ - all_loyalty_page: breadCrumbsItems, + all_loyalty_page: breadcrumbsItems, }) diff --git a/server/routers/contentstack/breadcrumbs/query.ts b/server/routers/contentstack/breadcrumbs/query.ts index 08318a719..76853458a 100644 --- a/server/routers/contentstack/breadcrumbs/query.ts +++ b/server/routers/contentstack/breadcrumbs/query.ts @@ -90,7 +90,7 @@ async function getLoyaltyPageBreadcrumbs({ lang, pathname }: fetchBreadcrumbs) { href: removeMultipleSlashes( `/${breadcrumb.node.system.locale}/${breadcrumb.node.url}` ), - title: breadcrumb.node.breadcrumbs.title, + title: breadcrumb.node.web.breadcrumbs.title, uid: breadcrumb.node.system.uid, } } @@ -157,7 +157,7 @@ async function getMyPagesBreadcrumbs({ lang, pathname }: fetchBreadcrumbs) { href: removeMultipleSlashes( `/${breadcrumb.node.system.locale}/${breadcrumb.node.url}` ), - title: breadcrumb.node.breadcrumbs.title, + title: breadcrumb.node.web.breadcrumbs.title, uid: breadcrumb.node.system.uid, } } diff --git a/types/requests/currentBlockPage.ts b/types/requests/currentBlockPage.ts index cc4a7a1e7..9ca0c126a 100644 --- a/types/requests/currentBlockPage.ts +++ b/types/requests/currentBlockPage.ts @@ -2,11 +2,11 @@ import { BlocksTypenameEnum } from "./utils/typename" import type { Contact } from "./asides/contact" import type { PuffAside } from "./asides/puff" -import type { Hero } from "./hero" import type { List } from "./blocks/list" import type { PuffBlock } from "./blocks/puff" -import type { Preamble } from "./preamble" import type { Text } from "./blocks/text" +import type { Hero } from "./hero" +import type { Preamble } from "./preamble" import type { AllRequestResponseWithTotal } from "./utils/all" import type { AsideTypenameEnum, Typename } from "./utils/typename" diff --git a/types/requests/myPages/breadcrumbs.ts b/types/requests/myPages/breadcrumbs.ts index 24a94b758..2271cd864 100644 --- a/types/requests/myPages/breadcrumbs.ts +++ b/types/requests/myPages/breadcrumbs.ts @@ -9,12 +9,14 @@ interface MyPagesBreadcrumbs { breadcrumbs: { title: string parentsConnection: Edges<{ - breadcrumbs: { - title: string - } - system: { - locale: Lang - uid: string + web: { + breadcrumbs: { + title: string + } + system: { + locale: Lang + uid: string + } } url: string }>