fix: caching

This commit is contained in:
Christel Westerberg
2024-05-31 09:23:37 +02:00
parent 0a3272f75a
commit c47966f994
12 changed files with 69 additions and 24 deletions

View File

@@ -3,8 +3,8 @@ import { batchRequest } from "@/lib/graphql/batchRequest"
import {
GetAccountPage,
GetAccountPageRefs,
GetDaDeEnUrls,
GetFiNoSvUrls,
GetDaDeEnUrlsAccountPage,
GetFiNoSvUrlsAccountPage,
} from "@/lib/graphql/Query/AccountPage.graphql"
import { request } from "@/lib/graphql/request"
import { internalServerError, notFound } from "@/server/errors/trpc"
@@ -147,11 +147,11 @@ export const accountPageQueryRouter = router({
const res = await batchRequest<LanguageSwitcherQueryDataRaw>([
{
document: GetDaDeEnUrls,
document: GetDaDeEnUrlsAccountPage,
variables,
},
{
document: GetFiNoSvUrls,
document: GetFiNoSvUrlsAccountPage,
variables,
},
])

View File

@@ -118,3 +118,18 @@ export type HeaderData = Omit<
> & {
logo: Image
}
const validateHeaderRefConfigSchema = z.object({
all_current_header: z.object({
items: z.array(
z.object({
system: z.object({
content_type_uid: z.string(),
uid: z.string(),
}),
})
),
}),
})
export type HeaderRefDataRaw = z.infer<typeof validateHeaderRefConfigSchema>

View File

@@ -1,13 +1,19 @@
import { GetContactConfig } from "@/lib/graphql/Query/ContactConfig.graphql"
import { GetCurrentHeader } from "@/lib/graphql/Query/CurrentHeader.graphql"
import {
GetCurrentHeader,
GetCurrentHeaderRef,
} from "@/lib/graphql/Query/CurrentHeader.graphql"
import { request } from "@/lib/graphql/request"
import { internalServerError, notFound } from "@/server/errors/trpc"
import { contentstackProcedure, publicProcedure, router } from "@/server/trpc"
import { generateTag } from "@/utils/generateTag"
import {
type ContactConfigData,
HeaderData,
HeaderDataRaw,
HeaderRefDataRaw,
validateContactConfigSchema,
validateHeaderConfigSchema,
} from "./output"
@@ -35,10 +41,23 @@ export const configQueryRouter = router({
return validatedContactConfigConfig.data.all_contact_config.items[0]
}),
header: publicProcedure.query(async ({ ctx }) => {
const responseRef = await request<HeaderRefDataRaw>(GetCurrentHeaderRef, {
locale: ctx.lang,
})
const response = await request<HeaderDataRaw>(
GetCurrentHeader,
{ locale: ctx.lang },
{ next: { tags: [`header-${ctx.lang}`] } }
{
next: {
tags: [
generateTag(
ctx.lang,
responseRef.data.all_current_header.items[0].system.uid
),
],
},
}
)
if (!response.data) {

View File

@@ -1,8 +1,8 @@
import { Lang } from "@/constants/languages"
import { batchRequest } from "@/lib/graphql/batchRequest"
import {
GetDaDeEnUrls,
GetFiNoSvUrls,
GetDaDeEnUrlsLoyaltyPage,
GetFiNoSvUrlsLoyaltyPage,
GetLoyaltyPage,
GetLoyaltyPageRefs,
} from "@/lib/graphql/Query/LoyaltyPage.graphql"
@@ -188,11 +188,11 @@ export const loyaltyPageQueryRouter = router({
const res = await batchRequest<LanguageSwitcherQueryDataRaw>([
{
document: GetDaDeEnUrls,
document: GetDaDeEnUrlsLoyaltyPage,
variables,
},
{
document: GetFiNoSvUrls,
document: GetFiNoSvUrlsLoyaltyPage,
variables,
},
])