Merge remote-tracking branch 'origin' into feature/tracking

types/components/hotelReservation/selectHotel/hotelCardListingProps.ts

@@ -1,6 +1,5 @@
-import { ProductType } from "@/server/routers/hotels/output"
-
-import { Hotel } from "@/types/hotel"
+import type { Hotel } from "@/types/hotel"
+import type { ProductType } from "@/server/routers/hotels/output"
 
 export enum HotelCardListingTypeEnum {
   MapListing = "mapListing",
@@ -10,8 +9,6 @@ export enum HotelCardListingTypeEnum {
 export type HotelCardListingProps = {
   hotelData: HotelData[]
   type?: HotelCardListingTypeEnum
-  activeCard?: string | null
-  onHotelCardHover?: (hotelName: string | null) => void
 }
 
 export type HotelData = {

types/components/hotelReservation/selectHotel/hotelCardProps.ts

@@ -1,11 +1,10 @@
 import {
-  HotelCardListingTypeEnum,
-  type HotelData,
-} from "./hotelCardListingProps"
+type 
+  HotelCardListingTypeEnum,  type HotelData} from "./hotelCardListingProps"
+
 
 export type HotelCardProps = {
   hotel: HotelData
   type?: HotelCardListingTypeEnum
   state?: "default" | "active"
-  onHotelCardHover?: (hotelName: string | null) => void
 }

types/components/hotelReservation/selectHotel/map.ts

@@ -1,19 +1,18 @@
-import { z } from "zod"
+import type { z } from "zod"
 
-import {
+import type { Coordinates } from "@/types/components/maps/coordinates"
+import type { Location } from "@/types/trpc/routers/hotel/locations"
+import type {
   imageMetaDataSchema,
   imageSizesSchema,
 } from "@/server/routers/hotels/schemas/image"
-
-import { HotelData } from "./hotelCardListingProps"
-import { CategorizedFilters, Filter } from "./hotelFilters"
-
-import type { Coordinates } from "@/types/components/maps/coordinates"
+import type { Child } from "../../bookingWidget/guestsRoomsPicker"
+import type { HotelData } from "./hotelCardListingProps"
+import type { CategorizedFilters, Filter } from "./hotelFilters"
+import type { SelectHotelSearchParams } from "./selectHotelSearchParams"
 
 export interface HotelListingProps {
   hotels: HotelData[]
-  activeHotelPin?: string | null
-  setActiveHotelPin: (hotelName: string | null) => void
 }
 
 export interface SelectHotelMapProps {
@@ -41,12 +40,11 @@ export type HotelPin = {
   amenities: Filter[]
   ratings: number | null
   operaId: string
+  facilityIds: number[]
 }
 
 export interface HotelListingMapContentProps {
-  activeHotelPin?: HotelPin["name"] | null
   hotelPins: HotelPin[]
-  onActiveHotelPinChange?: (pinName: string | null) => void
 }
 
 export interface HotelCardDialogProps {
@@ -57,6 +55,12 @@ export interface HotelCardDialogProps {
 
 export interface HotelCardDialogListingProps {
   hotels: HotelData[] | null
-  activeCard: string | null | undefined
-  onActiveCardChange: (hotelName: string | null) => void
+}
+
+export type SelectHotelMapContainerProps = {
+  city: Location
+  searchParams: SelectHotelSearchParams
+  adultsInRoom: number
+  childrenInRoom: string | undefined
+  child: Child[] | undefined
 }

types/components/hotelReservation/selectHotel/selectHotel.ts

@@ -1,4 +1,8 @@
-import { CheckInData, Hotel, ParkingData } from "@/types/hotel"
+import type { CheckInData, Hotel, ParkingData } from "@/types/hotel"
+import type { Location } from "@/types/trpc/routers/hotel/locations"
+import type { Lang } from "@/constants/languages"
+import type { Child } from "../selectRate/selectRate"
+import type { SelectHotelSearchParams } from "./selectHotelSearchParams"
 
 export enum AvailabilityEnum {
   Available = "Available",
@@ -35,3 +39,17 @@ export interface CheckInCheckOutProps {
 export interface MeetingsAndConferencesProps {
   meetingDescription: string
 }
+
+export interface SelectHotelProps {
+  city: Location
+  params: {
+    lang: Lang
+  }
+  reservationParams: {
+    selectHotelParams: URLSearchParams
+    searchParams: SelectHotelSearchParams
+    adultsParams: number
+    childrenParams: string | undefined
+    child: Child[] | undefined
+  }
+}

types/components/hotelReservation/selectRate/roomCard.ts

@@ -1,19 +1,18 @@
-import { z } from "zod"
+import type { z } from "zod"
 
-import {
+import type { RoomData } from "@/types/hotel"
+import type {
   packagePriceSchema,
   RateDefinition,
   RoomConfiguration,
 } from "@/server/routers/hotels/output"
-
-import { RoomPriceSchema } from "./flexibilityOption"
-
-import type { RoomData } from "@/types/hotel"
+import type { RoomPriceSchema } from "./flexibilityOption"
 import type { RoomPackageCodes, RoomPackageData } from "./roomFilter"
 import type { RateCode } from "./selectRate"
 
 export type RoomCardProps = {
   hotelId: string
+  hotelType: string | undefined
   roomConfiguration: RoomConfiguration
   rateDefinitions: RateDefinition[]
   roomCategories: RoomData[]

types/components/hotelReservation/selectRate/roomSelection.ts

@@ -12,6 +12,7 @@ export interface RoomSelectionProps {
   selectedPackages: RoomPackageCodes[]
   setRateCode: React.Dispatch<React.SetStateAction<RateCode | undefined>>
   rateSummary: Rate | null
+  hotelType: string | undefined
 }
 
 export interface SelectRateProps {
@@ -19,4 +20,5 @@ export interface SelectRateProps {
   roomCategories: RoomData[]
   user: SafeUser
   availablePackages: RoomPackageData
+  hotelType: string | undefined
 }

types/components/hotelReservation/signupPromo.ts

@@ -0,0 +1,9 @@
+import type { CurrencyEnum } from "@/types/enums/currency"
+
+export interface SignupPromoProps {
+  memberPrice: {
+    amount: number
+    currency: CurrencyEnum
+  }
+  badgeContent?: string
+}