Merged in fix/SW-1143-loading-select-hotel (pull request #1059)

fix(SW-1143): Added loading/skeleton to select hotel

Approved-by: Bianca Widstam

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/loading.tsx

@@ -1,5 +0,0 @@
-import { SelectHotelMapContainerSkeleton } from "@/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainerSkeleton"
-
-export default function Loading() {
-  return <SelectHotelMapContainerSkeleton />
-}

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

@@ -44,12 +44,17 @@ export default async function SelectHotelMapPage({
   return (
     <div className={styles.main}>
       <MapContainer>
-        <SelectHotelMapContainer
+        <Suspense
-          city={city}
+          key={city.name}
-          searchParams={searchParams}
+          fallback={<SelectHotelMapContainerSkeleton />}
-          adultsInRoom={adultsInRoom}
+        >
-          childrenInRoom={childrenInRoom}
+          <SelectHotelMapContainer
-        />
+            city={city}
+            searchParams={searchParams}
+            adultsInRoom={adultsInRoom}
+            childrenInRoom={childrenInRoom}
+          />
+        </Suspense>
       </MapContainer>
     </div>
   )

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

@@ -1,42 +1,18 @@
 import { notFound } from "next/navigation"
 import { Suspense } from "react"
 
-import {
-  selectHotel,
-  selectHotelMap,
-} from "@/constants/routes/hotelReservation"
 import { getLocations } from "@/lib/trpc/memoizedRequests"
 
-import {
+import SelectHotel from "@/components/HotelReservation/SelectHotel"
-  fetchAvailableHotels,
+import { SelectHotelSkeleton } from "@/components/HotelReservation/SelectHotel/SelectHotelSkeleton"
-  getFiltersFromHotels,
-} from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils"
-import HotelCardListing from "@/components/HotelReservation/HotelCardListing"
-import HotelCount from "@/components/HotelReservation/SelectHotel/HotelCount"
-import HotelFilter from "@/components/HotelReservation/SelectHotel/HotelFilter"
-import HotelSorter from "@/components/HotelReservation/SelectHotel/HotelSorter"
-import MobileMapButtonContainer from "@/components/HotelReservation/SelectHotel/MobileMapButtonContainer"
 import {
   generateChildrenString,
   getHotelReservationQueryParams,
 } from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
-import { ChevronRightIcon } from "@/components/Icons"
-import StaticMap from "@/components/Maps/StaticMap"
-import Alert from "@/components/TempDesignSystem/Alert"
-import Breadcrumbs from "@/components/TempDesignSystem/Breadcrumbs"
-import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton"
-import Button from "@/components/TempDesignSystem/Button"
-import Link from "@/components/TempDesignSystem/Link"
-import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
-import { getIntl } from "@/i18n"
 import { setLang } from "@/i18n/serverContext"
 
-import styles from "./page.module.css"
-
-import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
 import type { SelectHotelSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
-import { AlertTypeEnum } from "@/types/enums/alert"
+import type { LangParams, PageArgs } from "@/types/params"
-import { LangParams, PageArgs } from "@/types/params"
 
 export default async function SelectHotelPage({
   params,
@@ -55,10 +31,6 @@ export default async function SelectHotelPage({
 
   if (!city) return notFound()
 
-  const isCityWithCountry = (city: any): city is { country: string } =>
-    "country" in city
-
-  const intl = await getIntl()
   const selectHotelParams = new URLSearchParams(searchParams)
   const selectHotelParamsObject =
     getHotelReservationQueryParams(selectHotelParams)
@@ -70,121 +42,25 @@ export default async function SelectHotelPage({
     return notFound()
   }
 
-  const adults = selectHotelParamsObject.room[0].adults // TODO: Handle multiple rooms
+  const adultsParams = selectHotelParamsObject.room[0].adults // TODO: Handle multiple rooms
-  const children = selectHotelParamsObject.room[0].child
+  const childrenParams = selectHotelParamsObject.room[0].child
     ? generateChildrenString(selectHotelParamsObject.room[0].child)
     : undefined // TODO: Handle multiple rooms
 
-  const hotels = await fetchAvailableHotels({
+  const reservationParams = {
-    cityId: city.id,
+    selectHotelParams,
-    roomStayStartDate: searchParams.fromDate,
+    searchParams,
-    roomStayEndDate: searchParams.toDate,
+    adultsParams,
-    adults,
+    childrenParams,
-    children,
+  }
-  })
-
-  const validHotels = hotels.filter(
-    (hotel): hotel is HotelData => hotel !== null
-  )
-
-  const filterList = getFiltersFromHotels(validHotels)
-  const breadcrumbs = [
-    {
-      title: intl.formatMessage({ id: "Home" }),
-      href: `/${params.lang}`,
-      uid: "home-page",
-    },
-    {
-      title: intl.formatMessage({ id: "Hotel reservation" }),
-      href: `/${params.lang}/hotelreservation`,
-      uid: "hotel-reservation",
-    },
-    {
-      title: intl.formatMessage({ id: "Select hotel" }),
-      href: `${selectHotel(params.lang)}/?${selectHotelParams}`,
-      uid: "select-hotel",
-    },
-    {
-      title: city.name,
-      uid: city.id,
-    },
-  ]
-
-  const isAllUnavailable = hotels.every((hotel) => hotel.price === undefined)
 
   return (
-    <>
+    <Suspense key={city.name} fallback={<SelectHotelSkeleton />}>
-      <header className={styles.header}>
+      <SelectHotel
-        <Suspense fallback={<BreadcrumbsSkeleton />}>
+        city={city}
-          <Breadcrumbs breadcrumbs={breadcrumbs} />
+        params={params}
-        </Suspense>
+        reservationParams={reservationParams}
-        <div className={styles.title}>
+      />
-          <div className={styles.cityInformation}>
+    </Suspense>
-            <Subtitle>{city.name}</Subtitle>
-            <HotelCount />
-          </div>
-          <div className={styles.sorter}>
-            <HotelSorter discreet />
-          </div>
-        </div>
-        <MobileMapButtonContainer filters={filterList} />
-      </header>
-      <main className={styles.main}>
-        <div className={styles.sideBar}>
-          {hotels.length > 0 ? ( // TODO: Temp fix until API returns hotels that are not available
-            <Link
-              className={styles.link}
-              color="burgundy"
-              href={selectHotelMap(params.lang)}
-              keepSearchParams
-            >
-              <div className={styles.mapContainer}>
-                <StaticMap
-                  city={searchParams.city}
-                  country={isCityWithCountry(city) ? city.country : undefined}
-                  width={340}
-                  height={180}
-                  zoomLevel={11}
-                  mapType="roadmap"
-                  altText={`Map of ${searchParams.city} city center`}
-                />
-                <Button wrapping size="medium" intent="text" theme="base">
-                  {intl.formatMessage({ id: "See map" })}
-                  <ChevronRightIcon
-                    color="baseButtonTextOnFillNormal"
-                    width={20}
-                    height={20}
-                  />
-                </Button>
-              </div>
-            </Link>
-          ) : (
-            <div className={styles.mapContainer}>
-              <StaticMap
-                city={searchParams.city}
-                width={340}
-                height={180}
-                zoomLevel={11}
-                mapType="roadmap"
-                altText={`Map of ${searchParams.city} city center`}
-              />
-            </div>
-          )}
-          <HotelFilter filters={filterList} className={styles.filter} />
-        </div>
-        <div className={styles.hotelList}>
-          {isAllUnavailable && (
-            <Alert
-              type={AlertTypeEnum.Info}
-              heading={intl.formatMessage({ id: "No availability" })}
-              text={intl.formatMessage({
-                id: "There are no rooms available that match your request.",
-              })}
-            />
-          )}
-          <HotelCardListing hotelData={validHotels} />
-        </div>
-      </main>
-    </>
   )
 }

components/HotelReservation/HotelCard/HotelCardSkeleton.module.css

@@ -0,0 +1,63 @@
+.card {
+  font-size: 14px;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: var(--Corner-radius-Large);
+  border: 1px solid var(--Base-Border-Subtle);
+  position: relative;
+  height: 100%;
+  justify-content: space-between;
+  min-height: 200px;
+  flex: 1;
+  overflow: hidden;
+}
+
+.imageContainer {
+  aspect-ratio: 16/9;
+  width: 100%;
+  height: 200px;
+}
+
+.priceVariants {
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x1);
+  padding: var(--Spacing-x2);
+  flex: 1;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  gap: var(--Spacing-x1);
+  padding: var(--Spacing-x2);
+}
+
+.text {
+  display: none;
+}
+
+@media (min-width: 1367px) {
+  .content {
+    padding: var(--Spacing-x2) 0 var(--Spacing-x2) var(--Spacing-x2);
+  }
+
+  .text {
+    gap: 10px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .card {
+    flex-direction: row;
+  }
+  .imageContainer {
+    width: 315px;
+    height: 100%;
+  }
+  .priceVariants {
+    max-width: 260px;
+  }
+}

components/HotelReservation/HotelCard/HotelCardSkeleton.tsx

@@ -0,0 +1,34 @@
+import SkeletonShimmer from "@/components/SkeletonShimmer"
+
+import styles from "./HotelCardSkeleton.module.css"
+
+export function HotelCardSkeleton() {
+  return (
+    <article className={styles.card}>
+      {/* image container */}
+      <div className={styles.imageContainer}>
+        <SkeletonShimmer width={"100%"} height="100%" />
+      </div>
+
+      <div className={styles.content}>
+        <SkeletonShimmer height={"65px"} />
+        <div className={styles.text}>
+          <SkeletonShimmer height={"20px"} />
+          <SkeletonShimmer height={"20px"} />
+          <SkeletonShimmer height={"20px"} />
+          <SkeletonShimmer height={"20px"} />
+        </div>
+        <SkeletonShimmer height={"56px"} />
+        <SkeletonShimmer height={"52px"} width={"150px"} />
+      </div>
+
+      <div className={styles.priceVariants}>
+        {/* price variants */}
+        {Array.from({ length: 2 }).map((_, index) => (
+          <SkeletonShimmer key={index} height={"100px"} />
+        ))}
+        <SkeletonShimmer height={"40px"} />
+      </div>
+    </article>
+  )
+}

components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainerSkeleton.tsx

@@ -8,7 +8,7 @@ type Props = {
   count?: number
 }
 
-export async function SelectHotelMapContainerSkeleton({ count = 2 }: Props) {
+export function SelectHotelMapContainerSkeleton({ count = 2 }: Props) {
   return (
     <div className={styles.container}>
       <div className={styles.listingContainer}>

components/HotelReservation/SelectHotel/SelectHotelSkeleton.tsx

@@ -0,0 +1,44 @@
+import SkeletonShimmer from "@/components/SkeletonShimmer"
+
+import { HotelCardSkeleton } from "../HotelCard/HotelCardSkeleton"
+
+import styles from "./selectHotel.module.css"
+
+type Props = {
+  count?: number
+}
+
+export function SelectHotelSkeleton({ count = 4 }: Props) {
+  return (
+    <div className={styles.skeletonContainer}>
+      <header className={styles.header}>
+        <div className={styles.breadcrumbs}>
+          <SkeletonShimmer height={"25px"} width={"400px"} />
+        </div>
+        <div className={styles.title}>
+          <div className={styles.cityInformation}>
+            <SkeletonShimmer height={"25px"} width={"200px"} />
+          </div>
+          <div className={styles.sorter}>
+            <SkeletonShimmer height={"60px"} />
+          </div>
+        </div>
+      </header>
+      <main className={styles.main}>
+        <div className={styles.sideBar}>
+          <div className={styles.sideBarItem}>
+            <SkeletonShimmer height={"280px"} width={"340px"} />
+          </div>
+          <div className={styles.sideBarItem}>
+            <SkeletonShimmer height={"400px"} width={"340px"} />
+          </div>
+        </div>
+        <div className={styles.hotelList}>
+          {Array.from({ length: count }).map((_, index) => (
+            <HotelCardSkeleton key={index} />
+          ))}
+        </div>
+      </main>
+    </div>
+  )
+}

components/HotelReservation/SelectHotel/index.tsx

@@ -0,0 +1,158 @@
+import {
+  selectHotel,
+  selectHotelMap,
+} from "@/constants/routes/hotelReservation"
+
+import {
+  fetchAvailableHotels,
+  getFiltersFromHotels,
+} from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils"
+import { ChevronRightIcon } from "@/components/Icons"
+import StaticMap from "@/components/Maps/StaticMap"
+import Alert from "@/components/TempDesignSystem/Alert"
+import Breadcrumbs from "@/components/TempDesignSystem/Breadcrumbs"
+import Button from "@/components/TempDesignSystem/Button"
+import Link from "@/components/TempDesignSystem/Link"
+import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
+import { getIntl } from "@/i18n"
+import { safeTry } from "@/utils/safeTry"
+
+import HotelCardListing from "../HotelCardListing"
+import HotelCount from "./HotelCount"
+import HotelFilter from "./HotelFilter"
+import HotelSorter from "./HotelSorter"
+import MobileMapButtonContainer from "./MobileMapButtonContainer"
+
+import styles from "./selectHotel.module.css"
+
+import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { SelectHotelProps } from "@/types/components/hotelReservation/selectHotel/selectHotel"
+import { AlertTypeEnum } from "@/types/enums/alert"
+
+export default async function SelectHotel({
+  city,
+  params,
+  reservationParams,
+}: SelectHotelProps) {
+  const { selectHotelParams, searchParams, adultsParams, childrenParams } =
+    reservationParams
+
+  const intl = await getIntl()
+
+  const hotelsPromise = safeTry(
+    fetchAvailableHotels({
+      cityId: city.id,
+      roomStayStartDate: searchParams.fromDate,
+      roomStayEndDate: searchParams.toDate,
+      adults: adultsParams,
+      children: childrenParams?.toString(),
+    })
+  )
+
+  const [hotels] = await hotelsPromise
+
+  const isCityWithCountry = (city: any): city is { country: string } =>
+    "country" in city
+
+  const validHotels =
+    hotels?.filter((hotel): hotel is HotelData => hotel !== null) || []
+
+  const filterList = getFiltersFromHotels(validHotels)
+  const breadcrumbs = [
+    {
+      title: intl.formatMessage({ id: "Home" }),
+      href: `/${params.lang}`,
+      uid: "home-page",
+    },
+    {
+      title: intl.formatMessage({ id: "Hotel reservation" }),
+      href: `/${params.lang}/hotelreservation`,
+      uid: "hotel-reservation",
+    },
+    {
+      title: intl.formatMessage({ id: "Select hotel" }),
+      href: `${selectHotel(params.lang)}/?${selectHotelParams}`,
+      uid: "select-hotel",
+    },
+    {
+      title: city.name,
+      uid: city.id,
+    },
+  ]
+
+  const isAllUnavailable = hotels?.every((hotel) => hotel.price === undefined)
+
+  return (
+    <>
+      <header className={styles.header}>
+        <Breadcrumbs breadcrumbs={breadcrumbs} />
+        <div className={styles.title}>
+          <div className={styles.cityInformation}>
+            <Subtitle>{city.name}</Subtitle>
+            <HotelCount />
+          </div>
+          <div className={styles.sorter}>
+            <HotelSorter discreet />
+          </div>
+        </div>
+        <MobileMapButtonContainer filters={filterList} />
+      </header>
+      <main className={styles.main}>
+        <div className={styles.sideBar}>
+          {hotels && hotels.length > 0 ? ( // TODO: Temp fix until API returns hotels that are not available
+            <Link
+              className={styles.link}
+              color="burgundy"
+              href={selectHotelMap(params.lang)}
+              keepSearchParams
+            >
+              <div className={styles.mapContainer}>
+                <StaticMap
+                  city={searchParams.city}
+                  country={isCityWithCountry(city) ? city.country : undefined}
+                  width={340}
+                  height={180}
+                  zoomLevel={11}
+                  mapType="roadmap"
+                  altText={`Map of ${searchParams.city} city center`}
+                />
+                <Button wrapping size="medium" intent="text" theme="base">
+                  {intl.formatMessage({ id: "See map" })}
+                  <ChevronRightIcon
+                    color="baseButtonTextOnFillNormal"
+                    width={20}
+                    height={20}
+                  />
+                </Button>
+              </div>
+            </Link>
+          ) : (
+            <div className={styles.mapContainer}>
+              <StaticMap
+                city={searchParams.city}
+                width={340}
+                height={180}
+                zoomLevel={11}
+                mapType="roadmap"
+                altText={`Map of ${searchParams.city} city center`}
+              />
+            </div>
+          )}
+          <HotelFilter filters={filterList} className={styles.filter} />
+        </div>
+        <div className={styles.hotelList}>
+          {isAllUnavailable && (
+            <Alert
+              type={AlertTypeEnum.Info}
+              heading={intl.formatMessage({ id: "No availability" })}
+              text={intl.formatMessage({
+                id: "There are no rooms available that match your request.",
+              })}
+            />
+          )}
+          <HotelCardListing hotelData={validHotels} />
+        </div>
+      </main>
+    </>
+  )
+}

components/HotelReservation/SelectHotel/selectHotel.module.css

@@ -7,6 +7,7 @@
   max-width: var(--max-width);
   margin: 0 auto;
 }
+
 .header {
   display: flex;
   flex-direction: column;
@@ -34,6 +35,10 @@
   flex-direction: column;
 }
 
+.sideBarItem {
+  display: none;
+}
+
 .link {
   display: none;
 }
@@ -59,6 +64,10 @@
   display: none;
 }
 
+.skeletonContainer .title {
+  margin-bottom: var(--Spacing-x3);
+}
+
 @media (min-width: 768px) {
   .main {
     padding: var(--Spacing-x5);
@@ -92,6 +101,9 @@
   .sideBar {
     max-width: 340px;
   }
+  .sideBarItem {
+    display: block;
+  }
   .filter {
     display: block;
   }
@@ -114,4 +126,14 @@
   .buttonContainer {
     display: none;
   }
+  .skeletonContainer .title {
+    margin-bottom: 0;
+  }
+  .skeletonContainer .sideBar {
+    gap: var(--Spacing-x3);
+  }
+  .skeletonContainer .breadcrumbs {
+    margin: 0 auto;
+    max-width: var(--max-width-navigation);
+  }
 }

types/components/hotelReservation/selectHotel/selectHotel.ts

@@ -1,4 +1,8 @@
-import { CheckInData, Hotel, ParkingData } from "@/types/hotel"
+import { Lang } from "@/constants/languages"
+
+import type { CheckInData, Hotel, ParkingData } from "@/types/hotel"
+import type { Location } from "@/types/trpc/routers/hotel/locations"
+import type { SelectHotelSearchParams } from "./selectHotelSearchParams"
 
 export enum AvailabilityEnum {
   Available = "Available",
@@ -35,3 +39,16 @@ export interface CheckInCheckOutProps {
 export interface MeetingsAndConferencesProps {
   meetingDescription: string
 }
+
+export interface SelectHotelProps {
+  city: Location
+  params: {
+    lang: Lang
+  }
+  reservationParams: {
+    selectHotelParams: URLSearchParams
+    searchParams: SelectHotelSearchParams
+    adultsParams: number
+    childrenParams: string | undefined
+  }
+}