chore: change account page breadcrumbs to same structure as loyalty page
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
fragment AccountPageBreadcrumbs on AccountPage {
|
fragment AccountPageBreadcrumbs on AccountPage {
|
||||||
|
web {
|
||||||
breadcrumbs {
|
breadcrumbs {
|
||||||
title
|
title
|
||||||
parentsConnection {
|
parentsConnection {
|
||||||
@@ -19,6 +20,7 @@ fragment AccountPageBreadcrumbs on AccountPage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fragment LoyaltyPageBreadcrumbs on LoyaltyPage {
|
fragment LoyaltyPageBreadcrumbs on LoyaltyPage {
|
||||||
web {
|
web {
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
#import "./System.graphql"
|
#import "./System.graphql"
|
||||||
|
|
||||||
fragment AccountPageBreadcrumbsRefs on AccountPage {
|
fragment AccountPageBreadcrumbsRefs on AccountPage {
|
||||||
|
web {
|
||||||
breadcrumbs {
|
breadcrumbs {
|
||||||
|
title
|
||||||
parentsConnection {
|
parentsConnection {
|
||||||
edges {
|
edges {
|
||||||
node {
|
node {
|
||||||
... on AccountPage {
|
... on AccountPage {
|
||||||
|
breadcrumbs {
|
||||||
|
title
|
||||||
|
}
|
||||||
system {
|
system {
|
||||||
...System
|
...System
|
||||||
}
|
}
|
||||||
@@ -14,6 +19,7 @@ fragment AccountPageBreadcrumbsRefs on AccountPage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
system {
|
system {
|
||||||
...System
|
...System
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ export const validateBreadcrumbsRefsConstenstackSchema = z.object({
|
|||||||
all_account_page: z.object({
|
all_account_page: z.object({
|
||||||
items: z.array(
|
items: z.array(
|
||||||
z.object({
|
z.object({
|
||||||
|
web: z.object({
|
||||||
breadcrumbs: z.object({
|
breadcrumbs: z.object({
|
||||||
parentsConnection: z.object({
|
parentsConnection: z.object({
|
||||||
edges: z.array(
|
edges: z.array(
|
||||||
@@ -20,6 +21,7 @@ export const validateBreadcrumbsRefsConstenstackSchema = z.object({
|
|||||||
),
|
),
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
|
}),
|
||||||
system: z.object({
|
system: z.object({
|
||||||
content_type_uid: z.string(),
|
content_type_uid: z.string(),
|
||||||
uid: z.string(),
|
uid: z.string(),
|
||||||
@@ -33,6 +35,7 @@ export const validateBreadcrumbsContenstackSchema = z.object({
|
|||||||
all_account_page: z.object({
|
all_account_page: z.object({
|
||||||
items: z.array(
|
items: z.array(
|
||||||
z.object({
|
z.object({
|
||||||
|
web: z.object({
|
||||||
breadcrumbs: z.object({
|
breadcrumbs: z.object({
|
||||||
title: z.string(),
|
title: z.string(),
|
||||||
parentsConnection: z.object({
|
parentsConnection: z.object({
|
||||||
@@ -52,6 +55,7 @@ export const validateBreadcrumbsContenstackSchema = z.object({
|
|||||||
),
|
),
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
|
}),
|
||||||
system: z.object({
|
system: z.object({
|
||||||
uid: z.string(),
|
uid: z.string(),
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -49,11 +49,11 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
console.log([generateRefsResponseTag(ctx.lang, ctx.pathname, affix)])
|
||||||
if (!refsResponse.data) {
|
if (!refsResponse.data) {
|
||||||
throw notFound(refsResponse)
|
throw notFound(refsResponse)
|
||||||
}
|
}
|
||||||
|
console.log(refsResponse)
|
||||||
const validatedRefsData =
|
const validatedRefsData =
|
||||||
validateBreadcrumbsRefsConstenstackSchema.safeParse(refsResponse.data)
|
validateBreadcrumbsRefsConstenstackSchema.safeParse(refsResponse.data)
|
||||||
if (!validatedRefsData.success) {
|
if (!validatedRefsData.success) {
|
||||||
@@ -82,7 +82,7 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const parentBreadcrumbs =
|
const parentBreadcrumbs =
|
||||||
validatedBreadcrumbsData.data.all_account_page.items[0].breadcrumbs.parentsConnection.edges.map(
|
validatedBreadcrumbsData.data.all_account_page.items[0].web.breadcrumbs.parentsConnection.edges.map(
|
||||||
(breadcrumb) => {
|
(breadcrumb) => {
|
||||||
return {
|
return {
|
||||||
href: removeMultipleSlashes(
|
href: removeMultipleSlashes(
|
||||||
@@ -97,11 +97,11 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
const pageBreadcrumb =
|
const pageBreadcrumb =
|
||||||
validatedBreadcrumbsData.data.all_account_page.items.map((breadcrumb) => {
|
validatedBreadcrumbsData.data.all_account_page.items.map((breadcrumb) => {
|
||||||
return {
|
return {
|
||||||
title: breadcrumb.breadcrumbs.title,
|
title: breadcrumb.web.breadcrumbs.title,
|
||||||
uid: breadcrumb.system.uid,
|
uid: breadcrumb.system.uid,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
console.log(pageBreadcrumb)
|
||||||
const breadcrumbs = [
|
const breadcrumbs = [
|
||||||
homeBreadcrumbs[ctx.lang],
|
homeBreadcrumbs[ctx.lang],
|
||||||
parentBreadcrumbs,
|
parentBreadcrumbs,
|
||||||
@@ -126,7 +126,7 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
console.log(ctx.pathname)
|
console.log(ctx.pathname)
|
||||||
console.log(refsResponse.data.all_loyalty_page)
|
console.log(refsResponse)
|
||||||
if (!refsResponse.data) {
|
if (!refsResponse.data) {
|
||||||
throw notFound(refsResponse)
|
throw notFound(refsResponse)
|
||||||
}
|
}
|
||||||
@@ -161,7 +161,7 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
if (!validatedBreadcrumbsData.success) {
|
if (!validatedBreadcrumbsData.success) {
|
||||||
throw internalServerError(validatedBreadcrumbsData.error)
|
throw internalServerError(validatedBreadcrumbsData.error)
|
||||||
}
|
}
|
||||||
|
console.log(validatedBreadcrumbsData)
|
||||||
const parentBreadcrumbs =
|
const parentBreadcrumbs =
|
||||||
validatedBreadcrumbsData.data.all_loyalty_page.items[0].web.breadcrumbs.parentsConnection.edges.map(
|
validatedBreadcrumbsData.data.all_loyalty_page.items[0].web.breadcrumbs.parentsConnection.edges.map(
|
||||||
(breadcrumb) => {
|
(breadcrumb) => {
|
||||||
@@ -182,18 +182,18 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
uid: breadcrumb.system.uid,
|
uid: breadcrumb.system.uid,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const breadcrumbs = [
|
const breadcrumbs = [
|
||||||
homeBreadcrumbs[ctx.lang],
|
homeBreadcrumbs[ctx.lang],
|
||||||
parentBreadcrumbs,
|
parentBreadcrumbs,
|
||||||
pageBreadcrumb,
|
pageBreadcrumb,
|
||||||
].flat()
|
].flat()
|
||||||
|
console.log(breadcrumbs)
|
||||||
|
|
||||||
const validatedBreadcrumbs = getBreadcrumbsSchema.safeParse(breadcrumbs)
|
const validatedBreadcrumbs = getBreadcrumbsSchema.safeParse(breadcrumbs)
|
||||||
if (!validatedBreadcrumbs.success) {
|
if (!validatedBreadcrumbs.success) {
|
||||||
throw internalServerError(validatedBreadcrumbs.error)
|
throw internalServerError(validatedBreadcrumbs.error)
|
||||||
}
|
}
|
||||||
|
console.log(validatedBreadcrumbs.data)
|
||||||
return validatedBreadcrumbs.data
|
return validatedBreadcrumbs.data
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -10,9 +10,9 @@ import type { NodeRefs } from "@/types/requests/utils/refs"
|
|||||||
export function getConnections(refs: GetAccountPageBreadcrumbsRefsData) {
|
export function getConnections(refs: GetAccountPageBreadcrumbsRefsData) {
|
||||||
const connections: Edges<NodeRefs>[] = []
|
const connections: Edges<NodeRefs>[] = []
|
||||||
refs.all_account_page.items.forEach((ref) => {
|
refs.all_account_page.items.forEach((ref) => {
|
||||||
console.log(ref)
|
console.log(ref.web.breadcrumbs)
|
||||||
console.log(ref.breadcrumbs.parentsConnection)
|
console.log(ref.web.breadcrumbs.parentsConnection)
|
||||||
connections.push(ref.breadcrumbs.parentsConnection)
|
connections.push(ref.web.breadcrumbs.parentsConnection)
|
||||||
})
|
})
|
||||||
|
|
||||||
return connections
|
return connections
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import type { AllRequestResponse } from "../utils/all"
|
|||||||
import type { Edges } from "../utils/edges"
|
import type { Edges } from "../utils/edges"
|
||||||
|
|
||||||
interface AccountPageBreadcrumbs {
|
interface AccountPageBreadcrumbs {
|
||||||
|
web: {
|
||||||
breadcrumbs: {
|
breadcrumbs: {
|
||||||
title: string
|
title: string
|
||||||
parentsConnection: Edges<{
|
parentsConnection: Edges<{
|
||||||
@@ -22,6 +23,7 @@ interface AccountPageBreadcrumbs {
|
|||||||
uid: string
|
uid: string
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
interface LoyaltyPageBreadcrumbs {
|
interface LoyaltyPageBreadcrumbs {
|
||||||
web: {
|
web: {
|
||||||
breadcrumbs: {
|
breadcrumbs: {
|
||||||
@@ -58,10 +60,12 @@ export interface GetLoyaltyPageBreadcrumbsData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface AccountPageBreadcrumbRefs extends System {
|
interface AccountPageBreadcrumbRefs extends System {
|
||||||
|
web: {
|
||||||
breadcrumbs: {
|
breadcrumbs: {
|
||||||
parentsConnection: Edges<System>
|
parentsConnection: Edges<System>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
interface LoyaltyPageBreadcrumbRefs extends System {
|
interface LoyaltyPageBreadcrumbRefs extends System {
|
||||||
web: {
|
web: {
|
||||||
|
|||||||
Reference in New Issue
Block a user