Merged in fix/Sw-2849-update-sidepeek-select-rate (pull request #2406)

fix(SW-2849): use same sidepeek on select rate as on select hotel

* fix(SW-2849): use same sidepeek on select rate as on select hotel

* fix(SW-2849): remove ameneties sidepeek enum


Approved-by: Erik Tiekstra

apps/scandic-web/components/HotelReservation/SelectRate/HotelInfoCard/HotelDescription/index.tsx

@@ -75,7 +75,7 @@ export default function HotelDescription({
             })}
             hotelId={hotel.operaId}
             showCTA={false}
-            sidePeekKey={SidePeekEnum.amenities}
+            sidePeekKey={SidePeekEnum.hotelDetails}
           />
           {hotel.specialAlerts.map((alert) => (
             <Alert

apps/scandic-web/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx

@@ -89,7 +89,7 @@ export default async function HotelInfoCard({ hotel }: HotelInfoCardProps) {
               })}
               hotelId={hotel.operaId}
               showCTA={false}
-              sidePeekKey={SidePeekEnum.amenities}
+              sidePeekKey={SidePeekEnum.hotelDetails}
             />
           </div>
         </div>

apps/scandic-web/components/HotelReservation/SidePeek/index.tsx

@@ -5,7 +5,6 @@ import { useEffect } from "react"
 import { trpc } from "@/lib/trpc/client"
 import useSidePeekStore from "@/stores/sidepeek"
 
-import AmenitiesSidePeek from "@/components/SidePeeks/AmenitiesSidePeek"
 import HotelSidePeek from "@/components/SidePeeks/HotelSidePeek"
 import RoomSidePeek from "@/components/SidePeeks/RoomSidePeek"
 import useLang from "@/hooks/useLang"
@@ -61,23 +60,14 @@ export default function HotelReservationSidePeek() {
     return (
       <>
         {hotelData && (
-          <>
+          <HotelSidePeek
-            <HotelSidePeek
+            additionalHotelData={hotelData.additionalData}
-              additionalHotelData={hotelData.additionalData}
+            hotel={{ ...hotelData.hotel, url: hotelData.url }}
-              hotel={{ ...hotelData.hotel, url: hotelData.url }}
+            restaurants={hotelData.restaurants}
-              restaurants={hotelData.restaurants}
+            activeSidePeek={activeSidePeek}
-              activeSidePeek={activeSidePeek}
+            close={closeFn}
-              close={closeFn}
+            showCTA={showCTA}
-              showCTA={showCTA}
+          />
-            />
-            <AmenitiesSidePeek
-              hotel={{ ...hotelData.hotel, url: hotelData.url }}
-              restaurants={hotelData.restaurants}
-              additionalHotelData={hotelData.additionalData}
-              activeSidePeek={activeSidePeek}
-              close={closeFn}
-            />
-          </>
         )}
         {selectedRoom && (
           <RoomSidePeek

apps/scandic-web/components/SidePeeks/AmenitiesSidePeek/amenitiesSidePeek.module.css

@@ -1,3 +0,0 @@
-.button {
-  margin-top: var(--Space-x2);
-}

apps/scandic-web/components/SidePeeks/AmenitiesSidePeek/index.tsx

@@ -1,65 +0,0 @@
-"use client"
-
-import { useIntl } from "react-intl"
-
-import ButtonLink from "@/components/ButtonLink"
-import AdditionalAmenities from "@/components/SidePeeks/AmenitiesSidepeekContent/AdditionalAmenities"
-import Accordion from "@/components/TempDesignSystem/Accordion"
-import SidePeek from "@/components/TempDesignSystem/SidePeek"
-
-import AccessibilityAccordionItem from "../AmenitiesSidepeekContent/Accordions/Accessibility"
-import BreakfastAccordionItem from "../AmenitiesSidepeekContent/Accordions/Breakfast"
-import CheckInCheckOutAccordionItem from "../AmenitiesSidepeekContent/Accordions/CheckInCheckOut"
-import ParkingAccordionItem from "../AmenitiesSidepeekContent/Accordions/Parking"
-
-import styles from "./amenitiesSidePeek.module.css"
-
-import type { AmenitiesSidePeekProps } from "@/types/components/hotelReservation/amenitiesSidePeek"
-import { SidePeekEnum } from "@/types/components/hotelReservation/sidePeek"
-
-export default function AmenitiesSidePeek({
-  hotel,
-  restaurants,
-  additionalHotelData,
-  activeSidePeek,
-  close,
-}: AmenitiesSidePeekProps) {
-  const intl = useIntl()
-
-  return (
-    <SidePeek
-      title={intl.formatMessage({ defaultMessage: "Amenities" })}
-      isOpen={activeSidePeek === SidePeekEnum.amenities}
-      handleClose={close}
-    >
-      <Accordion>
-        <ParkingAccordionItem
-          parking={hotel.parking}
-          elevatorPitch={additionalHotelData?.hotelParking.elevatorPitch}
-        />
-        <BreakfastAccordionItem
-          restaurants={restaurants}
-          hotelType={hotel.hotelType}
-        />
-        <CheckInCheckOutAccordionItem checkInData={hotel.hotelFacts.checkin} />
-        <AccessibilityAccordionItem
-          elevatorPitch={additionalHotelData?.hotelSpecialNeeds.elevatorPitch}
-        />
-        <AdditionalAmenities amenities={hotel.detailedFacilities} />
-      </Accordion>
-      {hotel.url ? (
-        <ButtonLink
-          href={hotel.url}
-          variant="Secondary"
-          size="Medium"
-          typography="Body/Paragraph/mdBold"
-          className={styles.button}
-        >
-          {intl.formatMessage({
-            defaultMessage: "Read more about the hotel",
-          })}
-        </ButtonLink>
-      ) : null}
-    </SidePeek>
-  )
-}

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

@@ -1,6 +1,5 @@
 export enum SidePeekEnum {
   hotelDetails = "hotel-detail-side-peek",
-  amenities = "amenities-side-peek",
   roomDetails = "room-detail-side-peek",
   bookedRoomDetails = "booked-room-detail-side-peek",
 }