feat(SW-251): type assertion

This commit is contained in:
Fredrik Thorsson
2024-09-12 13:48:27 +02:00
parent 21ff8f8b5d
commit 85460e95e5
5 changed files with 29 additions and 24 deletions

View File

@@ -1,5 +1,4 @@
import { serverClient } from "@/lib/trpc/server" import { serverClient } from "@/lib/trpc/server"
import { notFound } from "@/server/errors/next"
import HotelCardListing from "@/components/HotelReservation/HotelCardListing" import HotelCardListing from "@/components/HotelReservation/HotelCardListing"
import HotelFilter from "@/components/HotelReservation/SelectHotel/HotelFilter" import HotelFilter from "@/components/HotelReservation/SelectHotel/HotelFilter"
@@ -24,7 +23,7 @@ async function getAvailableHotels({
promotionCode, promotionCode,
attachedProfileId, attachedProfileId,
reservationProfileType, reservationProfileType,
}: AvailabilityInput): Promise<HotelData[] | null> { }: AvailabilityInput): Promise<HotelData[]> {
const getAvailableHotels = await serverClient().hotel.availability.get({ const getAvailableHotels = await serverClient().hotel.availability.get({
cityId: cityId, cityId: cityId,
roomStayStartDate: roomStayStartDate, roomStayStartDate: roomStayStartDate,
@@ -36,7 +35,7 @@ async function getAvailableHotels({
reservationProfileType: reservationProfileType, reservationProfileType: reservationProfileType,
}) })
if (!getAvailableHotels) return null if (!getAvailableHotels) throw new Error()
const { availability } = getAvailableHotels const { availability } = getAvailableHotels
@@ -46,8 +45,10 @@ async function getAvailableHotels({
language: getLang(), language: getLang(),
}) })
if (!hotelData) throw new Error()
return { return {
hotelData: hotelData?.data.attributes, hotelData: hotelData.data.attributes,
price: hotel.bestPricePerNight, price: hotel.bestPricePerNight,
} }
}) })
@@ -70,12 +71,9 @@ export default async function SelectHotelPage({
adults: 1, adults: 1,
}) })
if (!hotels) return null const filters = hotels.flatMap((data) => data.hotelData.detailedFacilities)
if (hotels.some((item) => item?.hotelData === undefined)) return notFound()
const filters = hotels.flatMap((data) => data.hotelData?.detailedFacilities) const filterId = [...new Set(filters.map((data) => data.id))]
const filterId = [...new Set(filters.map((data) => data?.id))]
const filterList: { const filterList: {
name: string name: string
id: number id: number
@@ -86,7 +84,7 @@ export default async function SelectHotelPage({
code?: string code?: string
iconName?: string iconName?: string
}[] = filterId }[] = filterId
.map((data) => filters.find((find) => find?.id === data)) .map((data) => filters.find((find) => find.id === data))
.filter( .filter(
( (
filter filter

View File

@@ -25,7 +25,7 @@ export default function HotelCard({ hotel }: HotelCardProps) {
const { hotelData } = hotel const { hotelData } = hotel
const { price } = hotel const { price } = hotel
const sortedAmenities = hotelData?.detailedFacilities const sortedAmenities = hotelData.detailedFacilities
.sort((a, b) => b.sortOrder - a.sortOrder) .sort((a, b) => b.sortOrder - a.sortOrder)
.slice(0, 5) .slice(0, 5)
@@ -33,8 +33,8 @@ export default function HotelCard({ hotel }: HotelCardProps) {
<article className={styles.card}> <article className={styles.card}>
<section className={styles.imageContainer}> <section className={styles.imageContainer}>
<Image <Image
src={hotelData?.hotelContent.images.imageSizes.medium ?? ""} src={hotelData.hotelContent.images.imageSizes.medium}
alt={hotelData?.hotelContent.images.metaData.altText ?? ""} alt={hotelData.hotelContent.images.metaData.altText}
width={300} width={300}
height={200} height={200}
className={styles.image} className={styles.image}
@@ -42,25 +42,25 @@ export default function HotelCard({ hotel }: HotelCardProps) {
<div className={styles.tripAdvisor}> <div className={styles.tripAdvisor}>
<Chip intent="primary" className={styles.tripAdvisor}> <Chip intent="primary" className={styles.tripAdvisor}>
<TripAdvisorIcon color="white" /> <TripAdvisorIcon color="white" />
{hotelData?.ratings?.tripAdvisor.rating} {hotelData.ratings?.tripAdvisor.rating}
</Chip> </Chip>
</div> </div>
</section> </section>
<section className={styles.hotelInformation}> <section className={styles.hotelInformation}>
<ScandicLogoIcon color="red" /> <ScandicLogoIcon color="red" />
<Title as="h4" textTransform="capitalize"> <Title as="h4" textTransform="capitalize">
{hotelData?.name} {hotelData.name}
</Title> </Title>
<Footnote color="textMediumContrast" className={styles.adress}> <Footnote color="textMediumContrast" className={styles.adress}>
{`${hotelData?.address?.streetAddress}, ${hotelData?.address?.city}`} {`${hotelData.address.streetAddress}, ${hotelData.address.city}`}
</Footnote> </Footnote>
<Footnote color="textMediumContrast"> <Footnote color="textMediumContrast">
{`${hotelData?.location.distanceToCentre} ${intl.formatMessage({ id: "km to city center" })}`} {`${hotelData.location.distanceToCentre} ${intl.formatMessage({ id: "km to city center" })}`}
</Footnote> </Footnote>
</section> </section>
<section className={styles.hotel}> <section className={styles.hotel}>
<div className={styles.facilities}> <div className={styles.facilities}>
{sortedAmenities?.map((facility) => { {sortedAmenities.map((facility) => {
const IconComponent = mapFacilityToIcon(facility.name) const IconComponent = mapFacilityToIcon(facility.name)
return ( return (
<div className={styles.facilitiesItem} key={facility.id}> <div className={styles.facilitiesItem} key={facility.id}>

View File

@@ -9,13 +9,11 @@ import styles from "./hotelCardListing.module.css"
import { HotelCardListingProps } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps" import { HotelCardListingProps } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
export default function HotelCardListing({ hotelData }: HotelCardListingProps) { export default function HotelCardListing({ hotelData }: HotelCardListingProps) {
if (!hotelData) return null
return ( return (
<section className={styles.hotelCards}> <section className={styles.hotelCards}>
{hotelData && hotelData.length ? ( {hotelData && hotelData.length ? (
hotelData.map((hotel) => ( hotelData.map((hotel) => (
<HotelCard key={hotel.hotelData?.name} hotel={hotel} /> <HotelCard key={hotel.hotelData.name} hotel={hotel} />
)) ))
) : ( ) : (
<Title>No hotels found</Title> <Title>No hotels found</Title>

View File

@@ -9,6 +9,10 @@ import { HotelFiltersProps } from "@/types/components/hotelReservation/selectHot
export default function HotelFilter({ filters }: HotelFiltersProps) { export default function HotelFilter({ filters }: HotelFiltersProps) {
const intl = useIntl() const intl = useIntl()
function handleOnChange() {
// TODO: Update URL with selected values
}
return ( return (
<aside className={styles.container}> <aside className={styles.container}>
<div className={styles.facilities}> <div className={styles.facilities}>
@@ -16,8 +20,13 @@ export default function HotelFilter({ filters }: HotelFiltersProps) {
<form> <form>
<ul> <ul>
{filters.map((data) => ( {filters.map((data) => (
<li key={data?.id} className={styles.filter}> <li key={data.id} className={styles.filter}>
<input id={`${data?.id}`} name={data?.name} type="checkbox" /> <input
id={`${data.id}`}
name={data.name}
type="checkbox"
onChange={handleOnChange}
/>
<label htmlFor={`${data?.id}`}>{data?.name}</label> <label htmlFor={`${data?.id}`}>{data?.name}</label>
</li> </li>
))} ))}

View File

@@ -7,6 +7,6 @@ export type HotelCardListingProps = {
} }
export type HotelData = { export type HotelData = {
hotelData: Hotel | undefined hotelData: Hotel
price: AvailabilityPrices price: AvailabilityPrices
} }