scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in chore/fix-partner-sas-todos (pull request #2823)

Browse Source 
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
This commit is contained in:
Anton Gunnarsson
2025-09-18 07:28:14 +00:00
parent b0f3e4afbd
commit 65e4623b52
13 changed files with 110 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/partner-sas/app/[lang]/layout.tsx
View File

@@ -4,6 +4,7 @@ import "@scandic-hotels/design-system/normalize.css"
import "@scandic-hotels/design-system/design-system-new-deprecated.css" import "@scandic-hotels/design-system/design-system-new-deprecated.css"
import "../../globals.css" import "../../globals.css"
import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
import Script from "next/script" import Script from "next/script"
import { BookingFlowContextProvider } from "@scandic-hotels/booking-flow/BookingFlowContextProvider" 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 { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs"
import { Lang } from "@scandic-hotels/common/constants/language" import { Lang } from "@scandic-hotels/common/constants/language"
import { ToastHandler } from "@scandic-hotels/design-system/ToastHandler" 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 CookieBotConsent from "@/components/CookieBotConsent"
import GTMScript from "@/components/GTMScript"
import { RACRouterProvider } from "@/components/RACRouterProvider" import { RACRouterProvider } from "@/components/RACRouterProvider"
import { SiteWideAlert } from "@/components/SitewideAlert" import { SiteWideAlert } from "@/components/SitewideAlert"
import TrpcProvider from "@/components/TrpcProvider"
import { FontPreload } from "@/fonts/font-preloading" import { FontPreload } from "@/fonts/font-preloading"
import { getMessages } from "@/i18n" import { getMessages } from "@/i18n"
import ClientIntlProvider from "@/i18n/Provider" import ClientIntlProvider from "@/i18n/Provider"
import { setLang } from "@/i18n/serverContext" import { setLang } from "@/i18n/serverContext"
import { Footer } from "../components/Footer/Footer" import { Footer } from "../../components/Footer/Footer"
import { Header } from "../components/Header/Header" import { Header } from "../../components/Header/Header"
import { import {
trackAccordionItemOpen, trackAccordionItemOpen,
trackBedSelection, trackBedSelection,
@@ -65,8 +68,14 @@ export default async function RootLayout(props: RootLayoutProps) {
return ( return (
<html lang="en"> <html lang="en">
<head> <head>
{/* TODO */}
<FontPreload /> <FontPreload />
<AdobeSDKScript />
<GTMScript />
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
<Script id="ensure-adobeDataLayer">{`
window.adobeDataLayer = window.adobeDataLayer || []
window.dataLayer = window.dataLayer || []
`}</Script>
</head> </head>
<body className="scandic"> <body className="scandic">
<div className="root"> <div className="root">
@@ -76,7 +85,6 @@ export default async function RootLayout(props: RootLayoutProps) {
messages={messages} messages={messages}
> >
<NuqsAdapter> <NuqsAdapter>
{/* TODO handle onError */}
<TrpcProvider> <TrpcProvider>
<RACRouterProvider> <RACRouterProvider>
<BookingFlowContextProvider <BookingFlowContextProvider
@@ -106,6 +114,7 @@ export default async function RootLayout(props: RootLayoutProps) {
<Footer /> <Footer />
<ToastHandler /> <ToastHandler />
<CookieBotConsent /> <CookieBotConsent />
<ReactQueryDevtools initialIsOpen={false} />
</BookingFlowTrackingProvider> </BookingFlowTrackingProvider>
</BookingFlowContextProvider> </BookingFlowContextProvider>
</RACRouterProvider> </RACRouterProvider>

13
apps/partner-sas/components/AdobeSDKScript.tsx Normal file
View File

@@ -0,0 +1,13 @@
import Script from "next/script"
import { env } from "@/env/server"
export default function AdobeSDKScript() {
return env.ADOBE_SDK_SCRIPT_SRC ? (
<Script
data-cookieconsent="statistics"
src={env.ADOBE_SDK_SCRIPT_SRC}
async
/>
) : null
}

0
apps/partner-sas/app/components/Footer/Footer.tsx → apps/partner-sas/components/Footer/Footer.tsx
View File

0
apps/partner-sas/app/components/Footer/footer.module.css → apps/partner-sas/components/Footer/footer.module.css
View File

31
apps/partner-sas/components/GTMScript.tsx Normal file
View File

@@ -0,0 +1,31 @@
import Script from "next/script"
import { env } from "@/env/server"
export default function GTMScript() {
return env.ENABLE_GTMSCRIPT ? (
<Script
id="gtm-script-tag"
data-cookieconsent="statistics"
dangerouslySetInnerHTML={{
__html: `
try {
(function(w,d,s,l,i){
w[l]=w[l]||[];
w[l].push({'gtm.start': new Date().getTime(), event:'gtm.js'});
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s),
dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src = 'https://analytics.scandichotels.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window,document,'script','dataLayer','GTM-KNJCW67W');
} catch (e) {
console.error('Failed to load GTM script', e);
}
`,
}}
async
/>
) : null
}

0
apps/partner-sas/app/components/Header/Header.tsx → apps/partner-sas/components/Header/Header.tsx
View File

0
apps/partner-sas/app/components/Header/header.module.css → apps/partner-sas/components/Header/header.module.css
View File

0
apps/partner-sas/app/components/PoweredByScandic/PoweredByScandic.tsx → apps/partner-sas/components/PoweredByScandic/PoweredByScandic.tsx
View File

0
apps/partner-sas/app/components/PoweredByScandic/poweredByScandic.module.css → apps/partner-sas/components/PoweredByScandic/poweredByScandic.module.css
View File

40
apps/partner-sas/components/TrpcProvider.tsx Normal file
View File

@@ -0,0 +1,40 @@
"use client"
import { TRPCClientError } from "@trpc/client"
import { login } from "@scandic-hotels/common/constants/routes/handleAuth"
import { logger } from "@scandic-hotels/common/logger"
import { SessionExpiredError } from "@scandic-hotels/trpc/errors"
import { TrpcProvider as InternalTrpcProvider } from "@scandic-hotels/trpc/Provider"
import useLang from "@/hooks/useLang"
import type { AnyTRPCRouter } from "@trpc/server"
export default function TrpcProvider({
children,
}: {
children: React.ReactNode
}) {
const lang = useLang()
return (
<InternalTrpcProvider
onError={(error) => {
if (error instanceof TRPCClientError) {
const appError: TRPCClientError<AnyTRPCRouter> = error
logger.error("trpc error", { appError })
if (appError.data?.code === "UNAUTHORIZED") {
if (appError.data?.cause instanceof SessionExpiredError) {
// TODO verify login url
const loginUrl = login[lang]
window.location.assign(loginUrl)
}
}
}
}}
>
{children}
</InternalTrpcProvider>
)
}

10
apps/partner-sas/env/server.ts vendored
View File

@@ -10,9 +10,19 @@ export const env = createEnv({
isServer: typeof window === "undefined" || "Deno" in window, isServer: typeof window === "undefined" || "Deno" in window,
server: { server: {
PUBLIC_URL: z.string().default(""), PUBLIC_URL: z.string().default(""),
ADOBE_SDK_SCRIPT_SRC: z.string().optional(),
ENABLE_GTMSCRIPT: z
.string()
// only allow "true" or "false"
.refine((s) => s === "true" || s === "false")
// transform to boolean
.transform((s) => s === "true")
.default("false"),
}, },
emptyStringAsUndefined: true, emptyStringAsUndefined: true,
runtimeEnv: { runtimeEnv: {
PUBLIC_URL: process.env.NEXT_PUBLIC_PUBLIC_URL, PUBLIC_URL: process.env.NEXT_PUBLIC_PUBLIC_URL,
ADOBE_SDK_SCRIPT_SRC: process.env.ADOBE_SDK_SCRIPT_SRC,
ENABLE_GTMSCRIPT: process.env.ENABLE_GTMSCRIPT,
}, },
}) })

1
apps/partner-sas/package.json
View File

@@ -26,6 +26,7 @@
"@scandic-hotels/trpc": "workspace:*", "@scandic-hotels/trpc": "workspace:*",
"@sentry/nextjs": "^8.41.0", "@sentry/nextjs": "^8.41.0",
"@swc/plugin-formatjs": "^3.2.2", "@swc/plugin-formatjs": "^3.2.2",
"@tanstack/react-query-devtools": "^5.75.5",
"next": "15.3.4", "next": "15.3.4",
"react": "^19.0.0", "react": "^19.0.0",
"react-dom": "^19.0.0", "react-dom": "^19.0.0",

1
yarn.lock
View File

@@ -5835,6 +5835,7 @@ __metadata:
"@scandic-hotels/typescript-config": "workspace:*" "@scandic-hotels/typescript-config": "workspace:*"
"@sentry/nextjs": "npm:^8.41.0" "@sentry/nextjs": "npm:^8.41.0"
"@swc/plugin-formatjs": "npm:^3.2.2" "@swc/plugin-formatjs": "npm:^3.2.2"
"@tanstack/react-query-devtools": "npm:^5.75.5"
"@types/node": "npm:^20" "@types/node": "npm:^20"
"@types/react": "npm:19.1.0" "@types/react": "npm:19.1.0"
"@types/react-dom": "npm:19.1.0" "@types/react-dom": "npm:19.1.0"