refactor: cleanup
This commit is contained in:
@@ -29,7 +29,7 @@ export const validateBreadcrumbsRefsConstenstackSchema = z.object({
|
|||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
export const validateBreadcrumbsConstenstackSchema = z.object({
|
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({
|
||||||
@@ -68,7 +68,7 @@ export const getBreadcrumbsSchema = z.array(
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
export const validateBreadcrumbsRefsConstenstackSchemaLoyalty = z.object({
|
export const validateBreadcrumbsRefsContenstackSchemaLoyalty = z.object({
|
||||||
all_loyalty_page: z.object({
|
all_loyalty_page: z.object({
|
||||||
items: z.array(
|
items: z.array(
|
||||||
z.object({
|
z.object({
|
||||||
@@ -97,7 +97,7 @@ export const validateBreadcrumbsRefsConstenstackSchemaLoyalty = z.object({
|
|||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
export const validateBreadcrumbsConstenstackSchemaLoyalty = z.object({
|
export const validateBreadcrumbsContenstackSchemaLoyalty = z.object({
|
||||||
all_loyalty_page: z.object({
|
all_loyalty_page: z.object({
|
||||||
items: z.array(
|
items: z.array(
|
||||||
z.object({
|
z.object({
|
||||||
|
|||||||
@@ -19,10 +19,10 @@ import { removeMultipleSlashes } from "@/utils/url"
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
getBreadcrumbsSchema,
|
getBreadcrumbsSchema,
|
||||||
validateBreadcrumbsConstenstackSchema,
|
validateBreadcrumbsContenstackSchema,
|
||||||
validateBreadcrumbsConstenstackSchemaLoyalty,
|
validateBreadcrumbsContenstackSchemaLoyalty,
|
||||||
validateBreadcrumbsRefsConstenstackSchema,
|
validateBreadcrumbsRefsConstenstackSchema,
|
||||||
validateBreadcrumbsRefsConstenstackSchemaLoyalty,
|
validateBreadcrumbsRefsContenstackSchemaLoyalty,
|
||||||
} from "./output"
|
} from "./output"
|
||||||
import {
|
import {
|
||||||
affix,
|
affix,
|
||||||
@@ -49,8 +49,7 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
console.log(ctx.pathname)
|
|
||||||
console.log(refsResponse.data.all_account_page)
|
|
||||||
if (!refsResponse.data) {
|
if (!refsResponse.data) {
|
||||||
throw notFound(refsResponse)
|
throw notFound(refsResponse)
|
||||||
}
|
}
|
||||||
@@ -60,29 +59,23 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
if (!validatedRefsData.success) {
|
if (!validatedRefsData.success) {
|
||||||
throw internalServerError(validatedRefsData.error)
|
throw internalServerError(validatedRefsData.error)
|
||||||
}
|
}
|
||||||
console.log(validatedRefsData.data)
|
|
||||||
const connections = getConnections(validatedRefsData.data)
|
|
||||||
console.log(connections)
|
|
||||||
const tags = generateTags(ctx.lang, connections)
|
|
||||||
console.log(tags)
|
|
||||||
const page = validatedRefsData.data.all_account_page.items[0]
|
|
||||||
console.log(page)
|
|
||||||
|
|
||||||
|
const connections = getConnections(validatedRefsData.data)
|
||||||
|
const tags = generateTags(ctx.lang, connections)
|
||||||
|
const page = validatedRefsData.data.all_account_page.items[0]
|
||||||
tags.push(generateTag(ctx.lang, page.system.uid, affix))
|
tags.push(generateTag(ctx.lang, page.system.uid, affix))
|
||||||
console.log(tags)
|
|
||||||
|
|
||||||
const response = await request<GetAccountPageBreadcrumbsData>(
|
const response = await request<GetAccountPageBreadcrumbsData>(
|
||||||
GetAccountPageBreadcrumbs,
|
GetAccountPageBreadcrumbs,
|
||||||
{ locale: ctx.lang, url: ctx.pathname },
|
{ locale: ctx.lang, url: ctx.pathname },
|
||||||
{ next: { tags } }
|
{ next: { tags } }
|
||||||
)
|
)
|
||||||
console.log(response.data)
|
|
||||||
if (!response.data) {
|
if (!response.data) {
|
||||||
throw notFound(response)
|
throw notFound(response)
|
||||||
}
|
}
|
||||||
|
|
||||||
const validatedBreadcrumbsData =
|
const validatedBreadcrumbsData =
|
||||||
validateBreadcrumbsConstenstackSchema.safeParse(response.data)
|
validateBreadcrumbsContenstackSchema.safeParse(response.data)
|
||||||
|
|
||||||
if (!validatedBreadcrumbsData.success) {
|
if (!validatedBreadcrumbsData.success) {
|
||||||
throw internalServerError(validatedBreadcrumbsData.error)
|
throw internalServerError(validatedBreadcrumbsData.error)
|
||||||
@@ -114,7 +107,6 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
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) {
|
||||||
@@ -124,7 +116,6 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
return validatedBreadcrumbs.data
|
return validatedBreadcrumbs.data
|
||||||
}),
|
}),
|
||||||
loyalty: contentstackProcedure.query(async ({ ctx }) => {
|
loyalty: contentstackProcedure.query(async ({ ctx }) => {
|
||||||
console.log("HEJ", ctx)
|
|
||||||
const refsResponse = await request<GetLoyaltyPageBreadcrumbsRefsData>(
|
const refsResponse = await request<GetLoyaltyPageBreadcrumbsRefsData>(
|
||||||
GetLoyaltyPageBreadcrumbsRefs,
|
GetLoyaltyPageBreadcrumbsRefs,
|
||||||
{ locale: ctx.lang, url: ctx.pathname },
|
{ locale: ctx.lang, url: ctx.pathname },
|
||||||
@@ -139,50 +130,34 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
if (!refsResponse.data) {
|
if (!refsResponse.data) {
|
||||||
throw notFound(refsResponse)
|
throw notFound(refsResponse)
|
||||||
}
|
}
|
||||||
/*if (refsResponse.data.all_loyalty_page.items) {
|
|
||||||
Object.assign(
|
|
||||||
refsResponse.data.all_loyalty_page.items,
|
|
||||||
refsResponse.data.all_loyalty_page.items[0].web
|
|
||||||
)
|
|
||||||
delete refsResponse.data.all_loyalty_page.items[0].web
|
|
||||||
}*/
|
|
||||||
console.log(
|
|
||||||
refsResponse.data.all_loyalty_page.items[0].web.breadcrumbss
|
|
||||||
.parentsConnection
|
|
||||||
)
|
|
||||||
const validatedRefsData =
|
const validatedRefsData =
|
||||||
validateBreadcrumbsRefsConstenstackSchemaLoyalty.safeParse(
|
validateBreadcrumbsRefsContenstackSchemaLoyalty.safeParse(
|
||||||
refsResponse.data
|
refsResponse.data
|
||||||
)
|
)
|
||||||
console.log("VALI", validatedRefsData)
|
|
||||||
if (!validatedRefsData.success) {
|
if (!validatedRefsData.success) {
|
||||||
throw internalServerError(validatedRefsData.error)
|
throw internalServerError(validatedRefsData.error)
|
||||||
}
|
}
|
||||||
console.log(
|
|
||||||
validatedRefsData.data.all_loyalty_page.items[0].web.breadcrumbss
|
|
||||||
)
|
|
||||||
const connections = getConnectionsLoyalty(validatedRefsData.data)
|
const connections = getConnectionsLoyalty(validatedRefsData.data)
|
||||||
console.log(connections)
|
|
||||||
const tags = generateTags(ctx.lang, connections)
|
const tags = generateTags(ctx.lang, connections)
|
||||||
console.log(tags)
|
|
||||||
const page = validatedRefsData.data.all_loyalty_page.items[0]
|
const page = validatedRefsData.data.all_loyalty_page.items[0]
|
||||||
console.log(page)
|
|
||||||
tags.push(generateTag(ctx.lang, page.system.uid, affix))
|
tags.push(generateTag(ctx.lang, page.system.uid, affix))
|
||||||
console.log(tags)
|
|
||||||
|
|
||||||
const response = await request<GetLoyaltyPageBreadcrumbsData>(
|
const response = await request<GetLoyaltyPageBreadcrumbsData>(
|
||||||
GetLoyaltyPageBreadcrumbs,
|
GetLoyaltyPageBreadcrumbs,
|
||||||
{ locale: ctx.lang, url: ctx.pathname },
|
{ locale: ctx.lang, url: ctx.pathname },
|
||||||
{ next: { tags } }
|
{ next: { tags } }
|
||||||
)
|
)
|
||||||
console.log(response.data)
|
|
||||||
if (!response.data) {
|
if (!response.data) {
|
||||||
throw notFound(response)
|
throw notFound(response)
|
||||||
}
|
}
|
||||||
|
|
||||||
const validatedBreadcrumbsData =
|
const validatedBreadcrumbsData =
|
||||||
validateBreadcrumbsConstenstackSchemaLoyalty.safeParse(response.data)
|
validateBreadcrumbsContenstackSchemaLoyalty.safeParse(response.data)
|
||||||
console.log(validatedBreadcrumbsData)
|
|
||||||
if (!validatedBreadcrumbsData.success) {
|
if (!validatedBreadcrumbsData.success) {
|
||||||
throw internalServerError(validatedBreadcrumbsData.error)
|
throw internalServerError(validatedBreadcrumbsData.error)
|
||||||
}
|
}
|
||||||
@@ -213,7 +188,6 @@ export const breadcrumbsQueryRouter = router({
|
|||||||
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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user