feat(SW-2116): RefId instead of confirmationNumber

This commit is contained in:
Arvid Norlin
2025-04-25 13:44:49 +02:00
committed by Michael Zetterberg
parent 7eeb0bbcac
commit 74d37dad93
61 changed files with 1032 additions and 843 deletions

View File

@@ -1,9 +1,10 @@
"use client"
import { notFound } from "next/navigation"
import { use, useRef } from "react"
import { useIntl } from "react-intl"
import { trpc } from "@/lib/trpc/client"
import { type RouterOutput, trpc } from "@/lib/trpc/client"
import { createMyStayStore } from "@/stores/my-stay"
import { MyStaySkeleton } from "@/components/HotelReservation/MyStay/myStaySkeleton"
@@ -12,10 +13,7 @@ import { MyStayContext } from "@/contexts/MyStay"
import type { Packages } from "@/types/components/myPages/myStay/ancillaries"
import type { MyStayStore } from "@/types/contexts/my-stay"
import type { RoomCategories } from "@/types/hotel"
import type {
BookingConfirmation,
BookingConfirmationSchema,
} from "@/types/trpc/routers/booking/confirmation"
import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
import type { CreditCard } from "@/types/user"
import type { Lang } from "@/constants/languages"
@@ -23,7 +21,9 @@ interface MyStayProviderProps {
bookingConfirmation: BookingConfirmation
breakfastPackages: Packages | null
lang: Lang
linkedReservationsPromise: Promise<BookingConfirmationSchema[]>
linkedReservationsPromise: Promise<
RouterOutput["booking"]["linkedReservations"]
>
refId: string
roomCategories: RoomCategories
savedCreditCards: CreditCard[] | null
@@ -39,13 +39,14 @@ export default function MyStayProvider({
roomCategories,
savedCreditCards,
}: React.PropsWithChildren<MyStayProviderProps>) {
const storeRef = useRef<MyStayStore>()
const intl = useIntl()
const storeRef = useRef<MyStayStore>()
const { data, error, isFetching, isFetchedAfterMount } =
trpc.booking.get.useQuery(
trpc.booking.confirmation.useQuery(
{
confirmationNumber: bookingConfirmation.booking.confirmationNumber,
refId,
lang,
},
{
@@ -68,7 +69,7 @@ export default function MyStayProvider({
} = trpc.booking.linkedReservations.useQuery(
{
lang,
rooms: bookingConfirmation.booking.linkedReservations,
refId,
},
{
initialData: linkedReservationsResponses,
@@ -85,15 +86,16 @@ export default function MyStayProvider({
return notFound()
}
const rooms = [data.booking, ...linkedReservations]
const rooms = [data.booking].concat(linkedReservations ?? [])
const hasInvalidatedQueryAndRefetched =
(isFetchedAfterMount && data) ||
(linkedReservationsIsFetchedAfterMount && linkedReservations)
if (!storeRef.current || hasInvalidatedQueryAndRefetched) {
storeRef.current = createMyStayStore({
breakfastPackages,
hotel: bookingConfirmation.hotel,
hotel: bookingConfirmation.hotelData.hotel,
intl,
refId,
roomCategories,