Merged in fix/refactor-booking-flow-search-params (pull request #2148)

Fix: refactor booking flow search params

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* Prepare new parse function for booking flow search params

* Prepare serialize function for booking flow search params

* Improve handling of comma separated arrays

* Slightly refactor for readability

* Next abstracts URLSearchParams so handle the abstraction instead

* Refactor booking widget to use new search params parsing

* Rename search param functions

* Refactor select-hotel to use new search param parser

* Use new search params parser in select-rate and details

* Fix hotelId type

* Avoid passing down search params into BookingWidget components

* More updates to use new types instead of SearchParams<T>

* Remove types SelectHotelSearchParams and AlternativeSelectHotelSearchParams

* Fix parseBookingWidgetSearchParams return type

* Add error handling to booking search param parsers

* Fix modifyRateIndex handling in details page

* Clean up

* Refactor booking widget search param serializing to util function

* Move start page booking widget search param parsing to page

* Use new search param serializer in HandleErrorCallback

* Delete convertSearchParamsToObj & convertObjToSearchParams


Approved-by: Michael Zetterberg

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/map/page.tsx

@@ -1,22 +1,23 @@
+import { notFound } from "next/navigation"
 import { Suspense } from "react"
 
 import { SelectHotelMapContainer } from "@/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer"
 import { SelectHotelMapContainerSkeleton } from "@/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainerSkeleton"
 import { MapContainer } from "@/components/MapContainer"
-import { convertSearchParamsToObj } from "@/utils/url"
+import { parseSelectHotelSearchParams } from "@/utils/url"
 
 import styles from "./page.module.css"
 
-import type { AlternativeHotelsSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
-import type { LangParams, PageArgs } from "@/types/params"
+import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
 
 export default async function SelectHotelMapPage(
-  props: PageArgs<LangParams, AlternativeHotelsSearchParams>
+  props: PageArgs<LangParams, NextSearchParams>
 ) {
   const searchParams = await props.searchParams
 
-  const booking =
-    convertSearchParamsToObj<AlternativeHotelsSearchParams>(searchParams)
+  const booking = parseSelectHotelSearchParams(searchParams)
+
+  if (!booking) return notFound()
 
   return (
     <div className={styles.main}>

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/page.tsx

@@ -13,23 +13,19 @@ import { getTracking } from "@/components/HotelReservation/SelectHotel/tracking"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import { getHotelSearchDetails } from "@/utils/hotelSearchDetails"
-import { convertSearchParamsToObj } from "@/utils/url"
+import { parseSelectHotelSearchParams } from "@/utils/url"
 
-import type {
-  AlternativeHotelsSearchParams,
-  SelectHotelSearchParams,
-} from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
-import { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
-import type { LangParams, PageArgs } from "@/types/params"
+import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
 
 export default async function AlternativeHotelsPage(
-  props: PageArgs<LangParams, AlternativeHotelsSearchParams>
+  props: PageArgs<LangParams, NextSearchParams>
 ) {
   const searchParams = await props.searchParams
   const params = await props.params
 
-  const booking =
-    convertSearchParamsToObj<AlternativeHotelsSearchParams>(searchParams)
+  const booking = parseSelectHotelSearchParams(searchParams)
+
+  if (!booking) return notFound()
 
   const searchDetails = await getHotelSearchDetails(booking, true)
 
@@ -42,10 +38,10 @@ export default async function AlternativeHotelsPage(
     bookingCode,
     childrenInRoom,
     city,
+    cityName,
     hotel: isAlternativeFor,
     noOfRooms,
     redemption,
-    selectHotelParams,
   } = searchDetails
 
   if (bookingCode && FamilyAndFriendsCodes.includes(bookingCode)) {
@@ -59,16 +55,18 @@ export default async function AlternativeHotelsPage(
 
   // TODO: This needs to be refactored into its
   // own functions
-  const hotels = await getHotels(
-    selectHotelParams,
+  const hotels = await getHotels({
+    fromDate: booking.fromDate,
+    toDate: booking.toDate,
+    rooms: booking.rooms,
     isAlternativeFor,
     bookingCode,
     city,
-    !!redemption
-  )
+    redemption: !!redemption,
+  })
 
-  const arrivalDate = new Date(selectHotelParams.fromDate)
-  const departureDate = new Date(selectHotelParams.toDate)
+  const arrivalDate = new Date(booking.fromDate)
+  const departureDate = new Date(booking.toDate)
 
   const isRedemptionAvailability = redemption
     ? hotels.some(
@@ -92,11 +90,11 @@ export default async function AlternativeHotelsPage(
     adultsInRoom,
     childrenInRoom,
     hotels?.length ?? 0,
-    selectHotelParams.hotelId,
+    booking.hotelId,
     noOfRooms,
     hotels?.[0]?.hotel.address.country,
     hotels?.[0]?.hotel.address.city,
-    selectHotelParams.city,
+    cityName,
     bookingCode,
     isBookingCodeRateAvailable,
     redemption,