Commit Graph

66 Commits

Author SHA1 Message Date
Linus Flood
f0b245bdfe Merged in fix/cache-time-test-env (pull request #1544)
fix: lower cache time in test env

* fix: lower cache time in test env


Approved-by: Erik Tiekstra
2025-03-17 07:02:15 +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
Arvid Norlin
540402b969 Merged in feat/SW-1813 (pull request #1516)
Feat/SW-1813

* feat(SW-1652): handle linkedReservations fetching

* feat: add linkedReservation retry functionality

* chore: align naming

* feat(SW-1813): Add booking confirmation PriceDetailsModal


Approved-by: Simon.Emanuelsson
2025-03-14 13:49:22 +00:00
Bianca Widstam
abd401c4f4 Merged in feat/SW-1368-1369-Guarantee-late-arrival (pull request #1512)
Feat/SW-1368 1369 Guarantee late arrival

* feat(SW-1368-SW-1369): guarantee late arrival for confirmation page and my stay

* feat(SW-1368-SW-1369): guarantee late arrival updated design

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): fix merge with master

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): add redirect with refId

* feat(SW-1368-SW-1369): if booking completed redirect to confirmation page

* feat(SW-1368-SW-1369): fix comments pr

* feat(SW-1368-SW-1369): fix comments pr

* feat(SW-1368-SW-1369): fix rebase master

* feat(SW-1368-SW-1369): fix duplicate flex rate check

* feat(SW-1368-SW-1369): if any room is flex, card must be used

* feat(SW-1368-SW-1369): move callback route

* feat(SW-1368-SW-1369): top align checkbox

* feat(SW-1368-SW-1369): top align checkbox


Approved-by: Tobias Johansson
Approved-by: Niclas Edenvin
2025-03-14 10:43:14 +00:00
Anton Gunnarsson
dabfe0424b Merged in fix/update-my-pages-sas-url (pull request #1533)
Update My Pages SAS url

* Update My Pages SAS url


Approved-by: Linus Flood
2025-03-14 08:31:19 +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
Anton Gunnarsson
29f0eb4f21 Merged in feat/sw-1732-trigger-tier-match (pull request #1408)
SW-1732 Trigger SAS tier match

* Add endpoint for SAS tier match

* Add comment about future fix

* Move tier match to background request on my-pages/*

* Log result from tier match

* Clean up name etc

* Fix tier matched toast

Approved-by: Joakim Jäderberg
2025-03-13 14:12:31 +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
Tobias Johansson
ad05f792fb Merged in feat/SW-1078-rate-terms-scenarios (pull request #1500)
feat(SW-1078): mixed rate scenario

* feat(SW-1078): mixed rate scenario

* fix: change from css string modification to array join

* refactor: split out big reduce function into smaller parts

* fix: minor fixes and improvments

* fix: added room index map to localization string


Approved-by: Christian Andolf
2025-03-12 10:34:35 +00:00
Christian Andolf
b45157818f feat(LOY-154): add expiration date to rewards 2025-03-11 16:25:33 +01:00
Tobias Johansson
7c233ab846 Merged in feat/SW-1076-no-room-availability (pull request #1467)
Feat/SW-1076 no room availability

* fix: update booking error codes

* feat(SW-1076): handle no room availabilty on enter-details

* fix: parse to json in api mutation instead of expecting json

* fix: remove 'isComplete' state from sectionAccordion because it was not needed


Approved-by: Simon.Emanuelsson
2025-03-10 12:13:15 +00: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
Christian Andolf
9280bb3f1c Merged in feat/SW-1710-access-checks-my-stay (pull request #1486)
feat(SW-1710): add access checks to my stay page for viewing booking

Approved-by: Michael Zetterberg
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Pontus Dreij
2025-03-10 09:25:18 +00:00
Linus Flood
183a6476e7 Merged in fix/check-valid-session (pull request #1502)
Fix/check valid session

* fix:session - check if valid session

* Refactor


Approved-by: Joakim Jäderberg
2025-03-10 09:06:23 +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
Christian Andolf
b0df70e552 feat(SW-1710): add access checks to my stay page for viewing booking 2025-03-10 09:45:56 +01: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
Pontus Dreij
2509794d0c Merged in feat/SW-1676-modify-contact-details-my-stay-anonymous (pull request #1468)
Feat/SW-1676 modify contact details my stay anonymous

* feat(SW-1676): Modify guest details step 1

* feat(SW-1676) Integration to api to update guest details

* feat(SW-1676) Reuse of old modal

* feat(SW-1676) updated modify guest

* feat(SW-1676) cleanup

* feat(SW-1676) updated myStayReturnRoute to sessionStorage


Approved-by: Niclas Edenvin
2025-03-07 13:41:25 +00:00
Arvid Norlin
ec60e9abdd Merged in feat/SW-1652-confirmation-page (pull request #1483)
Feat/SW-1652 confirmation page

* feat(SW-1652): handle linkedReservations fetching

* fix: add missing translations

* feat: add linkedReservation retry functionality

* chore: align naming


Approved-by: Simon.Emanuelsson
2025-03-07 12:47:04 +00:00
Erik Tiekstra
7fa86a2077 Merged in feat/SW-1555-jobylon-feed-filter (pull request #1494)
Feat/SW-1555 jobylon feed filter

* feat(SW-1555): Added jobylon feed component

* feat(SW-1555): Added filter functionality for Jobylon feed


Approved-by: Matilda Landström
2025-03-07 11:46:42 +00:00
Hrishikesh Vaipurkar
5058180c41 feat: SW-1583 Implemented Reward nights on city search 2025-03-07 09:08:18 +00:00
Michael Zetterberg
6232ded991 feat(SW-375): consume new tokens in scandic-web 2025-03-07 07:24:38 +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
f045fe4a8a Merged in feat/SW-1555-jobylon-integration (pull request #1484)
Feat/SW-1555 jobylon integration

* feat(SW-1555): Added jobylon feed query

* feat(SW-1555): Added jobylon feed component


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-06 13:31:37 +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
Anton Gunnarsson
47785aa07a Merged in feat/sw-1825-my-pages-sas-link-visibility (pull request #1479)
* Use SAS membership for my pages sas link visibility

Approved-by: Joakim Jäderberg
2025-03-06 09:45:08 +00:00
Joakim Jäderberg
f36b90e474 Merged in feature/bookingwidget-client-side (pull request #1481)
Move more of BookingWidget to client SW-1639

* feat: move getLocations in booking widget to client side so that it's also cached on the client reducing the blinking when switching urls (and reducing duplicate calls)


Approved-by: Linus Flood
2025-03-05 13:37: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
Hrishikesh Vaipurkar
39b6774269 Merged in feat/SW-1589-implement-booking-code-enter (pull request #1368)
Feat/SW-1589 implement booking code enter

* feat: SW-1589 Booking code rate implementation

* feat: SW-1589 Optimized price display

* feat: SW-1589 Display standard price

* feat: SW-1589 Fixed rate title issue


Approved-by: Niclas Edenvin
2025-03-05 09:32:32 +00:00
Anton Gunnarsson
43d3713f59 Merged in feat/SW-1810-prevent-starting-link-flow-when-linked (pull request #1469)
Prevent SAS link flow when already linked

* Implement check for checking sas_eb membership when starting link flow


Approved-by: Joakim Jäderberg
2025-03-05 08:17:02 +00:00
Erik Tiekstra
81f1470405 Merged in fix/SW-1812-include-schema (pull request #1471)
fix(SW-1812): fixes the issue where we receive `null` instead of actual data inside the includeSchema

* fix(SW-1812): fixes the issue where we receive `null` instead of actual data inside the includeSchema


Approved-by: Matilda Landström
2025-03-04 14:43:36 +00:00
Niclas Edenvin
c88aa92aba Merged in feat/SW-1371-delete-ancillary (pull request #1455)
feat(SW-1371): delete ancillary

* feat(SW-1371): delete ancillary

* Remove outline from dialog

* Consistent return type from mutation

* Error flow


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij
2025-03-04 14:22:15 +00:00
Anton Gunnarsson
00fa7819b4 Merged in feat/membership-schema-update (pull request #1459)
Update membership schema to adapt for API changes

Approved-by: Michael Zetterberg
2025-03-04 08:00:33 +00:00
Matilda Landström
481d70104b Merged in fix/zod-validation (pull request #1463)
fix: displayWebPage zod schema

* fix: displayWebPage zod schema


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-03-04 07:32:44 +00:00
Chuma Mcphoy (We Ahead)
738c0e223f Merged in feat/LOY-156-localize-user-languages (pull request #1452)
feat(LOY-156): Improve language handling and localization in profile page

* feat(LOY-156): Improve language handling and localization in profile page

* refactor(LOY-156): Improve language display using Intl.DisplayNames

* feat(LOY-156): Enhance country display with localized country names

* refactor(LOY-156): Move countries data to a dedicated constants file & more type safe country mapping

* feat(LOY-156): Update isValidLang to use languageSchema + German translation for membership terms and conditions

* chore(LOY-156): language handling in profile component


Approved-by: Christian Andolf
2025-03-03 12:55:05 +00:00
Christian Andolf
e6e50ade45 Merged in feat/SW-1773-find-my-booking-validation (pull request #1453)
feat(SW-1773): add proper validation to form and query

Approved-by: Linus Flood
Approved-by: Chuma Mcphoy (We Ahead)
2025-03-03 12:24:01 +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
Simon.Emanuelsson
c3e3fa62ec Merged in fix/allow-single-rateCode (pull request #1438)
fix: allow rates that only have either of member or public to be selectable

* fix: allow rates that only have either of member or public to be selectable


Approved-by: Michael Zetterberg
2025-03-03 08:28:55 +00:00
Christian Andolf
c98ac88ac0 feat(SW-1773): add proper validation to form and query 2025-03-03 08:57:48 +01:00
Linus Flood
8942a1da11 Merged in feat/LOY-165-menu (pull request #1454)
feat/myprofile-menu fixed casing

* feat/myprofile-menu fixed casing


Approved-by: Erik Tiekstra
2025-03-03 06:52:33 +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
Bianca Widstam
4fc25e42b5 Merged in feat/SW-1648-booking-code-my-stay (pull request #1447)
feat(SW-1648): add booking code on my stay

* feat(SW-1648): add booking code on my stay


Approved-by: Niclas Edenvin
2025-02-28 14:09:23 +00:00
Simon Emanuelsson
92c5566c59 feat: add multiroom signup 2025-02-28 11:10:22 +01:00
Pontus Dreij
69139c5230 Merged in feat(SW-1279)-mystay-multirum-cancelling (pull request #1443)
Feat(SW-1279) mystay multirum cancelling

* feat(SW-1279) Cancelation text if non-user on room 2-4

* feat(SW-1279) cancel mystay multiroom

* feat(SW-1279): Added cancellation for multiroom on mystay


Approved-by: Niclas Edenvin
2025-02-28 07:17:25 +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
Niclas Edenvin
747201b0f7 Merged in feat/SW-1282-list-added-ancillaries (pull request #1416)
Feat/SW-1282 list added ancillaries

* feat(sw-1282): add icon to accordionItem

* feat(sw-1282): list added ancillaries

* Change translation key to already existing

* Remove duplicate key

* Move new files to the new folder structure


Approved-by: Pontus Dreij
2025-02-27 22:01:11 +00:00
Linus Flood
427cc10edc Merged in fix/gla-remove-unused-prop (pull request #1427)
fix: guarantee for late arrival prop removed

* fix: guarantee for late arrival prop removed

* Merge master

* Revert typecheck fix


Approved-by: Michael Zetterberg
2025-02-27 16:18:42 +00:00