From 1009ea87c902d13fc4e224c355ee4c3106e679bd Mon Sep 17 00:00:00 2001 From: Tobias Johansson Date: Mon, 10 Mar 2025 08:32:14 +0000 Subject: [PATCH] Merged in fix/SW-1686-show-correct-room-availabilty-number (pull request #1491) fix: filter to only show available rooms in roomFilter * fix: filter to only show available rooms in roomFilter Approved-by: Niclas Edenvin --- .../Rooms/RoomSelectionPanel/RoomTypeFilter/index.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomSelectionPanel/RoomTypeFilter/index.tsx b/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomSelectionPanel/RoomTypeFilter/index.tsx index bacb20870..cf6554c91 100644 --- a/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomSelectionPanel/RoomTypeFilter/index.tsx +++ b/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomSelectionPanel/RoomTypeFilter/index.tsx @@ -13,6 +13,7 @@ import { useRoomContext } from "@/contexts/SelectRate/Room" import styles from "./roomFilter.module.css" +import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel" import type { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter" export default function RoomTypeFilter() { @@ -25,6 +26,10 @@ export default function RoomTypeFilter() { } = useRoomContext() const intl = useIntl() + const availableRooms = rooms.filter( + (r) => r.status === AvailabilityEnum.Available + ).length + // const tooltipText = intl.formatMessage({ // id: "Pet-friendly rooms have an additional fee of 20 EUR per stay", // }) @@ -43,7 +48,7 @@ export default function RoomTypeFilter() { id: "{availableRooms}/{numberOfRooms, plural, one {# room type} other {# room types}} available", }, { - availableRooms: rooms.length, + availableRooms: availableRooms, numberOfRooms: totalRooms, } ) @@ -60,7 +65,7 @@ export default function RoomTypeFilter() { return (
- {rooms.length !== totalRooms + {availableRooms !== totalRooms ? notAllRoomsAvailableText : allRoomsAvailableText}