@@ -334,7 +358,6 @@ export default function SummaryUI({
{ b: (str) =>
{str} }
)}
-
}
>
-
+ {/* // TODO: all rooms needs to be passed to PriceDetails */}
+
-
+
{formatPrice(
intl,
totalPrice.local.price,
@@ -379,7 +403,7 @@ export default function SummaryUI({
- {!showMemberPrice && memberPrice ? (
+ {showSignupPromo && memberPrice ? (
) : null}
diff --git a/components/HotelReservation/EnterDetails/Summary/UI/ui.module.css b/components/HotelReservation/EnterDetails/Summary/UI/ui.module.css
index 58ff5770c..66785ae67 100644
--- a/components/HotelReservation/EnterDetails/Summary/UI/ui.module.css
+++ b/components/HotelReservation/EnterDetails/Summary/UI/ui.module.css
@@ -39,6 +39,7 @@
display: flex;
flex-direction: column;
gap: var(--Spacing-x-one-and-half);
+ overflow-y: auto;
}
.rateDetailsPopover {
diff --git a/components/HotelReservation/EnterDetails/Summary/summary.test.tsx b/components/HotelReservation/EnterDetails/Summary/summary.test.tsx
new file mode 100644
index 000000000..b10c019a1
--- /dev/null
+++ b/components/HotelReservation/EnterDetails/Summary/summary.test.tsx
@@ -0,0 +1,166 @@
+import { describe, expect, test } from "@jest/globals"
+import { act, cleanup, render, screen, within } from "@testing-library/react"
+import { type IntlConfig, IntlProvider } from "react-intl"
+
+import { Lang } from "@/constants/languages"
+
+import {
+ bedType,
+ booking,
+ breakfastPackage,
+ guestDetailsMember,
+ guestDetailsNonMember,
+ roomPrice,
+ roomRate,
+} from "@/__mocks__/hotelReservation"
+import { initIntl } from "@/i18n"
+
+import SummaryUI from "./UI"
+
+import type { PropsWithChildren } from "react"
+
+import { ChildBedMapEnum } from "@/types/components/bookingWidget/enums"
+
+jest.mock("@/lib/api", () => ({
+ fetchRetry: jest.fn((fn) => fn),
+}))
+
+function createWrapper(intlConfig: IntlConfig) {
+ return function Wrapper({ children }: PropsWithChildren) {
+ return (
+
+ {children}
+
+ )
+ }
+}
+
+// TODO: add type definition to this object
+export const rooms = [
+ {
+ adults: 2,
+ childrenInRoom: [{ bed: ChildBedMapEnum.IN_EXTRA_BED, age: 5 }],
+ bedType: {
+ description: bedType.queen.description,
+ roomTypeCode: bedType.queen.value,
+ },
+ breakfast: breakfastPackage,
+ guest: guestDetailsNonMember,
+ roomRate: roomRate,
+ roomPrice: roomPrice,
+ roomType: "Standard",
+ rateDetails: [],
+ cancellationText: "Non-refundable",
+ },
+ {
+ adults: 1,
+ childrenInRoom: [],
+ bedType: {
+ description: bedType.king.description,
+ roomTypeCode: bedType.king.value,
+ },
+ breakfast: undefined,
+ guest: guestDetailsMember,
+ roomRate: roomRate,
+ roomPrice: roomPrice,
+ roomType: "Standard",
+ rateDetails: [],
+ cancellationText: "Non-refundable",
+ },
+]
+
+describe("EnterDetails Summary", () => {
+ afterEach(() => {
+ cleanup()
+ })
+
+ test("render with single room correctly", async () => {
+ const intl = await initIntl(Lang.en)
+
+ await act(async () => {
+ render(
+
,
+ {
+ wrapper: createWrapper(intl),
+ }
+ )
+ })
+
+ screen.getByText("2 adults, 1 child")
+ screen.getByText("Standard")
+ screen.getByText("1,525 SEK")
+ screen.getByText(bedType.queen.description)
+ screen.getByText("Breakfast buffet")
+ screen.getByText("1,500 SEK")
+ screen.getByTestId("signup-promo-desktop")
+ })
+
+ test("render with multiple rooms correctly", async () => {
+ const intl = await initIntl(Lang.en)
+
+ await act(async () => {
+ render(
+
,
+ {
+ wrapper: createWrapper(intl),
+ }
+ )
+ })
+
+ const room1 = within(screen.getByTestId("summary-room-1"))
+ room1.getByText("Standard")
+ room1.getByText("2 adults, 1 child")
+ room1.getByText(bedType.queen.description)
+ room1.getByText("Breakfast buffet")
+
+ const room2 = within(screen.getByTestId("summary-room-2"))
+ room2.getByText("Standard")
+ room2.getByText("1 adult")
+ const room2Breakfast = room2.queryByText("Breakfast buffet")
+ expect(room2Breakfast).not.toBeInTheDocument()
+
+ room2.getByText(bedType.king.description)
+ })
+})
diff --git a/components/HotelReservation/SignupPromo/Desktop.tsx b/components/HotelReservation/SignupPromo/Desktop.tsx
index b96dfd189..a774e2d5c 100644
--- a/components/HotelReservation/SignupPromo/Desktop.tsx
+++ b/components/HotelReservation/SignupPromo/Desktop.tsx
@@ -22,7 +22,10 @@ export default function SignupPromoDesktop({
const price = formatPrice(intl, amount, currency)
return memberPrice ? (
-
+
{badgeContent && {badgeContent}}
{intl.formatMessage(
diff --git a/components/TempDesignSystem/Form/Date/date.test.tsx b/components/TempDesignSystem/Form/Date/date.test.tsx
index 0b2fd4183..e755f40c4 100644
--- a/components/TempDesignSystem/Form/Date/date.test.tsx
+++ b/components/TempDesignSystem/Form/Date/date.test.tsx
@@ -10,6 +10,13 @@ import { getLocalizedMonthName } from "@/utils/dateFormatting"
import Date from "./index"
+jest.mock("react-intl", () => ({
+ useIntl: () => ({
+ formatMessage: (message: { id: string }) => message.id,
+ formatNumber: (value: number) => value,
+ }),
+}))
+
interface FormWrapperProps {
defaultValues: Record
children: React.ReactNode
diff --git a/i18n/index.ts b/i18n/index.ts
index 0a8ebb67d..e3b4cc8f9 100644
--- a/i18n/index.ts
+++ b/i18n/index.ts
@@ -7,7 +7,7 @@ import { Lang } from "@/constants/languages"
const cache = createIntlCache()
-async function initIntl(lang: Lang) {
+export async function initIntl(lang: Lang) {
return createIntl(
{
defaultLocale: Lang.en,
diff --git a/jest.setup.ts b/jest.setup.ts
index 6d866f13c..31fe0b102 100644
--- a/jest.setup.ts
+++ b/jest.setup.ts
@@ -1,11 +1,6 @@
+import "@testing-library/jest-dom/jest-globals"
import "@testing-library/jest-dom"
-jest.mock("react-intl", () => ({
- useIntl: () => ({
- formatMessage: (message: { id: string }) => message.id,
- }),
-}))
-
jest.mock("next/navigation", () => ({
useRouter: jest.fn(),
usePathname: jest.fn().mockReturnValue("/"),
diff --git a/server/routers/hotels/query.ts b/server/routers/hotels/query.ts
index b785621b2..51d11b479 100644
--- a/server/routers/hotels/query.ts
+++ b/server/routers/hotels/query.ts
@@ -1129,17 +1129,17 @@ export const hotelQueryRouter = router({
}
const countries = await getCountries(options, searchParams, ctx.lang)
-
- let citiesByCountry = null
- if (countries) {
- citiesByCountry = await getCitiesByCountry(
- countries,
- options,
- searchParams,
- ctx.lang
- )
+ if (!countries) {
+ return null
}
+ const citiesByCountry = await getCitiesByCountry(
+ countries,
+ options,
+ searchParams,
+ ctx.lang
+ )
+
const locations = await getLocations(
ctx.lang,
options,
diff --git a/stores/enter-details/useEnterDetailsStore.test.tsx b/stores/enter-details/useEnterDetailsStore.test.tsx
index a8db55157..ab3b15cf0 100644
--- a/stores/enter-details/useEnterDetailsStore.test.tsx
+++ b/stores/enter-details/useEnterDetailsStore.test.tsx
@@ -2,15 +2,19 @@ import { describe, expect, test } from "@jest/globals"
import { act, renderHook } from "@testing-library/react"
import { type PropsWithChildren } from "react"
-import { BedTypeEnum } from "@/constants/booking"
import { Lang } from "@/constants/languages"
+import {
+ bedType,
+ booking,
+ breakfastPackage,
+ guestDetailsNonMember,
+ roomRate,
+} from "@/__mocks__/hotelReservation"
import EnterDetailsProvider from "@/providers/EnterDetailsProvider"
import { detailsStorageName, useEnterDetailsStore } from "."
-import { BreakfastPackageEnum } from "@/types/enums/breakfast"
-import { PackageTypeEnum } from "@/types/enums/packages"
import { StepEnum } from "@/types/enums/step"
import type { PersistedState } from "@/types/stores/enter-details"
@@ -27,100 +31,14 @@ jest.mock("@/lib/api", () => ({
fetchRetry: jest.fn((fn) => fn),
}))
-const booking = {
- hotelId: "123",
- fromDate: "2100-01-01",
- toDate: "2100-01-02",
- rooms: [
- {
- adults: 1,
- roomTypeCode: "SKS",
- rateCode: "SAVEEU",
- counterRateCode: "PLSA2BEU",
- },
- ],
-}
-
-const bedTypes = [
- {
- type: BedTypeEnum.King,
- description: "King-size bed",
- value: "SKS",
- size: {
- min: 180,
- max: 200,
- },
- roomTypeCode: "SKS",
- extraBed: undefined,
- },
- {
- type: BedTypeEnum.Queen,
- description: "Queen-size bed",
- value: "QZ",
- size: {
- min: 160,
- max: 200,
- },
- roomTypeCode: "QZ",
- extraBed: undefined,
- },
-]
-
-const guest = {
- countryCode: "SE",
- dateOfBirth: "",
- email: "test@test.com",
- firstName: "Tester",
- lastName: "Testersson",
- join: false,
- membershipNo: "12345678901234",
- phoneNumber: "+46700000000",
- zipCode: "",
-}
-
-const breakfastPackages = [
- {
- code: BreakfastPackageEnum.REGULAR_BREAKFAST,
- description: "Breakfast with reservation",
- localPrice: {
- currency: "SEK",
- price: "99",
- totalPrice: "99",
- },
- requestedPrice: {
- currency: "EUR",
- price: "9",
- totalPrice: "9",
- },
- packageType: PackageTypeEnum.BreakfastAdult as const,
- },
-]
-
function Wrapper({ children }: PropsWithChildren) {
return (
{
test("initialize with correct values from sessionStorage", async () => {
const storage: PersistedState = {
- bedType: bedTypes[1],
- breakfast: breakfastPackages[0],
+ bedType: {
+ roomTypeCode: bedType.queen.value,
+ description: bedType.queen.description,
+ },
+ breakfast: breakfastPackage,
booking,
- guest,
+ guest: guestDetailsNonMember,
}
window.sessionStorage.setItem(detailsStorageName, JSON.stringify(storage))
@@ -187,7 +108,10 @@ describe("Enter Details Store", () => {
expect(result.current.currentStep).toEqual(StepEnum.selectBed)
await act(async () => {
- result.current.actions.updateBedType(bedTypes[0])
+ result.current.actions.updateBedType({
+ roomTypeCode: bedType.king.value,
+ description: bedType.king.description,
+ })
})
expect(result.current.isValid[StepEnum.selectBed]).toEqual(true)
@@ -195,7 +119,7 @@ describe("Enter Details Store", () => {
expect(window.location.pathname.slice(1)).toBe(StepEnum.breakfast)
await act(async () => {
- result.current.actions.updateBreakfast(breakfastPackages[0])
+ result.current.actions.updateBreakfast(breakfastPackage)
})
expect(result.current.isValid[StepEnum.breakfast]).toEqual(true)
@@ -203,7 +127,7 @@ describe("Enter Details Store", () => {
expect(window.location.pathname.slice(1)).toBe(StepEnum.details)
await act(async () => {
- result.current.actions.updateDetails(guest)
+ result.current.actions.updateDetails(guestDetailsNonMember)
})
expect(result.current.isValid[StepEnum.details]).toEqual(true)
diff --git a/types/components/hotelReservation/enterDetails/breakfast.ts b/types/components/hotelReservation/enterDetails/breakfast.ts
index 283d85028..acb936abd 100644
--- a/types/components/hotelReservation/enterDetails/breakfast.ts
+++ b/types/components/hotelReservation/enterDetails/breakfast.ts
@@ -1,12 +1,11 @@
-import { z } from "zod"
+import { type z } from "zod"
-import {
+import type { breakfastFormSchema } from "@/components/HotelReservation/EnterDetails/Breakfast/schema"
+import type {
breakfastPackageSchema,
breakfastPackagesSchema,
} from "@/server/routers/hotels/output"
-import { breakfastFormSchema } from "@/components/HotelReservation/EnterDetails/Breakfast/schema"
-
export interface BreakfastFormSchema
extends z.output {}
diff --git a/types/components/hotelReservation/enterDetails/details.ts b/types/components/hotelReservation/enterDetails/details.ts
index 3d7fc41c1..786f48570 100644
--- a/types/components/hotelReservation/enterDetails/details.ts
+++ b/types/components/hotelReservation/enterDetails/details.ts
@@ -1,12 +1,11 @@
-import { z } from "zod"
+import type { z } from "zod"
-import {
+import type { SafeUser } from "@/types/user"
+import type {
guestDetailsSchema,
signedInDetailsSchema,
} from "@/components/HotelReservation/EnterDetails/Details/schema"
-import type { SafeUser } from "@/types/user"
-
export type DetailsSchema = z.output
export type SignedInDetailsSchema = z.output
diff --git a/types/components/hotelReservation/summary.ts b/types/components/hotelReservation/summary.ts
index 50fd2ed66..c60194d71 100644
--- a/types/components/hotelReservation/summary.ts
+++ b/types/components/hotelReservation/summary.ts
@@ -1,7 +1,15 @@
+import type { DetailsProviderProps } from "@/types/providers/enter-details"
import type { Packages } from "@/types/requests/packages"
-import type { DetailsState, Price } from "@/types/stores/enter-details"
+import type {
+ DetailsState,
+ Price,
+ RoomPrice,
+} from "@/types/stores/enter-details"
import type { RoomAvailability } from "@/types/trpc/routers/hotel/availability"
-import type { Child } from "./selectRate/selectRate"
+import type { BedTypeSchema } from "./enterDetails/bedType"
+import type { BreakfastPackage } from "./enterDetails/breakfast"
+import type { DetailsSchema } from "./enterDetails/details"
+import type { Child, SelectRateSearchParams } from "./selectRate/selectRate"
export type RoomsData = Pick &
Pick &
@@ -17,3 +25,26 @@ export interface SummaryProps
isMember: boolean
breakfastIncluded: boolean
}
+
+export interface SummaryUIProps {
+ booking: SelectRateSearchParams
+ rooms: {
+ adults: number
+ childrenInRoom: Child[] | undefined
+ bedType: BedTypeSchema | undefined
+ breakfast: BreakfastPackage | false | undefined
+ guest: DetailsSchema
+ roomRate: DetailsProviderProps["roomRate"]
+ roomPrice: RoomPrice
+ roomType: string
+ rateDetails: string[] | undefined
+ cancellationText: string
+ }[]
+ isMember: boolean
+ breakfastIncluded: boolean
+ packages: Packages | null
+ totalPrice: Price
+ vat: number
+ toggleSummaryOpen: () => void
+ togglePriceDetailsModalOpen: () => void
+}