Merged in monorepo-step-1 (pull request #1080)

Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/HotelListing/hotelListing.module.css

@@ -0,0 +1,31 @@
+.hotelListing {
+  display: none;
+}
+
+.hotelListingMobile {
+  display: none;
+  overflow-x: auto;
+  position: absolute;
+  bottom: 32px;
+  left: 0;
+  right: 0;
+  z-index: 10;
+}
+
+.hotelListingMobile[data-open="true"] {
+  display: flex;
+}
+
+@media (min-width: 768px) {
+  .hotelListing {
+    display: block;
+    width: 100%;
+    overflow-y: auto;
+    padding-top: var(--Spacing-x2);
+  }
+
+  .hotelListingMobile,
+  .hotelListingMobile[data-open="true"] {
+    display: none;
+  }
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/HotelListing/index.tsx

@@ -0,0 +1,28 @@
+"use client"
+
+import { useHotelsMapStore } from "@/stores/hotels-map"
+
+import HotelCardDialogListing from "@/components/HotelReservation/HotelCardDialogListing"
+import HotelCardListing from "@/components/HotelReservation/HotelCardListing"
+
+import styles from "./hotelListing.module.css"
+
+import { HotelCardListingTypeEnum } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { HotelListingProps } from "@/types/components/hotelReservation/selectHotel/map"
+
+export default function HotelListing({ hotels }: HotelListingProps) {
+  const { activeHotelPin } = useHotelsMapStore()
+  return (
+    <>
+      <div className={styles.hotelListing}>
+        <HotelCardListing
+          hotelData={hotels}
+          type={HotelCardListingTypeEnum.MapListing}
+        />
+      </div>
+      <div className={styles.hotelListingMobile} data-open={!!activeHotelPin}>
+        <HotelCardDialogListing hotels={hotels} />
+      </div>
+    </>
+  )
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx

@@ -0,0 +1,166 @@
+import { differenceInCalendarDays, format, isWeekend } from "date-fns"
+import { notFound } from "next/navigation"
+import { Suspense } from "react"
+
+import { env } from "@/env/server"
+import { getCityCoordinates } from "@/lib/trpc/memoizedRequests"
+
+import {
+  fetchAlternativeHotels,
+  fetchAvailableHotels,
+  fetchBookingCodeAvailableHotels,
+  getFiltersFromHotels,
+} from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils"
+import { getHotelSearchDetails } from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/utils"
+import TrackingSDK from "@/components/TrackingSDK"
+import { getLang } from "@/i18n/serverContext"
+import { safeTry } from "@/utils/safeTry"
+
+import { getHotelPins } from "../../HotelCardDialogListing/utils"
+import SelectHotelMap from "."
+
+import { ChildBedMapEnum } from "@/types/components/bookingWidget/enums"
+import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { SelectHotelMapContainerProps } from "@/types/components/hotelReservation/selectHotel/map"
+import type { SelectHotelSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
+import {
+  TrackingChannelEnum,
+  type TrackingSDKHotelInfo,
+  type TrackingSDKPageData,
+} from "@/types/components/tracking"
+
+export async function SelectHotelMapContainer({
+  searchParams,
+  isAlternativeHotels,
+}: SelectHotelMapContainerProps) {
+  const lang = getLang()
+  const googleMapId = env.GOOGLE_DYNAMIC_MAP_ID
+  const googleMapsApiKey = env.GOOGLE_STATIC_MAP_KEY
+  const getHotelSearchDetailsPromise = safeTry(
+    getHotelSearchDetails(
+      {
+        searchParams: searchParams as SelectHotelSearchParams & {
+          [key: string]: string
+        },
+      },
+      isAlternativeHotels
+    )
+  )
+
+  const [searchDetails] = await getHotelSearchDetailsPromise
+
+  if (!searchDetails) return notFound()
+
+  const {
+    city,
+    selectHotelParams,
+    adultsInRoom,
+    childrenInRoom,
+    childrenInRoomString,
+    hotel: isAlternativeFor,
+    bookingCode,
+  } = searchDetails
+
+  if (!city) return notFound()
+
+  const fetchAvailableHotelsPromise = isAlternativeFor
+    ? safeTry(
+        fetchAlternativeHotels(isAlternativeFor.id, {
+          roomStayStartDate: selectHotelParams.fromDate,
+          roomStayEndDate: selectHotelParams.toDate,
+          adults: adultsInRoom[0],
+          children: childrenInRoomString,
+          bookingCode,
+        })
+      )
+    : bookingCode
+      ? safeTry(
+          fetchBookingCodeAvailableHotels({
+            cityId: city.id,
+            roomStayStartDate: selectHotelParams.fromDate,
+            roomStayEndDate: selectHotelParams.toDate,
+            adults: adultsInRoom[0],
+            children: childrenInRoomString,
+            bookingCode,
+          })
+        )
+      : safeTry(
+          fetchAvailableHotels({
+            cityId: city.id,
+            roomStayStartDate: selectHotelParams.fromDate,
+            roomStayEndDate: selectHotelParams.toDate,
+            adults: adultsInRoom[0],
+            children: childrenInRoomString,
+          })
+        )
+
+  const [hotels] = await fetchAvailableHotelsPromise
+
+  const validHotels = (hotels?.filter(Boolean) as HotelData[]) || []
+
+  const hotelPins = getHotelPins(validHotels)
+  const filterList = getFiltersFromHotels(validHotels)
+  const cityCoordinates = await getCityCoordinates({
+    city: city.name,
+    hotel: { address: hotels?.[0]?.hotelData?.address.streetAddress },
+  })
+
+  const arrivalDate = new Date(selectHotelParams.fromDate)
+  const departureDate = new Date(selectHotelParams.toDate)
+
+  const pageTrackingData: TrackingSDKPageData = {
+    pageId: isAlternativeFor ? "alternative-hotels" : "select-hotel",
+    domainLanguage: lang,
+    channel: TrackingChannelEnum["hotelreservation"],
+    pageName: isAlternativeHotels
+      ? "hotelreservation|alternative-hotels|mapview"
+      : "hotelreservation|select-hotel|mapview",
+    siteSections: isAlternativeHotels
+      ? "hotelreservation|altervative-hotels|mapview"
+      : "hotelreservation|select-hotel|mapview",
+    pageType: "bookinghotelsmapviewpage",
+    siteVersion: "new-web",
+  }
+
+  const hotelsTrackingData: TrackingSDKHotelInfo = {
+    availableResults: validHotels.length,
+    searchTerm: isAlternativeFor
+      ? selectHotelParams.hotelId
+      : (selectHotelParams.city as string),
+    arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
+    departureDate: format(departureDate, "yyyy-MM-dd"),
+    noOfAdults: adultsInRoom[0], // TODO: Handle multiple rooms
+    noOfChildren: childrenInRoom?.length,
+    ageOfChildren: childrenInRoom?.map((c) => c.age).join(","),
+    childBedPreference: childrenInRoom
+      ?.map((c) => ChildBedMapEnum[c.bed])
+      .join("|"),
+    noOfRooms: 1, // // TODO: Handle multiple rooms
+    duration: differenceInCalendarDays(departureDate, arrivalDate),
+    leadTime: differenceInCalendarDays(arrivalDate, new Date()),
+    searchType: "destination",
+    bookingTypeofDay: isWeekend(arrivalDate) ? "weekend" : "weekday",
+    country: validHotels?.[0]?.hotelData.address.country,
+    region: validHotels?.[0]?.hotelData.address.city,
+  }
+
+  return (
+    <>
+      <SelectHotelMap
+        apiKey={googleMapsApiKey}
+        hotelPins={hotelPins}
+        mapId={googleMapId}
+        hotels={validHotels}
+        filterList={filterList}
+        cityCoordinates={cityCoordinates}
+        bookingCode={bookingCode ?? ""}
+      />
+      <Suspense fallback={null}>
+        <TrackingSDK
+          pageData={pageTrackingData}
+          hotelInfo={hotelsTrackingData}
+        />
+      </Suspense>
+    </>
+  )
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainerSkeleton.module.css

@@ -0,0 +1,48 @@
+.container {
+  max-width: var(--max-width);
+  height: 100vh;
+  display: flex;
+  width: 100%;
+}
+
+.listingContainer {
+  display: none;
+}
+
+.skeletonContainer {
+  display: none;
+  overflow: hidden;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin-top: 20px;
+  gap: var(--Spacing-x2);
+  padding-top: var(--Spacing-x6);
+  height: 100%;
+}
+
+.skeletonItem {
+  width: 440px;
+}
+
+.mapContainer {
+  flex: 1;
+}
+
+@media (min-width: 768px) {
+  .container {
+    height: 100%;
+  }
+  .listingContainer {
+    background-color: var(--Base-Surface-Secondary-light-Normal);
+    padding: var(--Spacing-x3) var(--Spacing-x4);
+    overflow-y: auto;
+    max-width: 505px;
+    position: relative;
+    height: 100%;
+    display: block;
+  }
+  .skeletonContainer {
+    display: flex;
+    width: 360px;
+  }
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainerSkeleton.tsx

@@ -0,0 +1,27 @@
+import { RoomCardSkeleton } from "@/components/HotelReservation/RoomCardSkeleton/RoomCardSkeleton"
+import SkeletonShimmer from "@/components/SkeletonShimmer"
+
+import styles from "./SelectHotelMapContainerSkeleton.module.css"
+
+type Props = {
+  count?: number
+}
+
+export function SelectHotelMapContainerSkeleton({ count = 2 }: Props) {
+  return (
+    <div className={styles.container}>
+      <div className={styles.listingContainer}>
+        <div className={styles.skeletonContainer}>
+          {Array.from({ length: count }).map((_, index) => (
+            <div key={index} className={styles.skeletonItem}>
+              <RoomCardSkeleton />
+            </div>
+          ))}
+        </div>
+      </div>
+      <div className={styles.mapContainer}>
+        <SkeletonShimmer width={"100%"} height="100%" />
+      </div>
+    </div>
+  )
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContent/index.tsx

@@ -0,0 +1,184 @@
+"use client"
+import { useMap } from "@vis.gl/react-google-maps"
+import { useCallback, useEffect, useMemo, useRef, useState } from "react"
+import { useIntl } from "react-intl"
+import { useMediaQuery } from "usehooks-ts"
+
+import { selectHotel } from "@/constants/routes/hotelReservation"
+import { useBookingCodeFilterStore } from "@/stores/bookingCode-filter"
+import { useHotelFilterStore } from "@/stores/hotel-filters"
+import { useHotelsMapStore } from "@/stores/hotels-map"
+
+import { RoomCardSkeleton } from "@/components/HotelReservation/RoomCardSkeleton/RoomCardSkeleton"
+import { CloseIcon, CloseLargeIcon } from "@/components/Icons"
+import InteractiveMap from "@/components/Maps/InteractiveMap"
+import { BackToTopButton } from "@/components/TempDesignSystem/BackToTopButton"
+import Button from "@/components/TempDesignSystem/Button"
+import Link from "@/components/TempDesignSystem/Link"
+import useLang from "@/hooks/useLang"
+import { useScrollToTop } from "@/hooks/useScrollToTop"
+import { debounce } from "@/utils/debounce"
+
+import BookingCodeFilter from "../../BookingCodeFilter"
+import FilterAndSortModal from "../../FilterAndSortModal"
+import HotelListing from "../HotelListing"
+import { getVisibleHotels } from "./utils"
+
+import styles from "./selectHotelMapContent.module.css"
+
+import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { SelectHotelMapProps } from "@/types/components/hotelReservation/selectHotel/map"
+
+const SKELETON_LOAD_DELAY = 750
+
+export default function SelectHotelContent({
+  hotelPins,
+  cityCoordinates,
+  mapId,
+  hotels,
+  filterList,
+  bookingCode,
+}: Omit<SelectHotelMapProps, "apiKey">) {
+  const lang = useLang()
+  const intl = useIntl()
+  const map = useMap()
+
+  const isAboveMobile = useMediaQuery("(min-width: 768px)")
+  const [visibleHotels, setVisibleHotels] = useState<HotelData[]>([])
+  const [showSkeleton, setShowSkeleton] = useState<boolean>(true)
+  const listingContainerRef = useRef<HTMLDivElement | null>(null)
+
+  const activeFilters = useHotelFilterStore((state) => state.activeFilters)
+  const { activeHotelCard, activeHotelPin } = useHotelsMapStore()
+
+  const { showBackToTop, scrollToTop } = useScrollToTop({
+    threshold: 490,
+    elementRef: listingContainerRef,
+    refScrollable: true,
+  })
+  const activeCodeFilter = useBookingCodeFilterStore(
+    (state) => state.activeCodeFilter
+  )
+
+  const coordinates = useMemo(
+    () =>
+      isAboveMobile
+        ? cityCoordinates
+        : { ...cityCoordinates, lat: cityCoordinates.lat - 0.006 },
+    [isAboveMobile, cityCoordinates]
+  )
+
+  useEffect(() => {
+    if (listingContainerRef.current) {
+      const activeElement =
+        listingContainerRef.current.querySelector(`[data-active="true"]`)
+      if (activeElement) {
+        activeElement.scrollIntoView({ behavior: "smooth", block: "nearest" })
+      }
+    }
+  }, [activeHotelCard, activeHotelPin])
+
+  const filteredHotelPins = useMemo(() => {
+    const updatedHotelsList = bookingCode
+      ? hotelPins.filter(
+          (hotel) =>
+            !hotel.publicPrice ||
+            activeCodeFilter === "all" ||
+            (activeCodeFilter === "discounted" &&
+              hotel.rateType?.toLowerCase() !== "regular") ||
+            activeCodeFilter === hotel.rateType?.toLowerCase()
+        )
+      : hotelPins
+    return updatedHotelsList.filter((hotel) =>
+      activeFilters.every((filterId) =>
+        hotel.facilityIds.includes(Number(filterId))
+      )
+    )
+  }, [activeFilters, hotelPins, bookingCode, activeCodeFilter])
+
+  const getHotelCards = useCallback(() => {
+    const visibleHotels = getVisibleHotels(hotels, filteredHotelPins, map)
+    setVisibleHotels(visibleHotels)
+    setTimeout(() => {
+      setShowSkeleton(false)
+    }, SKELETON_LOAD_DELAY)
+  }, [hotels, filteredHotelPins, map])
+
+  /**
+   * Updates visible hotels when map viewport changes (zoom/pan)
+   * - Debounces updates to prevent excessive re-renders during map interaction
+   * - Shows loading skeleton while map tiles load
+   * - Triggers on: initial load, zoom, pan, and tile loading completion
+   */
+  const debouncedUpdateHotelCards = useMemo(
+    () =>
+      debounce(() => {
+        if (!map) return
+        if (isAboveMobile) {
+          setShowSkeleton(true)
+        }
+        getHotelCards()
+      }, 100),
+    [map, getHotelCards, isAboveMobile]
+  )
+
+  const closeButton = (
+    <Button
+      intent="inverted"
+      size="small"
+      theme="base"
+      className={styles.closeButton}
+      asChild
+    >
+      <Link href={selectHotel(lang)} keepSearchParams prefetch>
+        <CloseIcon color="burgundy" />
+        {intl.formatMessage({ id: "Close the map" })}
+      </Link>
+    </Button>
+  )
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.listingContainer} ref={listingContainerRef}>
+        <div className={styles.filterContainer}>
+          <Button
+            intent="text"
+            size="small"
+            variant="icon"
+            wrapping
+            className={styles.filterContainerCloseButton}
+            asChild
+          >
+            <Link href={selectHotel(lang)} keepSearchParams>
+              <CloseLargeIcon />
+            </Link>
+          </Button>
+          <FilterAndSortModal
+            filters={filterList}
+            setShowSkeleton={setShowSkeleton}
+          />
+          {bookingCode ? <BookingCodeFilter /> : null}
+        </div>
+
+        {showSkeleton ? (
+          <div className={styles.skeletonContainer}>
+            <RoomCardSkeleton />
+            <RoomCardSkeleton />
+          </div>
+        ) : (
+          <HotelListing hotels={visibleHotels} />
+        )}
+        {showBackToTop && (
+          <BackToTopButton position="left" onClick={scrollToTop} />
+        )}
+      </div>
+      <InteractiveMap
+        closeButton={closeButton}
+        coordinates={coordinates}
+        hotelPins={filteredHotelPins}
+        mapId={mapId}
+        onTilesLoaded={debouncedUpdateHotelCards}
+      />
+    </div>
+  )
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContent/selectHotelMapContent.module.css

@@ -0,0 +1,69 @@
+.container .closeButton {
+  pointer-events: initial;
+  box-shadow: var(--button-box-shadow);
+  gap: var(--Spacing-x-half);
+  display: none;
+}
+
+.container {
+  height: 100%;
+}
+
+.filterContainer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+  background-color: var(--Base-Surface-Secondary-light-Normal);
+  padding: 0 var(--Spacing-x2);
+  height: 44px;
+}
+
+.container .listingContainer .filterContainer > button {
+  border: none;
+}
+
+.skeletonContainer {
+  display: none;
+}
+
+@media (min-width: 768px) {
+  .container .closeButton {
+    display: flex;
+  }
+  .container .listingContainer .filterContainer .filterContainerCloseButton {
+    display: none;
+  }
+
+  .listingContainer {
+    background-color: var(--Base-Surface-Secondary-light-Normal);
+    padding: var(--Spacing-x3) var(--Spacing-x4) var(--Spacing-x3)
+      var(--Layout-Tablet-Margin-Margin-min);
+    overflow-y: auto;
+    min-width: 420px;
+    width: 420px;
+    position: relative;
+  }
+  .container {
+    display: flex;
+  }
+
+  .filterContainer {
+    justify-content: flex-end;
+    padding: 0 0 var(--Spacing-x1);
+    position: static;
+  }
+
+  .skeletonContainer {
+    display: flex;
+    flex-direction: column;
+    gap: var(--Spacing-x2);
+  }
+}
+
+@media (min-width: 1367px) {
+  .listingContainer {
+    padding: var(--Spacing-x3) var(--Spacing-x4) var(--Spacing-x3)
+      var(--Layout-Desktop-Margin-Margin-min);
+  }
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContent/utils.ts

@@ -0,0 +1,29 @@
+import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { HotelPin } from "@/types/components/hotelReservation/selectHotel/map"
+
+export function getVisibleHotelPins(
+  map: google.maps.Map | null,
+  filteredHotelPins: HotelPin[]
+) {
+  if (!map || !filteredHotelPins) return []
+
+  const bounds = map.getBounds()
+  if (!bounds) return []
+
+  return filteredHotelPins.filter((pin) => {
+    const { lat, lng } = pin.coordinates
+    return bounds.contains({ lat, lng })
+  })
+}
+
+export function getVisibleHotels(
+  hotels: HotelData[],
+  filteredHotelPins: HotelPin[],
+  map: google.maps.Map | null
+) {
+  const visibleHotelPins = getVisibleHotelPins(map, filteredHotelPins)
+  const visibleHotels = hotels.filter((hotel) =>
+    visibleHotelPins.some((pin) => pin.operaId === hotel.hotelData.operaId)
+  )
+  return visibleHotels
+}

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/index.tsx

@@ -0,0 +1,30 @@
+"use client"
+
+import { APIProvider } from "@vis.gl/react-google-maps"
+
+import SelectHotelMapContent from "./SelectHotelMapContent"
+
+import type { SelectHotelMapProps } from "@/types/components/hotelReservation/selectHotel/map"
+
+export default function SelectHotelMap({
+  apiKey,
+  hotelPins,
+  mapId,
+  hotels,
+  filterList,
+  cityCoordinates,
+  bookingCode,
+}: SelectHotelMapProps) {
+  return (
+    <APIProvider apiKey={apiKey}>
+      <SelectHotelMapContent
+        hotelPins={hotelPins}
+        cityCoordinates={cityCoordinates}
+        mapId={mapId}
+        hotels={hotels}
+        filterList={filterList}
+        bookingCode={bookingCode}
+      />
+    </APIProvider>
+  )
+}