Merged in fix/SW-3001-select-hotel-booking-code- (pull request #2576)

Fix/SW-3001 select hotel booking code

* fix(SW-3001): Fixed booking code filter store to reset to default state when new search triggered, Removed state as using useState resets the value on every filter change

* fix: Route tracking parsing error in select-hotel page

* fix(SW-3001): Optimized code


Approved-by: Matilda Landström

apps/scandic-web/stores/enter-details/helpers.ts

@@ -20,6 +20,7 @@ import type {
   VoucherProduct,
 } from "@scandic-hotels/trpc/types/roomAvailability"
 
+import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
 import type { BreakfastPackage } from "@/types/components/hotelReservation/breakfast"
 import { type RoomRate } from "@/types/components/hotelReservation/enterDetails/details"
 import type { Price } from "@/types/components/hotelReservation/price"
@@ -48,18 +49,18 @@ export function extractGuestFromUser(user: NonNullable<SafeUser>) {
 }
 
 export function checkIsSameBooking(
-  prev: SelectRateBooking & { errorCode?: string },
-  next: SelectRateBooking & { errorCode?: string }
+  prev: (SelectRateBooking | BookingWidgetSearchData) & { errorCode?: string },
+  next: (SelectRateBooking | BookingWidgetSearchData) & { errorCode?: string }
 ) {
   const { rooms: prevRooms, errorCode: prevErrorCode, ...prevBooking } = prev
 
   const prevRoomsWithoutRateCodes = prevRooms?.map(
-    ({ rateCode, counterRateCode, roomTypeCode, bookingCode, ...room }) => room
+    ({ adults, childrenInRoom }) => ({ adults, childrenInRoom })
   )
   const { rooms: nextRooms, errorCode: nextErrorCode, ...nextBooking } = next
 
   const nextRoomsWithoutRateCodes = nextRooms?.map(
-    ({ rateCode, counterRateCode, roomTypeCode, bookingCode, ...room }) => room
+    ({ adults, childrenInRoom }) => ({ adults, childrenInRoom })
   )
 
   return isEqual(

apps/scandic-web/stores/tracking.ts

@@ -2,7 +2,10 @@
 
 import { create } from "zustand"
 
-import { parseSelectRateSearchParams, searchParamsToRecord } from "@/utils/url"
+import {
+  parseBookingWidgetSearchParams,
+  searchParamsToRecord,
+} from "@/utils/url"
 
 import { checkIsSameBooking } from "./enter-details/helpers"
 
@@ -79,10 +82,10 @@ const useTrackingStore = create<TrackingStoreState>((set, get) => ({
     if (!currentPath?.match(/^\/(da|de|en|fi|no|sv)\/(hotelreservation)/))
       return false
 
-    const previousParamsObject = parseSelectRateSearchParams(
+    const previousParamsObject = parseBookingWidgetSearchParams(
       searchParamsToRecord(previousParams)
     )
-    const currentParamsObject = parseSelectRateSearchParams(
+    const currentParamsObject = parseBookingWidgetSearchParams(
       searchParamsToRecord(currentParams)
     )