From ed2fe5b30e1a6a6c26c3b24d74d016ca6fb978fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Mon, 27 May 2024 10:33:46 +0200 Subject: [PATCH] refactor: change name on breadcrumbs unique id for loyalty page --- lib/graphql/Fragments/MyPages/Breadcrumbs.graphql | 2 +- lib/graphql/Fragments/Refs/Breadcrumbs.graphql | 2 +- server/routers/contentstack/breadcrumbs/output.ts | 4 ++-- server/routers/contentstack/breadcrumbs/query.ts | 4 ++-- server/routers/contentstack/breadcrumbs/utils.ts | 4 +--- types/components/current/preamble.ts | 2 +- types/requests/myPages/breadcrumbs.ts | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql b/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql index f8505cd77..54520029c 100644 --- a/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql +++ b/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql @@ -22,7 +22,7 @@ fragment AccountPageBreadcrumbs on AccountPage { fragment LoyaltyPageBreadcrumbs on LoyaltyPage { web { - breadcrumbss { + breadcrumbs { title parentsConnection { edges { diff --git a/lib/graphql/Fragments/Refs/Breadcrumbs.graphql b/lib/graphql/Fragments/Refs/Breadcrumbs.graphql index bd8372293..3ad453776 100644 --- a/lib/graphql/Fragments/Refs/Breadcrumbs.graphql +++ b/lib/graphql/Fragments/Refs/Breadcrumbs.graphql @@ -21,7 +21,7 @@ fragment AccountPageBreadcrumbsRefs on AccountPage { fragment LoyaltyPageBreadcrumbsRefs on LoyaltyPage { web { - breadcrumbss { + breadcrumbs { title parentsConnection { edges { diff --git a/server/routers/contentstack/breadcrumbs/output.ts b/server/routers/contentstack/breadcrumbs/output.ts index 7f573f732..24861a04f 100644 --- a/server/routers/contentstack/breadcrumbs/output.ts +++ b/server/routers/contentstack/breadcrumbs/output.ts @@ -73,7 +73,7 @@ export const validateBreadcrumbsRefsContenstackSchemaLoyalty = z.object({ items: z.array( z.object({ web: z.object({ - breadcrumbss: z.object({ + breadcrumbs: z.object({ parentsConnection: z.object({ edges: z.array( z.object({ @@ -102,7 +102,7 @@ export const validateBreadcrumbsContenstackSchemaLoyalty = z.object({ items: z.array( z.object({ web: z.object({ - breadcrumbss: z.object({ + breadcrumbs: z.object({ title: z.string(), parentsConnection: z.object({ edges: z.array( diff --git a/server/routers/contentstack/breadcrumbs/query.ts b/server/routers/contentstack/breadcrumbs/query.ts index e404d7028..cfc220c38 100644 --- a/server/routers/contentstack/breadcrumbs/query.ts +++ b/server/routers/contentstack/breadcrumbs/query.ts @@ -163,7 +163,7 @@ export const breadcrumbsQueryRouter = router({ } const parentBreadcrumbs = - validatedBreadcrumbsData.data.all_loyalty_page.items[0].web.breadcrumbss.parentsConnection.edges.map( + validatedBreadcrumbsData.data.all_loyalty_page.items[0].web.breadcrumbs.parentsConnection.edges.map( (breadcrumb) => { return { href: removeMultipleSlashes( @@ -178,7 +178,7 @@ export const breadcrumbsQueryRouter = router({ const pageBreadcrumb = validatedBreadcrumbsData.data.all_loyalty_page.items.map((breadcrumb) => { return { - title: breadcrumb.web.breadcrumbss.title, + title: breadcrumb.web.breadcrumbs.title, uid: breadcrumb.system.uid, } }) diff --git a/server/routers/contentstack/breadcrumbs/utils.ts b/server/routers/contentstack/breadcrumbs/utils.ts index 3981ff505..fe262bea7 100644 --- a/server/routers/contentstack/breadcrumbs/utils.ts +++ b/server/routers/contentstack/breadcrumbs/utils.ts @@ -22,9 +22,7 @@ export function getConnectionsLoyalty(refs: GetLoyaltyPageBreadcrumbsRefsData) { const connections: Edges[] = [] refs.all_loyalty_page.items.forEach((ref) => { console.log(ref) - console.log(ref.web.breadcrumbss) - console.log(ref.web.breadcrumbss.parentsConnection) - connections.push(ref.web.breadcrumbss.parentsConnection) + connections.push(ref.web.breadcrumbs.parentsConnection) }) console.log(connections) return connections diff --git a/types/components/current/preamble.ts b/types/components/current/preamble.ts index 5a24613dc..c2c59ebf4 100644 --- a/types/components/current/preamble.ts +++ b/types/components/current/preamble.ts @@ -1,5 +1,5 @@ -import type { BreadcrumbsProps } from "./breadcrumbs" import type { Preamble } from "@/types/requests/preamble" +import type { BreadcrumbsProps } from "./breadcrumbs" export type PreambleProps = { breadcrumbs: BreadcrumbsProps["breadcrumbs"] diff --git a/types/requests/myPages/breadcrumbs.ts b/types/requests/myPages/breadcrumbs.ts index 03c7ca4cd..a61b321fa 100644 --- a/types/requests/myPages/breadcrumbs.ts +++ b/types/requests/myPages/breadcrumbs.ts @@ -24,7 +24,7 @@ interface AccountPageBreadcrumbs { } interface LoyaltyPageBreadcrumbs { web: { - breadcrumbss: { + breadcrumbs: { title: string parentsConnection: Edges<{ breadcrumbs: { @@ -65,7 +65,7 @@ interface AccountPageBreadcrumbRefs extends System { interface LoyaltyPageBreadcrumbRefs extends System { web: { - breadcrumbss: { + breadcrumbs: { parentsConnection: Edges } }