Merged in feat/SW-2782-create-sas-branded-header (pull request #2878)

feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated UI as per design

* feat(SW-2782): Optimised code with use of Popover and modal from RAC


Approved-by: Anton Gunnarsson

packages/trpc/lib/routers/contentstack/languageSwitcher/query.ts

@@ -5,7 +5,7 @@ import { getNonContentstackUrls } from "../metadata/output"
 import { getLanguageSwitcherInput } from "./input"
 import { getUrlsOfAllLanguages } from "./utils"
 
-import type { LanguageSwitcherData } from "../../../types/languageSwitcher"
+import type { LanguageSwitcherData } from "@scandic-hotels/common/constants/language"
 
 export const languageSwitcherQueryRouter = router({
   get: publicProcedure

packages/trpc/lib/routers/contentstack/languageSwitcher/utils.ts

@@ -1,4 +1,7 @@
-import { Lang } from "@scandic-hotels/common/constants/language"
+import {
+  Lang,
+  type LanguageSwitcherData,
+} from "@scandic-hotels/common/constants/language"
 import { createLogger } from "@scandic-hotels/common/logger/createLogger"
 import { createCounter } from "@scandic-hotels/common/telemetry"
 import { removeTrailingSlash } from "@scandic-hotels/common/utils/url"
@@ -57,10 +60,7 @@ import {
 import { generateTag } from "../../../utils/generateTag"
 import { validateLanguageSwitcherData } from "./output"
 
-import type {
-  LanguageSwitcherData,
-  LanguageSwitcherQueryDataRaw,
-} from "../../../types/languageSwitcher"
+import type { LanguageSwitcherQueryDataRaw } from "../../../types/languageSwitcher"
 
 export const languageSwitcherAffix = "languageSwitcher"
 

packages/trpc/lib/routers/contentstack/metadata/output.ts

@@ -12,11 +12,12 @@ import { RTETypeEnum } from "../../../types/RTEenums"
 import { destinationFilterSchema } from "../schemas/destinationFilters"
 import { systemSchema } from "../schemas/system"
 
-import type { Lang } from "@scandic-hotels/common/constants/language"
+import type {
+  Lang,
+  LanguageSwitcherData,
+} from "@scandic-hotels/common/constants/language"
 import type { ImageVaultAsset } from "@scandic-hotels/common/utils/imageVault"
 
-import type { LanguageSwitcherData } from "../../../types/languageSwitcher"
-
 const metaDataJsonSchema = z.object({
   children: z.array(
     z.object({

packages/trpc/lib/routers/contentstack/metadata/query.ts

@@ -26,9 +26,9 @@ import { getMetadataInput } from "./input"
 import { getNonContentstackUrls, rawMetadataSchema } from "./output"
 import { affix, getCityData, getCountryData } from "./utils"
 
+import type { LanguageSwitcherData } from "@scandic-hotels/common/constants/language"
 import type { Lang } from "@scandic-hotels/common/constants/language"
 
-import type { LanguageSwitcherData } from "../../../types/languageSwitcher"
 import type { RawMetadataSchema } from "./output"
 
 const fetchMetadata = cache(async function fetchMemoizedMetadata<T>(

packages/trpc/lib/types/languageSwitcher.ts

@@ -1,17 +1,3 @@
-type CurrentLanguageResult = {
-  url: string
-  isExternal?: boolean
-}
-
-export type LanguageSwitcherData = {
-  da?: CurrentLanguageResult
-  de?: CurrentLanguageResult
-  en?: CurrentLanguageResult
-  fi?: CurrentLanguageResult
-  no?: CurrentLanguageResult
-  sv?: CurrentLanguageResult
-}
-
 type LanguageResult = {
   web?: {
     original_url?: string | null