Merged in feature/refactor-lang (pull request #387)

feat: SW-238 Avoid prop drilling of lang

Approved-by: Michael Zetterberg
This commit is contained in:
Niclas Edenvin
2024-08-14 11:00:20 +00:00
parent 35128dbf44
commit e67212bd94
94 changed files with 378 additions and 322 deletions

View File

@@ -6,6 +6,7 @@ import { request } from "@/lib/graphql/request"
import ContentPage from "@/components/Current/ContentPage"
import Tracking from "@/components/Current/Tracking"
import { getLang, setLang } from "@/i18n/serverContext"
import type { LangParams, PageArgs, UriParams } from "@/types/params"
import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage"
@@ -15,6 +16,8 @@ export default async function CurrentContentPage({
params,
searchParams,
}: PageArgs<LangParams, UriParams>) {
setLang(params.lang)
try {
if (!searchParams.uri) {
throw new Error("Bad URI")
@@ -23,10 +26,10 @@ export default async function CurrentContentPage({
const response = await request<GetCurrentBlockPageData>(
GetCurrentBlockPage,
{
locale: params.lang,
locale: getLang(),
url: searchParams.uri,
},
{ tags: [`${searchParams.uri}-${params.lang}`] }
{ tags: [`${searchParams.uri}-${getLang()}`] }
)
if (!response.data?.all_current_blocks_page?.total) {
@@ -46,7 +49,7 @@ export default async function CurrentContentPage({
const pageData = response.data.all_current_blocks_page.items[0]
const trackingData = {
lang: params.lang,
lang: getLang(),
publishedDate: pageData.system.updated_at,
createdDate: pageData.system.created_at,
pageId: pageData.system.uid,