Merge branch 'develop' into feat/sw-386-current-header-fixes

2024-09-25 09:27:36 +02:00
parent bedfa44819 8f727cc933
commit 7874a47bf4
449 changed files with 8154 additions and 9903 deletions
--- a/app/[lang]/(live)/(protected)/layout.tsx
+++ b/app/[lang]/(live)/(protected)/layout.tsx
@@ -2,7 +2,7 @@ import { headers } from "next/headers"
 import { redirect } from "next/navigation"

 import { overview } from "@/constants/routes/myPages"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"

 import { auth } from "@/auth"
 import { getLang } from "@/i18n/serverContext"
@@ -27,7 +27,7 @@ export default async function ProtectedLayout({
    redirect(redirectURL)
  }

-  const user = await serverClient().user.get()
+  const user = await getProfile()

  if (user && "error" in user) {
    // redirect(redirectURL)
--- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
@@ -1,4 +1,4 @@
-import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
+import Breadcrumbs from "@/components/Breadcrumbs"
 import { setLang } from "@/i18n/serverContext"

 import { LangParams, PageArgs } from "@/types/params"
--- a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
@@ -1,6 +1,6 @@
 import { serverClient } from "@/lib/trpc/server"

-import Content from "@/components/MyPages/AccountPage/Content"
+import Blocks from "@/components/Blocks"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
@@ -10,7 +10,7 @@ import styles from "./page.module.css"

 import type { LangParams, PageArgs } from "@/types/params"

-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"

 export default async function MyPages({
  params,
@@ -30,8 +30,8 @@ export default async function MyPages({
    <>
      <main className={styles.blocks}>
        <Title>{accountPage.heading}</Title>
-        {accountPage.content.length ? (
-          <Content content={accountPage.content} />
+        {accountPage.content?.length ? (
+          <Blocks blocks={accountPage.content} />
        ) : (
          <p>{formatMessage({ id: "No content published" })}</p>
        )}
--- a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx
@@ -1,4 +1,4 @@
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"

 import Form from "@/components/Forms/Edit/Profile"
 import { setLang } from "@/i18n/serverContext"
@@ -10,7 +10,7 @@ export default async function EditProfileSlot({
 }: PageArgs<LangParams>) {
  setLang(params.lang)

-  const user = await serverClient().user.get()
+  const user = await getProfile()
  if (!user || "error" in user) {
    return null
  }
--- a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx
@@ -1,6 +1,6 @@
 import { languages, languageSelect } from "@/constants/languages"
 import { profileEdit } from "@/constants/routes/myPages"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"

 import {
  CalendarIcon,
@@ -16,7 +16,7 @@ import Link from "@/components/TempDesignSystem/Link"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { getIntl } from "@/i18n"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import styles from "./page.module.css"

@@ -25,7 +25,7 @@ import { LangParams, PageArgs } from "@/types/params"
 export default async function Profile({ params }: PageArgs<LangParams>) {
  setLang(params.lang)
  const { formatMessage } = await getIntl()
-  const user = await serverClient().user.get()
+  const user = await getProfile()
  if (!user || "error" in user) {
    return null
  }
@@ -44,7 +44,7 @@ export default async function Profile({ params }: PageArgs<LangParams>) {
          </Title>
        </hgroup>
        <Button asChild intent="primary" size="small" theme="base">
-          <Link prefetch={false} color="none" href={profileEdit[getLang()]}>
+          <Link prefetch={false} color="none" href={profileEdit[params.lang]}>
            {formatMessage({ id: "Edit profile" })}
          </Link>
        </Button>
--- a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx
@@ -1,5 +1,5 @@
 import ProfilePage from "../page"

-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"

 export default ProfilePage
--- a/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
@@ -7,7 +7,7 @@ import { setLang } from "@/i18n/serverContext"

 import { LangParams, PageArgs } from "@/types/params"

-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"

 export default async function ProfilePage({ params }: PageArgs<LangParams>) {
  setLang(params.lang)
--- a/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/page.tsx
+++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/page.tsx
@@ -1,4 +1,4 @@
-import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
+import Breadcrumbs from "@/components/Breadcrumbs"
 import { setLang } from "@/i18n/serverContext"

 import { LangParams, PageArgs } from "@/types/params"
--- a/app/[lang]/(live)/(public)/hotelreservation/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/page.tsx
@@ -1,9 +1,8 @@
 import { setLang } from "@/i18n/serverContext"

-import { LangParams, PageArgs } from "@/types/params"
+import type { LangParams, PageArgs } from "@/types/params"

 export default function HotelReservationPage({ params }: PageArgs<LangParams>) {
  setLang(params.lang)
-
  return null
 }
--- a/app/[lang]/(live)/@bookingwidget/page.tsx
+++ b/app/[lang]/(live)/@bookingwidget/page.tsx
@@ -1,17 +1,17 @@
 import { serverClient } from "@/lib/trpc/server"

-import BookingWidget from "@/components/BookingWidget"
+import BookingWidget, { preload } from "@/components/BookingWidget"

 export default async function BookingWidgetPage() {
+  preload()
+
  // Get the booking widget show/hide status based on page specific settings
  const bookingWidgetToggle =
-    await serverClient().contentstack.bookingwidget.getToggle()
+    await serverClient().contentstack.bookingwidget.toggle.get()

-  return (
-    <>
-      {bookingWidgetToggle && bookingWidgetToggle.hideBookingWidget ? null : (
-        <BookingWidget />
-      )}
-    </>
-  )
+  if (bookingWidgetToggle.hideBookingWidget) {
+    return null
+  }
+
+  return <BookingWidget />
 }
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -17,7 +17,7 @@ import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
 import { preloadUserTracking } from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import type { LangParams, LayoutArgs } from "@/types/params"

@@ -37,7 +37,7 @@ export default async function RootLayout({
  const { defaultLocale, locale, messages } = await getIntl()

  return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
      <head>
        <AdobeSDKScript />
        <Script data-cookieconsent="ignore" src="/_static/js/cookie-bot.js" />
--- a/app/[lang]/(live)/middleware-error/[status]/page.tsx
+++ b/app/[lang]/(live)/middleware-error/[status]/page.tsx
@@ -1,4 +1,4 @@
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import styles from "./page.module.css"

@@ -11,7 +11,7 @@ export default function MiddlewareError({

  return (
    <div className={styles.layout}>
-      Middleware Error {getLang()}: {params.status}
+      Middleware Error {params.lang}: {params.status}
    </div>
  )
 }
--- a/app/[lang]/(live-current)/current-content-page/page.tsx
+++ b/app/[lang]/(live-current)/current-content-page/page.tsx
@@ -1,7 +1,7 @@
 import { notFound } from "next/navigation"

-import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
-import { GetCurrentBlockPageTrackingData } from "@/lib/graphql/Query/CurrentBlockPageTrackingData.graphql"
+import { GetCurrentBlockPage } from "@/lib/graphql/Query/Current/CurrentBlockPage.graphql"
+import { GetCurrentBlockPageTrackingData } from "@/lib/graphql/Query/Current/CurrentBlockPageTrackingData.graphql"
 import { request } from "@/lib/graphql/request"

 import ContentPage from "@/components/Current/ContentPage"
--- a/app/[lang]/(live-current)/layout.tsx
+++ b/app/[lang]/(live-current)/layout.tsx
@@ -11,7 +11,7 @@ import LangPopup from "@/components/Current/LangPopup"
 import SkipToMainContent from "@/components/SkipToMainContent"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import type { Metadata } from "next"

@@ -34,7 +34,7 @@ export default async function RootLayout({
  const { defaultLocale, locale, messages } = await getIntl()

  return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
      <head>
        {/* eslint-disable-next-line @next/next/no-css-tags */}
        <link rel="stylesheet" href="/_static/css/core.css" />
@@ -45,7 +45,7 @@ export default async function RootLayout({
          strategy="beforeInteractive"
          data-blockingmode="auto"
          data-cbid="6d539de8-3e67-4f0f-a0df-8cef9070f712"
-          data-culture={getLang()}
+          data-culture={params.lang}
          id="Cookiebot"
          src="https://consent.cookiebot.com/uc.js"
        />
--- a/app/[lang]/(preview)/layout.tsx
+++ b/app/[lang]/(preview)/layout.tsx
@@ -1,5 +1,5 @@
 import InitLivePreview from "@/components/Current/LivePreview"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import type { Metadata } from "next"

@@ -17,7 +17,7 @@ export default function RootLayout({
  setLang(params.lang)

  return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
      <body>
        <InitLivePreview />
        {children}
--- a/app/[lang]/(preview)/preview/[contentType]/[uid]/page.tsx
+++ b/app/[lang]/(preview)/preview/[contentType]/[uid]/page.tsx
@@ -1,4 +1,4 @@
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import {
  ContentTypeParams,
@@ -16,8 +16,8 @@ export default async function PreviewPage({
  return (
    <div>
      <p>
-        Preview for {params.contentType}:{params.uid} in {getLang()} with params{" "}
-        <pre>{JSON.stringify(searchParams, null, 2)}</pre> goes here
+        Preview for {params.contentType}:{params.uid} in {params.lang} with
+        params <pre>{JSON.stringify(searchParams, null, 2)}</pre> goes here
      </p>
    </div>
  )
--- a/app/[lang]/(preview-current)/layout.tsx
+++ b/app/[lang]/(preview-current)/layout.tsx
@@ -1,10 +1,8 @@
-import Script from "next/script"
-
 import Footer from "@/components/Current/Footer"
 import LangPopup from "@/components/Current/LangPopup"
 import InitLivePreview from "@/components/Current/LivePreview"
 import SkipToMainContent from "@/components/SkipToMainContent"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import type { Metadata } from "next"

@@ -24,7 +22,7 @@ export default function RootLayout({
  setLang(params.lang)

  return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
      <head>
        {/* eslint-disable-next-line @next/next/no-css-tags */}
        <link rel="stylesheet" href="/_static/css/core.css" />
--- a/app/[lang]/(preview-current)/preview-current/page.tsx
+++ b/app/[lang]/(preview-current)/preview-current/page.tsx
@@ -1,11 +1,11 @@
 import ContentstackLivePreview from "@contentstack/live-preview-utils"

 import { previewRequest } from "@/lib/graphql/previewRequest"
-import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
+import { GetCurrentBlockPage } from "@/lib/graphql/Query/Current/CurrentBlockPage.graphql"

 import ContentPage from "@/components/Current/ContentPage"
 import LoadingSpinner from "@/components/Current/LoadingSpinner"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import type { PageArgs, PreviewParams } from "@/types/params"
 import { LangParams } from "@/types/params"
@@ -26,7 +26,7 @@ export default async function CurrentPreviewPage({

    const response = await previewRequest<GetCurrentBlockPageData>(
      GetCurrentBlockPage,
-      { locale: getLang(), url: searchParams.uri }
+      { locale: params.lang, url: searchParams.uri }
    )

    if (!response.data?.all_current_blocks_page?.total) {
--- a/app/[lang]/webview/[contentType]/[uid]/page.tsx
+++ b/app/[lang]/webview/[contentType]/[uid]/page.tsx
@@ -1,11 +1,11 @@
 import { headers } from "next/headers"
 import { notFound, redirect } from "next/navigation"

-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"

-import AccountPage from "@/components/ContentType/Webviews/AccountPage"
-import LoyaltyPage from "@/components/ContentType/Webviews/LoyaltyPage"
-import { getLang, setLang } from "@/i18n/serverContext"
+import AccountPage from "@/components/Webviews/AccountPage"
+import LoyaltyPage from "@/components/Webviews/LoyaltyPage"
+import { setLang } from "@/i18n/serverContext"

 import {
  ContentTypeWebviewParams,
@@ -18,7 +18,7 @@ export default async function ContentTypePage({
  params,
 }: PageArgs<LangParams & ContentTypeWebviewParams & UIDParams, {}>) {
  setLang(params.lang)
-  const user = await serverClient().user.get()
+  const user = await getProfile()

  if (!user) {
    console.log(`[webview:page] unable to load user`)
@@ -31,8 +31,8 @@ export default async function ContentTypePage({
      case "forbidden": // fall through
      case "token_expired":
        const h = headers()
-        const returnURL = `/${getLang()}/webview${h.get("x-pathname")!}`
-        const redirectURL = `/${getLang()}/webview/refresh?returnUrl=${encodeURIComponent(returnURL)}`
+        const returnURL = `/${params.lang}/webview${h.get("x-pathname")!}`
+        const redirectURL = `/${params.lang}/webview/refresh?returnUrl=${encodeURIComponent(returnURL)}`
        console.log(`[webview:page] user error, redirecting to: ${redirectURL}`)
        redirect(redirectURL)
      case "notfound":
--- a/app/[lang]/webview/layout.tsx
+++ b/app/[lang]/webview/layout.tsx
@@ -8,7 +8,7 @@ import TrpcProvider from "@/lib/trpc/Provider"
 import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"

 import styles from "./layout.module.css"

@@ -28,7 +28,7 @@ export default async function RootLayout({
  const { defaultLocale, locale, messages } = await getIntl()

  return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
      <head>
        <AdobeSDKScript />
        <Script id="ensure-adobeDataLayer">{`