From 02cae62e578ccd00539e3391c543545ba00f1cc8 Mon Sep 17 00:00:00 2001 From: "Chuma Mcphoy (We Ahead)" Date: Fri, 4 Apr 2025 12:18:06 +0000 Subject: [PATCH] Merged in fix/SW-2138-include-hotel-content-in-destination-city-page (pull request #1733) fix(SW-2138): include hotel content descriptions in hotel data retrieval * fix(SW-2138): include hotel content descriptions in hotel data retrieval * fix(SW-2136 ): simplify hotel description handling * refactor(SW-2136): replace Body component with Typography for hotel descriptions in HotelListingItem Approved-by: Christian Andolf --- .../HotelListing/HotelListingItem/index.tsx | 8 ++++++-- apps/scandic-web/server/routers/hotels/output.ts | 3 ++- apps/scandic-web/server/routers/hotels/utils.ts | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/scandic-web/components/ContentType/DestinationPage/HotelListing/HotelListingItem/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/HotelListing/HotelListingItem/index.tsx index 05e0447b1..0cf9fbe8d 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/HotelListing/HotelListingItem/index.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/HotelListing/HotelListingItem/index.tsx @@ -10,6 +10,7 @@ import { MaterialIcon, TripadvisorIcon, } from "@scandic-hotels/design-system/Icons" +import { Typography } from "@scandic-hotels/design-system/Typography" import { useDestinationPageHotelsMapStore } from "@/stores/destination-page-hotels-map" @@ -17,7 +18,6 @@ import { FacilityToIcon } from "@/components/ContentType/HotelPage/data" import ImageGallery from "@/components/ImageGallery" import Button from "@/components/TempDesignSystem/Button" import Divider from "@/components/TempDesignSystem/Divider" -import Body from "@/components/TempDesignSystem/Text/Body" import Caption from "@/components/TempDesignSystem/Text/Caption" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" import { mapApiImagesToGalleryImages } from "@/utils/imageGallery" @@ -84,7 +84,11 @@ export default function HotelListingItem(data: DestinationPagesHotelData) { - {hotel.hotelContent?.texts.descriptions?.short} + {hotel.hotelDescription ? ( + +

{hotel.hotelDescription}

+ + ) : null}