Merged in feat/SW-1077-enter-details-edit-room (pull request #1360)

Feat/SW-1077 enter details edit room

* feat(SW-1077): persist state when changing rooms

* fix: issue with step state when closing accordion and transition to correct room when modifying step


Approved-by: Pontus Dreij

components/HotelReservation/EnterDetails/Payment/PaymentCallback/index.tsx

@@ -9,7 +9,7 @@ import LoadingSpinner from "@/components/LoadingSpinner"
 import { trackPaymentEvent } from "@/utils/tracking"
 import { convertObjToSearchParams } from "@/utils/url"
 
-// import type { PersistedState } from "@/types/stores/enter-details"
+import type { PersistedState } from "@/types/stores/enter-details"
 
 export default function PaymentCallback({
   returnUrl,
@@ -28,7 +28,7 @@ export default function PaymentCallback({
     const bookingData = window.sessionStorage.getItem(detailsStorageName)
 
     if (bookingData) {
-      const detailsStorage: any = JSON.parse(bookingData) // TODO: fix type here
+      const detailsStorage: PersistedState = JSON.parse(bookingData)
       const searchParams = convertObjToSearchParams(
         detailsStorage.booking,
         searchObject

components/HotelReservation/EnterDetails/SectionAccordion/index.tsx

@@ -78,16 +78,14 @@ export default function SectionAccordion({
 
   function close() {
     setIsOpen(false)
-    const isLastStep = step === StepEnum.details
-    const hasNextRoom = roomIndex + 1 <= roomStatuses.length
 
-    if (!isLastStep) {
-      const nextStep = selectNextStep(roomStatus)
-      if (nextStep) {
-        setStep(nextStep, roomIndex)
-      }
-    } else if (isLastStep && hasNextRoom) {
-      setStep(StepEnum.selectBed, roomIndex + 1)
+    const nextRoom = roomStatuses.find((room) => !room.isComplete)
+    const nextStep = nextRoom
+      ? Object.values(nextRoom.steps).find((step) => !step.isValid)?.step
+      : null
+
+    if (nextRoom !== undefined && nextStep !== undefined) {
+      setStep(nextStep, roomStatuses.indexOf(nextRoom))
     } else {
       // Time for payment, collapse any open step
       setStep(null)

components/HotelReservation/EnterDetails/SelectedRoom/index.tsx

@@ -36,9 +36,7 @@ export default function SelectedRoom({
   function changeRoom() {
     modifyRate(roomIndex)
     startTransition(() => {
-      const newSearchParams = new URLSearchParams(searchParamsStr)
-      newSearchParams.set("modifyRateIndex", roomIndex.toString())
-      router.push(`${selectRate(lang)}?${newSearchParams.toString()}`)
+      router.push(`${selectRate(lang)}?${searchParamsStr}`)
     })
   }