Merged in fix/allow-single-rateCode (pull request #1438)

fix: allow rates that only have either of member or public to be selectable

* fix: allow rates that only have either of member or public to be selectable


Approved-by: Michael Zetterberg

apps/scandic-web/types/components/hotelReservation/enterDetails/details.ts

@@ -27,6 +27,6 @@ export type JoinScandicFriendsCardProps = {
 }
 
 export type RoomRate = {
-  publicRate: Product["productType"]["public"]
-  memberRate?: Product["productType"]["member"]
+  memberRate?: Product["member"]
+  publicRate?: Product["public"]
 }

apps/scandic-web/types/components/hotelReservation/selectRate/flexibilityOption.ts

@@ -15,7 +15,6 @@ export type RoomPriceSchema = z.output<typeof priceSchema>
 
 export type FlexibilityOptionProps = {
   features: RoomConfiguration["features"]
-  isSelected: boolean
   paymentTerm: string
   petRoomPackage: RoomPackage | undefined
   priceInformation?: Array<string>

apps/scandic-web/types/components/hotelReservation/selectRate/selectRate.ts

@@ -28,20 +28,36 @@ export interface SelectRateSearchParams {
   toDate: string
 }
 
-export interface Rate {
+export type Rate = {
   features: RoomConfiguration["features"]
-  member?: Product["productType"]["member"]
   package?: RoomPackageCodeEnum | undefined
   priceName?: string
   priceTerm?: string
-  public: Product["productType"]["public"]
+  rate: "change" | "flex" | "save"
   roomRates?: {
     rate: Rate
     roomIndex: number
   }[]
   roomType: RoomConfiguration["roomType"]
   roomTypeCode: RoomConfiguration["roomTypeCode"]
-}
+} & (
+  | {
+      member?: undefined
+      public?: undefined
+    }
+  | {
+      member?: never
+      public: NonNullable<Product["public"]>
+    }
+  | {
+      member: NonNullable<Product["member"]>
+      public?: never
+    }
+  | {
+      member: NonNullable<Product["member"]>
+      public: NonNullable<Product["public"]>
+    }
+)
 
 export type RateCode = {
   publicRateCode: string

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

@@ -33,6 +33,11 @@ export interface InitialRoomData {
   roomTypeCode: string
 }
 
+export type RoomStep = {
+  step: StepEnum
+  isValid: boolean
+}
+
 export interface RoomState {
   currentStep: StepEnum | null
   isComplete: boolean
@@ -89,19 +94,3 @@ export type PersistedState = {
   booking: SelectRateSearchParams
   rooms: RoomState[]
 }
-
-export type RoomStep = {
-  step: StepEnum
-  isValid: boolean
-}
-
-export type RoomStatus = {
-  isComplete: boolean
-  currentStep: StepEnum | null
-  lastCompletedStep: StepEnum | undefined
-  steps: {
-    [StepEnum.selectBed]: RoomStep
-    [StepEnum.breakfast]?: RoomStep
-    [StepEnum.details]: RoomStep
-  }
-}