From 65e4623b52ad2c2ddf3df0a78829fa94d0e77c9d Mon Sep 17 00:00:00 2001 From: Anton Gunnarsson Date: Thu, 18 Sep 2025 07:28:14 +0000 Subject: [PATCH] Merged in chore/fix-partner-sas-todos (pull request #2823) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore: Fix partner-sas todos * Add onError to TrpcProvider * Add AdobeSDKScript * Add GTMScript * Add adobeDataLayer script * Add ReactQueryDevtools * Move components to correct folder Approved-by: Joakim Jäderberg --- apps/partner-sas/app/[lang]/layout.tsx | 19 ++++++--- .../partner-sas/components/AdobeSDKScript.tsx | 13 ++++++ .../{app => }/components/Footer/Footer.tsx | 0 .../components/Footer/footer.module.css | 0 apps/partner-sas/components/GTMScript.tsx | 31 ++++++++++++++ .../{app => }/components/Header/Header.tsx | 0 .../components/Header/header.module.css | 0 .../PoweredByScandic/PoweredByScandic.tsx | 0 .../poweredByScandic.module.css | 0 apps/partner-sas/components/TrpcProvider.tsx | 40 +++++++++++++++++++ apps/partner-sas/env/server.ts | 10 +++++ apps/partner-sas/package.json | 1 + yarn.lock | 1 + 13 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 apps/partner-sas/components/AdobeSDKScript.tsx rename apps/partner-sas/{app => }/components/Footer/Footer.tsx (100%) rename apps/partner-sas/{app => }/components/Footer/footer.module.css (100%) create mode 100644 apps/partner-sas/components/GTMScript.tsx rename apps/partner-sas/{app => }/components/Header/Header.tsx (100%) rename apps/partner-sas/{app => }/components/Header/header.module.css (100%) rename apps/partner-sas/{app => }/components/PoweredByScandic/PoweredByScandic.tsx (100%) rename apps/partner-sas/{app => }/components/PoweredByScandic/poweredByScandic.module.css (100%) create mode 100644 apps/partner-sas/components/TrpcProvider.tsx diff --git a/apps/partner-sas/app/[lang]/layout.tsx b/apps/partner-sas/app/[lang]/layout.tsx index 29c225124..bbf69dd58 100644 --- a/apps/partner-sas/app/[lang]/layout.tsx +++ b/apps/partner-sas/app/[lang]/layout.tsx @@ -4,6 +4,7 @@ import "@scandic-hotels/design-system/normalize.css" import "@scandic-hotels/design-system/design-system-new-deprecated.css" import "../../globals.css" +import { ReactQueryDevtools } from "@tanstack/react-query-devtools" import Script from "next/script" import { BookingFlowContextProvider } from "@scandic-hotels/booking-flow/BookingFlowContextProvider" @@ -11,18 +12,20 @@ import { BookingFlowTrackingProvider } from "@scandic-hotels/booking-flow/Bookin import { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs" import { Lang } from "@scandic-hotels/common/constants/language" import { ToastHandler } from "@scandic-hotels/design-system/ToastHandler" -import { TrpcProvider } from "@scandic-hotels/trpc/Provider" +import AdobeSDKScript from "@/components/AdobeSDKScript" import CookieBotConsent from "@/components/CookieBotConsent" +import GTMScript from "@/components/GTMScript" import { RACRouterProvider } from "@/components/RACRouterProvider" import { SiteWideAlert } from "@/components/SitewideAlert" +import TrpcProvider from "@/components/TrpcProvider" import { FontPreload } from "@/fonts/font-preloading" import { getMessages } from "@/i18n" import ClientIntlProvider from "@/i18n/Provider" import { setLang } from "@/i18n/serverContext" -import { Footer } from "../components/Footer/Footer" -import { Header } from "../components/Header/Header" +import { Footer } from "../../components/Footer/Footer" +import { Header } from "../../components/Header/Header" import { trackAccordionItemOpen, trackBedSelection, @@ -65,8 +68,14 @@ export default async function RootLayout(props: RootLayoutProps) { return ( - {/* TODO */} + + + {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */} +
@@ -76,7 +85,6 @@ export default async function RootLayout(props: RootLayoutProps) { messages={messages} > - {/* TODO handle onError */} + diff --git a/apps/partner-sas/components/AdobeSDKScript.tsx b/apps/partner-sas/components/AdobeSDKScript.tsx new file mode 100644 index 000000000..12a13c611 --- /dev/null +++ b/apps/partner-sas/components/AdobeSDKScript.tsx @@ -0,0 +1,13 @@ +import Script from "next/script" + +import { env } from "@/env/server" + +export default function AdobeSDKScript() { + return env.ADOBE_SDK_SCRIPT_SRC ? ( +