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)/@bookingwidget/(contentTypes)/destination_city_page/[uid]/page.tsx

@@ -2,12 +2,14 @@ import { env } from "@/env/server"
 import { getDestinationCityPage } from "@/lib/trpc/memoizedRequests"
 
 import { BookingWidget } from "@/components/BookingWidget"
+import { parseBookingWidgetSearchParams } from "@/utils/url"
 
-import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
-import type { PageArgs } from "@/types/params"
+import type { NextSearchParams, PageArgs } from "@/types/params"
 
-export default async function BookingWidgetDestinationCityPage(props: PageArgs<{}, BookingWidgetSearchData>) {
-  const searchParams = await props.searchParams;
+export default async function BookingWidgetDestinationCityPage(
+  props: PageArgs<{}, NextSearchParams>
+) {
+  const searchParams = await props.searchParams
   if (env.NEW_SITE_LIVE_STATUS === "NOT_LIVE") {
     return null
   }
@@ -20,5 +22,7 @@ export default async function BookingWidgetDestinationCityPage(props: PageArgs<{
     city: pageData?.city.name ?? "",
   }
 
-  return <BookingWidget bookingWidgetSearchParams={bookingWidgetSearchParams} />
+  const booking = parseBookingWidgetSearchParams(bookingWidgetSearchParams)
+
+  return <BookingWidget booking={booking} />
 }

apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/hotel_page/[uid]/page.tsx

@@ -3,20 +3,18 @@ import { getHotel, getHotelPage } from "@/lib/trpc/memoizedRequests"
 
 import { BookingWidget } from "@/components/BookingWidget"
 import { getLang } from "@/i18n/serverContext"
+import { parseBookingWidgetSearchParams } from "@/utils/url"
 
-import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
-import type { PageArgs } from "@/types/params"
+import type { NextSearchParams, PageArgs } from "@/types/params"
 
 export default async function BookingWidgetHotelPage(
-  props: PageArgs<{}, BookingWidgetSearchData & { subpage?: string }>
+  props: PageArgs<{}, NextSearchParams & { subpage?: string }>
 ) {
   const searchParams = await props.searchParams
   if (env.NEW_SITE_LIVE_STATUS === "NOT_LIVE") {
     return null
   }
 
-  const { bookingCode, subpage } = searchParams
-
   const hotelPageData = await getHotelPage()
   const hotelData = await getHotel({
     hotelId: hotelPageData?.hotel_page_id || "",
@@ -24,6 +22,7 @@ export default async function BookingWidgetHotelPage(
     isCardOnlyPayment: false,
   })
 
+  const subpage = searchParams.subpage
   const isMeetingSubpage =
     subpage && hotelData?.additionalData.meetingRooms.nameInUrl === subpage
 
@@ -32,10 +31,12 @@ export default async function BookingWidgetHotelPage(
   }
 
   const bookingWidgetSearchParams = {
-    bookingCode: bookingCode ?? "",
+    bookingCode: searchParams.bookingCode ?? "",
     hotel: hotelData?.hotel.id ?? "",
     city: hotelData?.hotel.cityName ?? "",
   }
 
-  return <BookingWidget bookingWidgetSearchParams={bookingWidgetSearchParams} />
+  const booking = parseBookingWidgetSearchParams(bookingWidgetSearchParams)
+
+  return <BookingWidget booking={booking} />
 }

apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx

@@ -1,12 +1,14 @@
 import { BookingWidget } from "@/components/BookingWidget"
+import { parseBookingWidgetSearchParams } from "@/utils/url"
 
-import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
-import type { LangParams, PageArgs } from "@/types/params"
+import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
 
 export default async function BookingWidgetPage(
-  props: PageArgs<LangParams, BookingWidgetSearchData>
+  props: PageArgs<LangParams, NextSearchParams>
 ) {
   const searchParams = await props.searchParams
 
-  return <BookingWidget bookingWidgetSearchParams={searchParams} />
+  const booking = parseBookingWidgetSearchParams(searchParams)
+
+  return <BookingWidget booking={booking} />
 }

apps/scandic-web/app/[lang]/(live)/@bookingwidget/page.tsx

@@ -1,16 +1,20 @@
 import { env } from "@/env/server"
 
 import { BookingWidget } from "@/components/BookingWidget"
+import { parseBookingWidgetSearchParams } from "@/utils/url"
 
-import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
-import type { LangParams, PageArgs } from "@/types/params"
+import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
 
-export default async function BookingWidgetPage(props: PageArgs<LangParams, BookingWidgetSearchData>) {
-  const params = await props.params;
-  const searchParams = await props.searchParams;
+export default async function BookingWidgetPage(
+  props: PageArgs<LangParams, NextSearchParams>
+) {
+  const params = await props.params
+  const searchParams = await props.searchParams
   if (!env.isLangLive(params.lang)) {
     return null
   }
 
-  return <BookingWidget bookingWidgetSearchParams={searchParams} />
+  const booking = parseBookingWidgetSearchParams(searchParams)
+
+  return <BookingWidget booking={booking} />
 }