scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feat/SW-2220-destination-list (pull request #1851)

Browse Source 
Feat/SW-2220 destination list

* fix(SW-2220): remove old hotels

* fix(SW-2220): add filtering of cities without urls

* fix(SW-2220): destinations English

* fix(SW-2220): update all country files

* refactor(SW-2220): cleanup


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
This commit is contained in:
Matilda Landström
2025-04-25 13:14:23 +00:00
parent 035653349a
commit 1f8594e5c8
9 changed files with 4082 additions and 4819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/HotelsSection/DestinationsList/Destination/index.tsx
View File

@@ -2,7 +2,6 @@ import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
import AccordionItem from "@/components/TempDesignSystem/Accordion/AccordionItem" import AccordionItem from "@/components/TempDesignSystem/Accordion/AccordionItem"
import Link from "@/components/TempDesignSystem/Link" import Link from "@/components/TempDesignSystem/Link"
import Body from "@/components/TempDesignSystem/Text/Body"
import { getIntl } from "@/i18n" import { getIntl } from "@/i18n"
import styles from "./destination.module.css" import styles from "./destination.module.css"
@@ -30,7 +29,6 @@ export default async function Destination({
{cities.map((city) => {cities.map((city) =>
city.hotelCount > 0 ? ( city.hotelCount > 0 ? (
<li key={city.id}> <li key={city.id}>
{city.url ? (
<Link <Link
href={city.url} href={city.url}
color="baseTextMediumContrast" color="baseTextMediumContrast"
@@ -39,12 +37,6 @@ export default async function Destination({
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */} {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
{`${city.name} (${city.hotelCount})`} {`${city.name} (${city.hotelCount})`}
</Link> </Link>
) : (
<>
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
<Body>{`${city.name} (${city.hotelCount})`}</Body>
</>
)}
</li> </li>
) : null ) : null
)} )}

1465
apps/scandic-web/server/routers/contentstack/destinationOverviewPage/destinations-da.json
View File

File diff suppressed because it is too large Load Diff

1445
apps/scandic-web/server/routers/contentstack/destinationOverviewPage/destinations-de.json
View File

File diff suppressed because it is too large Load Diff

1483
apps/scandic-web/server/routers/contentstack/destinationOverviewPage/destinations-en.json
View File

File diff suppressed because it is too large Load Diff

1465
apps/scandic-web/server/routers/contentstack/destinationOverviewPage/destinations-fi.json
View File

File diff suppressed because it is too large Load Diff

1441
apps/scandic-web/server/routers/contentstack/destinationOverviewPage/destinations-no.json
View File

File diff suppressed because it is too large Load Diff

1521
apps/scandic-web/server/routers/contentstack/destinationOverviewPage/destinations-sv.json
View File

File diff suppressed because it is too large Load Diff

17
apps/scandic-web/server/routers/contentstack/destinationOverviewPage/query.ts
View File

@@ -34,7 +34,7 @@ import {
} from "./output" } from "./output"
import type { import type {
Cities, City,
DestinationsData, DestinationsData,
} from "@/types/components/destinationOverviewPage/destinationsList/destinationsData" } from "@/types/components/destinationOverviewPage/destinationsList/destinationsData"
import { import {
@@ -212,7 +212,8 @@ export const destinationOverviewPageQueryRouter = router({
const destinations = await Promise.all( const destinations = await Promise.all(
Object.entries(citiesByCountry).map(async ([country, cities]) => { Object.entries(citiesByCountry).map(async ([country, cities]) => {
const activeCitiesWithHotelCount: Cities = await Promise.all( const activeCitiesWithHotelCount: (City | null)[] =
await Promise.all(
cities.map(async (city) => { cities.map(async (city) => {
const [hotels] = await safeTry( const [hotels] = await safeTry(
getHotelIdsByCityId({ getHotelIdsByCityId({
@@ -225,15 +226,19 @@ export const destinationOverviewPageQueryRouter = router({
(cityPage) => cityPage.city === city.cityIdentifier (cityPage) => cityPage.city === city.cityIdentifier
) )
return { return cityPage?.url
? {
id: city.id, id: city.id,
name: city.name, name: city.name,
hotelIds: hotels || [], hotelIds: hotels || [],
hotelCount: hotels ? hotels.length : 0, hotelCount: hotels ? hotels.length : 0,
url: cityPage?.url, url: cityPage.url,
} }
: null
}) })
) )
const filteredActiveCitiesWithHotelCount: City[] =
activeCitiesWithHotelCount.filter((c): c is City => !!c)
const countryPages = await getCountryPageUrls(lang) const countryPages = await getCountryPageUrls(lang)
const countryPage = countryPages.find( const countryPage = countryPages.find(
@@ -243,11 +248,11 @@ export const destinationOverviewPageQueryRouter = router({
return { return {
country, country,
countryUrl: countryPage?.url, countryUrl: countryPage?.url,
numberOfHotels: activeCitiesWithHotelCount.reduce( numberOfHotels: filteredActiveCitiesWithHotelCount.reduce(
(acc, city) => acc + city.hotelCount, (acc, city) => acc + city.hotelCount,
0 0
), ),
cities: activeCitiesWithHotelCount, cities: filteredActiveCitiesWithHotelCount,
} }
}) })
) )

6
apps/scandic-web/types/components/destinationOverviewPage/destinationsList/destinationsData.ts
View File

@@ -3,7 +3,7 @@ export type City = {
name: string name: string
hotelIds: string[] hotelIds: string[]
hotelCount: number hotelCount: number
url?: string url: string
} }
export type DestinationCountry = { export type DestinationCountry = {
@@ -15,8 +15,6 @@ export type DestinationCountry = {
export type DestinationsData = DestinationCountry[] export type DestinationsData = DestinationCountry[]
export type Cities = DestinationCountry["cities"]
export type DestinationsListProps = { export type DestinationsListProps = {
destinations: DestinationsData destinations: DestinationsData
} }
@@ -25,5 +23,5 @@ export type DestinationProps = {
country: string country: string
countryUrl: string | undefined countryUrl: string | undefined
numberOfHotels: number numberOfHotels: number
cities: Cities cities: DestinationCountry["cities"]
} }