feat(sw-453): fixed pr comments and default filter

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx

@@ -1,3 +1,5 @@
+import { notFound } from "next/navigation"
+
 import { getProfileSafely } from "@/lib/trpc/memoizedRequests"
 import { serverClient } from "@/lib/trpc/server"
 
@@ -17,10 +19,16 @@ export default async function SelectRatePage({
   setLang(params.lang)
 
   const selectRoomParams = new URLSearchParams(searchParams)
+  console.log(selectRoomParams)
   const selectRoomParamsObject =
     getHotelReservationQueryParams(selectRoomParams)
-  const adults = selectRoomParamsObject.room?.[0].adults // TODO: Handle multiple rooms
-  const children = selectRoomParamsObject.room?.[0].child?.length // TODO: Handle multiple rooms
+
+  if (!selectRoomParamsObject.room) {
+    return notFound()
+  }
+
+  const adults = selectRoomParamsObject.room[0].adults // TODO: Handle multiple rooms
+  const children = selectRoomParamsObject.room[0].child?.length // TODO: Handle multiple rooms
 
   const [hotelData, roomsAvailability, packages, user] = await Promise.all([
     serverClient().hotel.hotelData.get({
@@ -42,9 +50,9 @@ export default async function SelectRatePage({
       adults: adults,
       children: children,
       packageCodes: [
-        RoomPackageCodeEnum.ACCE,
-        RoomPackageCodeEnum.PETR,
-        RoomPackageCodeEnum.ALLG,
+        RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
+        RoomPackageCodeEnum.PET_ROOM,
+        RoomPackageCodeEnum.ALLERGY_ROOM,
       ],
     }),
     getProfileSafely(),

components/HotelReservation/SelectRate/RoomFilter/index.tsx

@@ -17,7 +17,7 @@ import { getIconForFeatureCode } from "../utils"
 import styles from "./roomFilter.module.css"
 
 import {
-  RoomFilterProps,
+  type RoomFilterProps,
   RoomPackageCodeEnum,
 } from "@/types/components/hotelReservation/selectRate/roomFilter"
 
@@ -47,8 +47,8 @@ export default function RoomFilter({
   })
 
   const { watch, getValues, handleSubmit } = methods
-  const petFriendly = watch(RoomPackageCodeEnum.PETR)
-  const allergyFriendly = watch(RoomPackageCodeEnum.ALLG)
+  const petFriendly = watch(RoomPackageCodeEnum.PET_ROOM)
+  const allergyFriendly = watch(RoomPackageCodeEnum.ALLERGY_ROOM)
 
   const selectedFilters = useMemo(() => getValues(), [getValues])
 
@@ -104,8 +104,10 @@ export default function RoomFilter({
                 key={option.code}
                 label={intl.formatMessage({ id: option.description })}
                 disabled={
-                  (option.code === RoomPackageCodeEnum.ALLG && petFriendly) ||
-                  (option.code === RoomPackageCodeEnum.PETR && allergyFriendly)
+                  (option.code === RoomPackageCodeEnum.ALLERGY_ROOM &&
+                    petFriendly) ||
+                  (option.code === RoomPackageCodeEnum.PET_ROOM &&
+                    allergyFriendly)
                 }
                 selected={getValues(option.code)}
                 Icon={getIconForFeatureCode(option.code)}

components/HotelReservation/SelectRate/RoomSelection/RateSummary/index.tsx

@@ -1,3 +1,4 @@
+import { differenceInCalendarDays } from "date-fns"
 import { useIntl } from "react-intl"
 
 import Button from "@/components/TempDesignSystem/Button"
@@ -27,12 +28,12 @@ export default function RateSummary({
   } = rateSummary
   const priceToShow = isUserLoggedIn ? member : publicRate
 
-  const isPetRoomSelect = features.some(
-    (feature) => feature.code === RoomPackageCodeEnum.PETR
+  const isPetRoomSelected = features.some(
+    (feature) => feature.code === RoomPackageCodeEnum.PET_ROOM
   )
 
   const petRoomPackage = packages.find(
-    (pkg) => pkg.code === RoomPackageCodeEnum.PETR
+    (pkg) => pkg.code === RoomPackageCodeEnum.PET_ROOM
   )
 
   const petRoomPrice = petRoomPackage?.calculatedPrice ?? null
@@ -40,9 +41,7 @@ export default function RateSummary({
 
   const checkInDate = new Date(roomsAvailability.checkInDate)
   const checkOutDate = new Date(roomsAvailability.checkOutDate)
-  const nights = Math.ceil(
-    (checkOutDate.getTime() - checkInDate.getTime()) / (1000 * 60 * 60 * 24)
-  )
+  const nights = differenceInCalendarDays(checkOutDate, checkInDate)
 
   return (
     <div className={styles.summary}>
@@ -94,7 +93,7 @@ export default function RateSummary({
             )}
           </Footnote>
         </div>
-        {isPetRoomSelect && (
+        {isPetRoomSelected && (
           <div className={styles.petInfo}>
             <Body color="uiTextHighContrast" textTransform="bold">
               + {petRoomPrice} {petRoomCurrency}

components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx

@@ -27,20 +27,18 @@ export default function RoomCard({
 }: RoomCardProps) {
   const intl = useIntl()
 
-  // TODO: Update string when API has decided
-  const rateTypes = {
-    saveRate: "NonCancellable",
-    changeRate: "Modifiable",
-    flexRate: "CancellableBefore6PM",
+  const rates = {
+    saveRate: rateDefinitions.find(
+      (rate) => rate.cancellationRule === "NonCancellable"
+    ),
+    changeRate: rateDefinitions.find(
+      (rate) => rate.cancellationRule === "Modifiable"
+    ),
+    flexRate: rateDefinitions.find(
+      (rate) => rate.cancellationRule === "CancellableBefore6PM"
+    ),
   }
 
-  const rates = Object.fromEntries(
-    Object.entries(rateTypes).map(([key, rule]) => [
-      key,
-      rateDefinitions.find((rate) => rate.cancellationRule === rule),
-    ])
-  )
-
   function findProductForRate(rate: RateDefinition | undefined) {
     return rate
       ? roomConfiguration.products.find(

components/HotelReservation/SelectRate/RoomSelection/index.tsx

@@ -8,8 +8,8 @@ import getHotelReservationQueryParams from "./utils"
 
 import styles from "./roomSelection.module.css"
 
-import { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
-import { Rate } from "@/types/components/hotelReservation/selectRate/selectRate"
+import type { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
+import type { Rate } from "@/types/components/hotelReservation/selectRate/selectRate"
 
 export default function RoomSelection({
   roomsAvailability,

components/HotelReservation/SelectRate/Rooms/index.tsx

@@ -1,6 +1,6 @@
 "use client"
 
-import { useCallback,useState } from "react"
+import { useCallback, useState } from "react"
 
 import { RoomsAvailability } from "@/server/routers/hotels/output"
 
@@ -9,8 +9,7 @@ import RoomSelection from "../RoomSelection"
 
 import styles from "./rooms.module.css"
 
-import { RoomPackageCodes } from "@/types/components/hotelReservation/selectRate/roomFilter"
-import { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
+import type { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
 
 export default function Rooms({
   roomsAvailability,
@@ -18,26 +17,35 @@ export default function Rooms({
   user,
   packages,
 }: RoomSelectionProps) {
-  const [rooms, setRooms] = useState<RoomsAvailability>(roomsAvailability)
+  const defaultRooms = roomsAvailability.roomConfigurations.filter(
+    (room) => room.features.length === 0
+  )
+  const [rooms, setRooms] = useState<RoomsAvailability>({
+    ...roomsAvailability,
+    roomConfigurations: defaultRooms,
+  })
+
+  console.log(rooms)
 
   const handleFilter = useCallback(
     (filter: Record<string, boolean | undefined>) => {
       const selectedCodes = Object.keys(filter).filter((key) => filter[key])
 
       if (selectedCodes.length === 0) {
-        setRooms(roomsAvailability)
+        setRooms({
+          ...roomsAvailability,
+          roomConfigurations: defaultRooms,
+        })
         return
       }
 
       const filteredRooms = roomsAvailability.roomConfigurations.filter(
         (room) =>
-          room.features.some((feature) =>
-            selectedCodes.includes(feature.code as RoomPackageCodes)
-          )
+          room.features.some((feature) => selectedCodes.includes(feature.code))
       )
       setRooms({ ...roomsAvailability, roomConfigurations: filteredRooms })
     },
-    [roomsAvailability]
+    [roomsAvailability, defaultRooms]
   )
 
   return (

components/HotelReservation/SelectRate/utils.ts

@@ -1,17 +1,17 @@
-import { AllergyIcon,PetsIcon, WheelchairIcon } from "@/components/Icons"
+import { AllergyIcon, PetsIcon, WheelchairIcon } from "@/components/Icons"
 
 import {
   RoomPackageCodeEnum,
-  RoomPackageCodes,
+  type RoomPackageCodes,
 } from "@/types/components/hotelReservation/selectRate/roomFilter"
 
 export function getIconForFeatureCode(featureCode: RoomPackageCodes) {
   switch (featureCode) {
-    case RoomPackageCodeEnum.ACCE:
+    case RoomPackageCodeEnum.ACCESSIBILITY_ROOM:
       return WheelchairIcon
-    case RoomPackageCodeEnum.ALLG:
+    case RoomPackageCodeEnum.ALLERGY_ROOM:
       return AllergyIcon
-    case RoomPackageCodeEnum.PETR:
+    case RoomPackageCodeEnum.PET_ROOM:
       return PetsIcon
     default:
       return PetsIcon

i18n/dictionaries/da.json

@@ -7,6 +7,7 @@
   "ALLG": "Allergi",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "About the hotel",
+  "Accessibility": "Tilgængelighed",
   "Accessible Room": "Tilgængelighedsrum",
   "Activities": "Aktiviteter",
   "Add code": "Tilføj kode",
@@ -357,12 +358,14 @@
   "Zoom in": "Zoom ind",
   "Zoom out": "Zoom ud",
   "as of today": "pr. dags dato",
+  "booking.accommodatesUpTo": "Plads til {nrOfGuests, plural, one {# person} other {op til # personer}}",
   "booking.adults": "{totalAdults, plural, one {# voksen} other {# voksne}}",
   "booking.children": "{totalChildren, plural, one {# barn} other {# børn}}",
   "booking.guests": "Maks {nrOfGuests, plural, one {# gæst} other {# gæster}}",
   "booking.nights": "{totalNights, plural, one {# nat} other {# nætter}}",
   "booking.rooms": "{totalRooms, plural, one {# værelse} other {# værelser}}",
   "booking.terms": "Ved at betale med en af de tilgængelige betalingsmetoder, accepterer jeg vilkårene for denne booking og de generelle <termsLink>Vilkår og betingelser</termsLink>, og forstår, at Scandic vil behandle min personlige data i forbindelse med denne booking i henhold til <privacyLink>Scandics Privatlivspolitik</privacyLink>. Jeg accepterer, at Scandic kræver et gyldigt kreditkort under min besøg i tilfælde af, at noget er tilbagebetalt.",
+  "booking.thisRoomIsEquippedWith": "Dette værelse er udstyret med",
   "by": "inden",
   "characters": "tegn",
   "guest": "gæst",
@@ -385,6 +388,7 @@
   "spendable points expiring by": "{points} Brugbare point udløber den {date}",
   "to": "til",
   "uppercase letter": "stort bogstav",
+  "{amount} out of {total}": "{amount} ud af {total}",
   "{amount} {currency}": "{amount} {currency}",
   "{difference}{amount} {currency}": "{difference}{amount} {currency}",
   "{width} cm × {length} cm": "{width} cm × {length} cm"

i18n/dictionaries/de.json

@@ -7,6 +7,7 @@
   "ALLG": "Allergie",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Über das Hotel",
+  "Accessibility": "Zugänglichkeit",
   "Accessible Room": "Barrierefreies Zimmer",
   "Activities": "Aktivitäten",
   "Add code": "Code hinzufügen",
@@ -358,12 +359,14 @@
   "Zoom in": "Vergrößern",
   "Zoom out": "Verkleinern",
   "as of today": "Stand heute",
+  "booking.accommodatesUpTo": "Bietet Platz für {nrOfGuests, plural, one {# Person } other {bis zu # Personen}}",
   "booking.adults": "{totalAdults, plural, one {# erwachsene} other {# erwachsene}}",
   "booking.children": "{totalChildren, plural, one {# kind} other {# kinder}}",
   "booking.guests": "Max {nrOfGuests, plural, one {# gast} other {# gäste}}",
   "booking.nights": "{totalNights, plural, one {# nacht} other {# Nächte}}",
   "booking.rooms": "{totalRooms, plural, one {# zimmer} other {# räume}}",
   "booking.terms": "Ved at betale med en af de tilgængelige betalingsmetoder, accepterer jeg vilkårene for denne booking og de generelle <termsLink>Vilkår og betingelser</termsLink>, og forstår, at Scandic vil behandle min personlige data i forbindelse med denne booking i henhold til <privacyLink>Scandics Privatlivspolitik</privacyLink>. Jeg accepterer, at Scandic kræver et gyldigt kreditkort under min besøg i tilfælde af, at noget er tilbagebetalt.",
+  "booking.thisRoomIsEquippedWith": "Dieses Zimmer ist ausgestattet mit",
   "by": "bis",
   "characters": "figuren",
   "guest": "gast",
@@ -386,6 +389,7 @@
   "spendable points expiring by": "{points} Einlösbare punkte verfallen bis zum {date}",
   "to": "zu",
   "uppercase letter": "großbuchstabe",
+  "{amount} out of {total}": "{amount} von {total}",
   "{amount} {currency}": "{amount} {currency}",
   "{difference}{amount} {currency}": "{difference}{amount} {currency}",
   "{width} cm × {length} cm": "{width} cm × {length} cm"

i18n/dictionaries/en.json

@@ -7,6 +7,7 @@
   "ALLG": "Allergy",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "About the hotel",
+  "Accessibility": "Accessibility",
   "Accessible Room": "Accessibility room",
   "Activities": "Activities",
   "Add Room": "Add room",

i18n/dictionaries/fi.json

@@ -7,6 +7,7 @@
   "ALLG": "Allergia",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Tietoja hotellista",
+  "Accessibility": "Saavutettavuus",
   "Accessible Room": "Esteetön huone",
   "Activities": "Aktiviteetit",
   "Add code": "Lisää koodi",
@@ -358,12 +359,14 @@
   "Zoom in": "Lähennä",
   "Zoom out": "Loitonna",
   "as of today": "tänään",
+  "booking.accommodatesUpTo": "Huoneeseen {nrOfGuests, plural, one {# person} other {mahtuu 2 henkilöä}}",
   "booking.adults": "{totalAdults, plural, one {# aikuinen} other {# aikuiset}}",
   "booking.children": "{totalChildren, plural, one {# lapsi} other {# lasta}}",
   "booking.guests": "Max {nrOfGuests, plural, one {# vieras} other {# vieraita}}",
   "booking.nights": "{totalNights, plural, one {# yö} other {# yötä}}",
   "booking.rooms": "{totalRooms, plural, one {# huone} other {# sviitti}}",
   "booking.terms": "Maksamalla minkä tahansa saatavilla olevan maksutavan avulla hyväksyn tämän varauksen ehdot ja yleiset <termsLink>ehdot ja ehtoja</termsLink>, ja ymmärrän, että Scandic käsittelee minun henkilötietoni tässä varauksessa mukaisesti <privacyLink>Scandicin tietosuojavaltuuden</privacyLink> mukaisesti. Hyväksyn myös, että Scandic vaatii validin luottokortin majoituksen ajan, jos jokin jää maksamatta.",
+  "booking.thisRoomIsEquippedWith": "Tämä huone on varustettu",
   "by": "mennessä",
   "characters": "hahmoja",
   "guest": "Vieras",
@@ -386,6 +389,7 @@
   "spendable points expiring by": "{points} pistettä vanhenee {date} mennessä",
   "to": "to",
   "uppercase letter": "iso kirjain",
+  "{amount} out of {total}": "{amount}/{total}",
   "{amount} {currency}": "{amount} {currency}",
   "{difference}{amount} {currency}": "{difference}{amount} {currency}",
   "{width} cm × {length} cm": "{width} cm × {length} cm"

i18n/dictionaries/no.json

@@ -7,6 +7,7 @@
   "ALLG": "Allergi",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Om hotellet",
+  "Accessibility": "Tilgjengelighet",
   "Accessible Room": "Tilgjengelighetsrom",
   "Activities": "Aktiviteter",
   "Add code": "Legg til kode",
@@ -355,11 +356,13 @@
   "Zoom in": "Zoom inn",
   "Zoom out": "Zoom ut",
   "as of today": "per i dag",
+  "booking.accommodatesUpTo": "Plass til {nrOfGuests, plural, one {# person} other {opptil # personer}}",
   "booking.adults": "{totalAdults, plural, one {# voksen} other {# voksne}}",
   "booking.children": "{totalChildren, plural, one {# barn} other {# barn}}",
   "booking.guests": "Maks {nrOfGuests, plural, one {# gjest} other {# gjester}}",
   "booking.nights": "{totalNights, plural, one {# natt} other {# netter}}",
   "booking.rooms": "{totalRooms, plural, one {# rom} other {# rom}}",
+  "booking.thisRoomIsEquippedWith": "Dette rommet er utstyrt med",
   "by": "innen",
   "characters": "tegn",
   "guest": "gjest",
@@ -382,6 +385,7 @@
   "spendable points expiring by": "{points} Brukbare poeng utløper innen {date}",
   "to": "til",
   "uppercase letter": "stor bokstav",
+  "{amount} out of {total}": "{amount} av {total}",
   "{amount} {currency}": "{amount} {currency}",
   "{difference}{amount} {currency}": "{difference}{amount} {currency}",
   "{width} cm × {length} cm": "{width} cm × {length} cm"

i18n/dictionaries/sv.json

@@ -7,6 +7,7 @@
   "ALLG": "Allergi",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Om hotellet",
+  "Accessibility": "Tillgänglighet",
   "Accessible Room": "Tillgänglighetsrum",
   "Activities": "Aktiviteter",
   "Add code": "Lägg till kod",

server/routers/hotels/output.ts

@@ -550,9 +550,9 @@ const roomConfigurationSchema = z.object({
     z.object({
       inventory: z.number(),
       code: z.enum([
-        RoomPackageCodeEnum.PETR,
-        RoomPackageCodeEnum.ALLG,
-        RoomPackageCodeEnum.ACCE,
+        RoomPackageCodeEnum.PET_ROOM,
+        RoomPackageCodeEnum.ALLERGY_ROOM,
+        RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
       ]),
     })
   ),

server/routers/hotels/schemas/packages.ts

@@ -14,9 +14,9 @@ export const getRoomPackagesInputSchema = z.object({
 const packagesSchema = z.array(
   z.object({
     code: z.enum([
-      RoomPackageCodeEnum.PETR,
-      RoomPackageCodeEnum.ALLG,
-      RoomPackageCodeEnum.ACCE,
+      RoomPackageCodeEnum.PET_ROOM,
+      RoomPackageCodeEnum.ALLERGY_ROOM,
+      RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
     ]),
     itemCode: z.string(),
     description: z.string(),

types/components/hotelReservation/selectRate/roomCard.ts

@@ -3,7 +3,6 @@ import {
   RoomConfiguration,
 } from "@/server/routers/hotels/output"
 
-import { RoomPackageCodes } from "./roomFilter"
 import { Rate } from "./selectRate"
 
 import { RoomData } from "@/types/hotel"

types/components/hotelReservation/selectRate/roomFilter.ts

@@ -3,9 +3,9 @@ import { z } from "zod"
 import { getRoomPackagesSchema } from "@/server/routers/hotels/schemas/packages"
 
 export enum RoomPackageCodeEnum {
-  PETR = "PETR",
-  ALLG = "ALLG",
-  ACCE = "ACCE",
+  PET_ROOM = "PETR",
+  ALLERGY_ROOM = "ALLG",
+  ACCESSIBILITY_ROOM = "ACCE",
 }
 export interface RoomFilterProps {
   numberOfRooms: number