Commit Graph

49 Commits

Author SHA1 Message Date
Matilda Landström
1f8594e5c8 Merged in feat/SW-2220-destination-list (pull request #1851)
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
2025-04-25 13:14:23 +00:00
Christian Andolf
f17c8005d4 fix: remove useless check since cmsreward is always defined 2025-04-24 10:14:52 +02:00
Michael Zetterberg
5323a8e46e feat: harmonize log and metrics 2025-04-23 22:40:46 +00:00
Christian Andolf
55b255d36b fix: dont request cms rewards if we have no reward ids
fixes a cache issue since we have no keys to cache on
2025-04-22 10:55:04 +02:00
Michael Zetterberg
440e1f92df feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass 2025-04-14 11:30:06 +00:00
Christian Andolf
80a738af7b fix: set redeem description nullable in order to handle the transition from string to RTE 2025-04-14 08:57:56 +02:00
Simon Emanuelsson
afb37d0cc5 feat: bedtypes is selectable again 2025-04-12 08:32:42 +00:00
Erik Tiekstra
3f510e9aae fix: properties inside hotel_navigation could be null or undefined
Approved-by: Michael Zetterberg
2025-04-08 12:33:06 +00:00
Linus Flood
d30cc7e2be Merged in fix/site-config-revalidate (pull request #1751)
fix: site-config - use correct cache keys and invalidate them

* fix: site-config - use correct cache keys and invalidate them


Approved-by: Joakim Jäderberg
2025-04-08 10:27:26 +00:00
Michael Zetterberg
4aeb5b071d fix(SW-1446): use existing functions for url data 2025-04-08 05:52:10 +00:00
Erik Tiekstra
0215c8428f fix: Fixed issue with duplicate filter_identifiers inside tabFilters
Approved-by: Chuma Mcphoy (We Ahead)
2025-04-03 05:50:35 +00:00
Christian Andolf
52b461fbb4 fix(SW-1877): new responsive breadcrumbs 2025-04-01 08:38:08 +02:00
Anton Gunnarsson
df2fb49d1e Merged in fix/sw-1980-sas-comparison-block-link (pull request #1641)
Update link in SASTierComparison to use pageLink reference

* Update link in SASTierComparison to use pageLink reference


Approved-by: Linus Flood
2025-03-27 15:27:12 +00:00
Michael Zetterberg
65f75c11ef fix: improve loading on destination overview page
- Only load data from Contentstack
- Use static JSON for destination list
- Some logic improvements to data handling and types
2025-03-27 13:49:28 +00:00
Matilda Landström
5de2a993a7 Merged in feat/SW-1711-switch-icons (pull request #1558)
Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons.

Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-03-27 09:42:52 +00:00
Linus Flood
3456235dd0 Merged in fix/destination-pages-cache-keys (pull request #1642)
Fix/destination pages cache keys

* fix(destionationpages): add tag to citydatabycityidentifier that should invalidate when publishing city

* Fixed building tag the same way and added comment why we need this extra tag


Approved-by: Erik Tiekstra
2025-03-26 13:04:18 +00:00
Erik Tiekstra
ca23589f88 feat(SW-2007): Added metadata for hotel subpages
Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-26 10:36:58 +00:00
Christian Andolf
f272dde1ef chore: remove unused filter modal
remove old cms model

refactor reward types
2025-03-26 09:55:26 +01:00
Christian Andolf
b86347b4f4 refactor(LOY-175): rewrite reward types according to new api endpoints 2025-03-26 09:55:26 +01:00
Christian Andolf
0ae4c5db17 chore(LOY-175): remove references to old reward endpoints 2025-03-26 09:55:26 +01:00
Michael Zetterberg
d236a6e8fd fix: proper cache keys for refs 2025-03-25 11:58:00 +00:00
Erik Tiekstra
2c08b141b2 feat(SW-1534): Added booking code functionality from either searchParams or pageSettings
Approved-by: Christian Andolf
2025-03-25 07:36:43 +00:00
Erik Tiekstra
91e26e30af feat/SW-1756-meeting-package-content-pages
* feat(SW-1230): Changes to script to be able to reload after soft navigation
* feat(SW-1756): Added meeting package widget on content pages

Approved-by: Matilda Landström
2025-03-21 13:31:33 +00:00
Pontus Dreij
8f9e268802 Merged in feat(SW-1944)-update-url-to-mystay (pull request #1566)
feat(SW-1944) Update to correct URL to my stay (for my pages/my stays and confirmation page)

* feat(SW-1944) Update to correct URL to my stay (for my pages/my stays and confirmation page)

* feat(SW-1944) updated to RefId

* feat(SW-1944) updated myStay path

* feat(SW-1944) updated refId check


Approved-by: Christian Andolf
2025-03-20 09:55:24 +00:00
Erik Tiekstra
b2b197b1ef Feat/SW-1519 remove deprecated hotel data from schema
* feat(SW-1519): Removed displayWebpage from hotel schema

* feat(SW-1519): Removed gallery from hotel schema

* feat(SW-1519): Removed conferencesAndMeetings from hotel schema

* feat(SW-1519): Removed healthAndWellness from hotel schema

* feat(SW-1519): Removed restaurantImages from hotel schema

* feat(SW-1519): Removed restaurantsOverviewPage from hotel schema


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-19 06:28:13 +00:00
Erik Tiekstra
f096b70c45 feat(SW-1472): adjustments to destination page tracking
Approved-by: Matilda Landström
2025-03-18 07:09:40 +00:00
Erik Tiekstra
05addfa0bb feat(SW-1885): Added noindex/nofollow to pages with searchparams when generating metadata to avoid duplicate content issues
Approved-by: Linus Flood
2025-03-17 13:15:13 +00:00
Erik Tiekstra
aca3c7f398 feat(SW-1712): Preperation to accept multiple different icon identifiers for filters on startpage and destination overview page
Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-17 08:58:29 +00:00
Linus Flood
f17406d34f Merged in fix/reward-remove-cache (pull request #1542)
fix(reward): remove cache from profile service

* fix(reward): remove cache from profile service


Approved-by: Anton Gunnarsson
2025-03-14 14:38:38 +00:00
Joakim Jäderberg
fa63b20ed0 Merged in feature/redis (pull request #1478)
Distributed cache

* cache deleteKey now uses an options object instead of a lonely argument variable fuzzy

* merge

* remove debug logs and cleanup

* cleanup

* add fault handling

* add fault handling

* add pid when logging redis client creation

* add identifier when logging redis client creation

* cleanup

* feat: add redis-api as it's own app

* feature: use http wrapper for redis

* feat: add the possibility to fallback to unstable_cache

* Add error handling if redis cache is unresponsive

* add logging for unstable_cache

* merge

* don't cache errors

* fix: metadatabase on branchdeploys

* Handle when /en/destinations throws
add ErrorBoundary

* Add sentry-logging when ErrorBoundary catches exception

* Fix error handling for distributed cache

* cleanup code

* Added Application Insights back

* Update generateApiKeys script and remove duplicate

* Merge branch 'feature/redis' of bitbucket.org:scandic-swap/web into feature/redis

* merge


Approved-by: Linus Flood
2025-03-14 07:54:21 +00:00
Erik Tiekstra
a1303d3dae feat(SW-1846): Added query to fetch metadata on start page
* feat(SW-1846): Added query to fetch metadata on start page


Approved-by: Matilda Landström
2025-03-13 09:11:30 +00:00
Joakim Jäderberg
b472854243 Merged in fix/branch-deploy-metadata (pull request #1522)
fix: fallback to undefined when no PUBLIC_URL

* fix: fallback to undefined when no PUBLIC_URL


Approved-by: Linus Flood
2025-03-12 13:58:29 +00:00
Chuma Mcphoy (We Ahead)
1ef6fd02c1 Merged in feat/LOY-55-Filter-Modal (pull request #1509)
feat(LOY-55): Add FilterRewardsModal

* feat(LOY-55): Add rewards filtering functionality

- Implement dynamic rewards filtering by category and membership level
- Create FilterRewardsModal component for filtering rewards
- Add useFilteredRewards hook to handle filtering logic
- Update rewards schema and constants to support new filtering features
- Remove hardcoded page size and replace with constant

* fix(LOY-55): reuse existing tier to friend map

* refactor(LOY-55): fix checkbox onChange type safety

* refactor(LOY-55): Improve rewards filtering type safety and validation

* refactor(LOY-55): Update filter modal border color using design token


Approved-by: Christian Andolf
2025-03-12 13:29:35 +00:00
Christian Andolf
b45157818f feat(LOY-154): add expiration date to rewards 2025-03-11 16:25:33 +01:00
Erik Tiekstra
131cbfcda3 Merged in feat/SW-1845-metadata-hreflang (pull request #1504)
feat(SW-1845): Added alternates to metadata

* feat(SW-1845): Added alternates to metadata


Approved-by: Linus Flood
2025-03-10 10:15:02 +00:00
Erik Tiekstra
19bb965298 Merged in feat/SW-1745-language-switcher-non-contentstack-pages (pull request #1501)
feat(SW-1745): Query for language switcher returns just current pathname for non-contentstack pages except for hotelreservation paths

* feat(SW-1745): Query for language switcher returns just current pathname for non-contentstack pages except for hotelreservation paths


Approved-by: Linus Flood
2025-03-10 09:06:19 +00:00
Chuma Mcphoy (We Ahead)
b6ee3664f0 Merged in feat/SW-394-tracking-start-page (pull request #1499)
fix(SW-394): Tweak start page tracking config

* fix(SW-375): Update start page tracking config

* Rename tracking channel from 'start-page' to 'homepage'
* Simplify tracking properties for start page
* Standardize tracking data structure


Approved-by: Erik Tiekstra
Approved-by: Christian Andolf
2025-03-10 07:34:27 +00:00
Erik Tiekstra
d45487a3c7 fix(SW-1830): Adjusted schemas for city and country pages to accept less data
* fix(SW-1830): Adjusted schemas for city and country pages to accept less data


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-08 07:53:39 +00:00
Matilda Landström
7ce2ee2922 Merged in fix/remove-cities-without-hotels (pull request #1493)
fix: remove cities that don't have a city page

* fix: remove cities that don't have a city page


Approved-by: Erik Tiekstra
2025-03-07 07:00:35 +00:00
Erik Tiekstra
230b56b3bd Merged in feat/SW-1472-destination-tracking (pull request #1474)
Feat/SW-1472 destination tracking

* feat(SW-1472): Added default tracking for destination overview page

* feat(SW-1472): Added default tracking for destination country/city page

* feat(SW-1472): moved tracking functions to different files for better overview

* feat(SW-1472): added destination page tracking


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-06 10:15:33 +00:00
Erik Tiekstra
76c20df8e8 Merged in fix/SW-1819-batching-city-urls (pull request #1477)
fix(SW-1819): Batching fetch for city page urls

* fix(SW-1819): Batching fetch for city page urls


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-05 10:15:52 +00:00
Erik Tiekstra
93187a9c33 Merged in feat/SW-1751-destination-0-results (pull request #1448)
feat(SW-1751): Added alert if no results are found, also implemented default location data from Contentstack

* feat(SW-1751): Added alert if no results are found, also implemented default location data from Contentstack


Approved-by: Matilda Landström
2025-03-03 10:32:40 +00:00
Erik Tiekstra
4ad1799532 Merged in fix/SW-1784-hotel-url-fetching (pull request #1450)
fix(SW-1784): Fixed issue fetching all hotel urls at once.

* fix(SW-1784): Fixed issue fetching all hotel urls at once.


Approved-by: Christian Andolf
2025-03-03 06:37:55 +00:00
Erik Tiekstra
bee6c6d83a Merged in feat/SW-1451-country-page-sorting (pull request #1426)
Feat/SW-1451 country page filtering and sorting

* feat(SW-1451): implemented sorting and filtering on country pages

* feat(SW-1451): Renamed hotel-data to destination-data because of its multi-purpose use

* feat(SW-1451): Now filtering after change of url instead of inside the store after submit


Approved-by: Fredrik Thorsson
2025-02-28 06:30:16 +00:00
Christian Andolf
7d3c0c96e3 refactor(SW-1273): move find my booking routes in order to import them directly into next config 2025-02-27 09:57:18 +01:00
Christian Andolf
85cd815968 feat(SW-1273): find my booking page with rudimentary validation and redirect 2025-02-27 09:57:17 +01:00
Matilda Landström
d995dcf0aa Merged in fix/destination-overview-page (pull request #1423)
fix: typo

* fix: typo


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-27 06:31:02 +00:00
Linus Flood
a15936688b Merged in feat/breadcrumb-cache (pull request #1418)
feat:breadcrumbs - cache them

* feat:breadcrumbs - cache them


Approved-by: Anton Gunnarsson
2025-02-26 11:42:14 +00:00
Anton Gunnarsson
80100e7631 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
2025-02-26 10:36:17 +00:00