Merged in fix/LOY-222-find-my-booking-urls-for-prod (pull request #1817)

Fix(LOY-222): Find my booking url handling

* fix(LOY-222): adapt findMyBooking url based on HIDE_FOR_NEXT_RELEASE

* feat(LOY-222): add current web paths for findMyBooking in multiple languages

* refactor(LOY-222): better env and new url constructions

* refactor(LOY-222): decouple env var handling from getCurrentWebUrl

* fix(LOY-222): update findMyBooking URL construction to use baseUrl

* fix(LOY-222): simplify findMyBooking URL handling for new web urls

* fix(LOY-222): Update Finnish path for hotel reservation lookup

* refactor(LOY-222): rename PUBLIC_URL to NEXT_PUBLIC_PUBLIC_URL for consistency


Approved-by: Christian Andolf
Approved-by: Linus Flood

apps/scandic-web/components/Header/MainMenu/MobileMenu/index.tsx

@@ -6,13 +6,18 @@ import { useIntl } from "react-intl"
 import { useMediaQuery } from "usehooks-ts"
 
 import { customerService } from "@/constants/currentWebHrefs"
-import { findMyBooking } from "@/constants/routes/findMyBooking"
+import {
+  findMyBooking,
+  findMyBookingCurrentWebPath,
+} from "@/constants/routes/findMyBooking"
+import { env } from "@/env/client"
 import useDropdownStore from "@/stores/main-menu"
 
 import { IconName } from "@/components/Icons/iconName"
 import LanguageSwitcher from "@/components/LanguageSwitcher"
 import { useHandleKeyUp } from "@/hooks/useHandleKeyUp"
 import useLang from "@/hooks/useLang"
+import { getCurrentWebUrl } from "@/utils/url"
 
 import HeaderLink from "../../HeaderLink"
 import TopLink from "../../TopLink"
@@ -70,6 +75,15 @@ export default function MobileMenu({
     defaultMessage: "Open menu",
   })
 
+  const baseUrl = env.NEXT_PUBLIC_PUBLIC_URL || "https://www.scandichotels.com"
+  const findMyBookingUrl = env.NEXT_PUBLIC_HIDE_FOR_NEXT_RELEASE
+    ? getCurrentWebUrl({
+        path: findMyBookingCurrentWebPath[lang],
+        lang,
+        baseUrl,
+      })
+    : findMyBooking[lang]
+
   return (
     <>
       <button
@@ -90,7 +104,7 @@ export default function MobileMenu({
           {children}
           <footer className={styles.footer}>
             <HeaderLink
-              href={findMyBooking[lang]}
+              href={findMyBookingUrl}
               iconName={IconName.Search}
               onClick={() => toggleDropdown(DropdownTypeEnum.HamburgerMenu)}
             >

apps/scandic-web/components/Header/TopMenu/index.tsx

@@ -1,4 +1,8 @@
-import { findMyBooking } from "@/constants/routes/findMyBooking"
+import {
+  findMyBooking,
+  findMyBookingCurrentWebPath,
+} from "@/constants/routes/findMyBooking"
+import { env } from "@/env/server"
 import { getHeader } from "@/lib/trpc/memoizedRequests"
 
 import { auth } from "@/auth"
@@ -9,6 +13,7 @@ import Caption from "@/components/TempDesignSystem/Text/Caption"
 import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
 import { isValidSession } from "@/utils/session"
+import { getCurrentWebUrl } from "@/utils/url"
 
 import HeaderLink from "../HeaderLink"
 import TopLink from "../TopLink"
@@ -28,6 +33,14 @@ export default async function TopMenu() {
   }
 
   const lang = getLang()
+  const baseUrl = env.PUBLIC_URL || "https://www.scandichotels.com"
+  const findMyBookingUrl = env.HIDE_FOR_NEXT_RELEASE
+    ? getCurrentWebUrl({
+        path: findMyBookingCurrentWebPath[lang],
+        lang,
+        baseUrl,
+      })
+    : findMyBooking[lang]
 
   return (
     <div className={styles.topMenu}>
@@ -37,7 +50,7 @@ export default async function TopMenu() {
           <LanguageSwitcher type="desktopHeader" />
 
           <Caption type="regular" color="textMediumContrast" asChild>
-            <HeaderLink href={findMyBooking[lang]} iconName={IconName.Search}>
+            <HeaderLink href={findMyBookingUrl} iconName={IconName.Search}>
               {intl.formatMessage({
                 defaultMessage: "Find booking",
               })}