Commit Graph

33 Commits

Author SHA1 Message Date
Anton Gunnarsson
60af31762b Merged in fix/make-user-loyalty-optional (pull request #2044)
fix: Make loyalty optional on user

* Optional user loyalty

* merge


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-05-12 09:00:11 +00:00
Arvid Norlin
aaffcba94a fix(SW-2659): pass input to userTrackingInfo since lang needs to be passed from client 2025-05-08 11:54:44 +00:00
Niclas Edenvin
e0fe5ff0d5 fix(SW-2614): send language to API
We were missing the language param on some endpoints. We are still
missing it on some, but I left those without when we don't need it, e.g.
when only caring about the IDs in the response.
2025-05-06 10:17:05 +00:00
Michael Zetterberg
b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +00:00
Joakim Jäderberg
5784822a1e Merged in feature/SW-2320-languagebased-hide-for-next-release (pull request #1937)
Language based alternative to HIDE_FOR_NEXT_RELEASE

Approved-by: Anton Gunnarsson
2025-05-05 10:53:28 +00:00
Linus Flood
6979ac0c3b Merged in revert-pr-1925 (pull request #1927)
Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
2025-05-02 13:05:42 +00:00
Chuma Mcphoy (We Ahead)
87efb72ff2 Merged in fix/LOY-235-repeated-stays-when-clicking-show-more (pull request #1926)
fix(LOY-235): update pagination params for getPreviousStays and getUpcomingStays

* fix(LOY-235): update pagination parameters for getPreviousStays and getUpcomingStays functions


Approved-by: Erik Tiekstra
2025-05-02 12:49:58 +00:00
Arvid Norlin
7eeb0bbcac feat(SW-2116): avoid passing entire booking object to Room client component 2025-05-02 11:47:14 +02:00
Anton Gunnarsson
f4fe2e3a4a Merged in fix/sw-2548-invalid-tier-expiry-for-sas-eb-basic (pull request #1908)
Handle invalid tier expiry 1900-01-01 from SAS

* Handle invalid tier expiry 1900-01-01 from SAS

* Set correct sasTierExpirationDate


Approved-by: Linus Flood
2025-04-30 08:11:35 +00:00
Michael Zetterberg
5323a8e46e feat: harmonize log and metrics 2025-04-23 22:40:46 +00:00
Chuma Mcphoy (We Ahead)
27aef3982e Merged in fix/LOY-222-find-my-booking-urls-for-prod (pull request #1817)
Fix(LOY-222): Find my booking url handling

* fix(LOY-222): adapt findMyBooking url based on HIDE_FOR_NEXT_RELEASE

* feat(LOY-222): add current web paths for findMyBooking in multiple languages

* refactor(LOY-222): better env and new url constructions

* refactor(LOY-222): decouple env var handling from getCurrentWebUrl

* fix(LOY-222): update findMyBooking URL construction to use baseUrl

* fix(LOY-222): simplify findMyBooking URL handling for new web urls

* fix(LOY-222): Update Finnish path for hotel reservation lookup

* refactor(LOY-222): rename PUBLIC_URL to NEXT_PUBLIC_PUBLIC_URL for consistency


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-04-22 07:03:23 +00:00
Anton Gunnarsson
700141f45e Merged in fix/sw-2413-tier-expiration-validation (pull request #1806)
SW-2413 Update tier expiration validation

* Update tier expiration validation

* Set tierExpires default to null


Approved-by: Christian Andolf
Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-04-16 08:32:20 +00:00
Anton Gunnarsson
f87ea51b11 Merged in feature/sw-1881-boosted-by-scandic (pull request #1780)
Show boosted by scandic in SAS Linked Accounts

* Add boostedByScandic property to SAS membership

* Use get profile with extended partner data

* Display correct tier when EB is boosted by SF


Approved-by: Joakim Jäderberg
2025-04-14 13:14:01 +00:00
Anton Gunnarsson
5cb19dfccd Merged in feat/sw-1313-show-sas-points (pull request #1682)
SW-1313 - Add support for getting SAS EB points

Approved-by: Joakim Jäderberg
2025-04-08 11:03:38 +00:00
Anton Gunnarsson
c56a0b8ce9 Merged in feat/sw-1975-get-profile-v2 (pull request #1651)
Use get Profile V2 endpoint

Approved-by: Linus Flood
2025-04-08 06:26:00 +00:00
Chuma Mcphoy (We Ahead)
56d5ad77d1 Merged in fix/SW-2068-correct-public-url-from-my-stays-overview-page (pull request #1694)
feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

* feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

- Added language parameter to previous and upcoming stays queries.
- Updated Client components to utilize the new language hook.
- Refactored EmptyUpcomingStays component to dynamically generate links based on the current language.
- Adjusted user input validation to include optional language parameter.

* refactor(SW-2068): Update EmptyUpcomingStays components to use PUBLIC_URL + add utility to handle TLD based on language

* chore(SW-2068): Clarify TLD

* feat(SW-2068): documentation for getTldForLanguage

* refactor(SW-2068): Simplify booking URL construction in updateStaysBookingUrl

* refactor(SW-2068): Remove incorrect TLD update logic from booking URL construction

* refactor(SW-2068): Centralize booking URL paths using myBookingPath constant

* refactor(SW-2068): Streamline search params in booking URL construction logic in updateStaysBookingUrl


Approved-by: Christian Andolf
2025-04-02 12:44:02 +00:00
Linus Flood
34e398d377 Merged in hotfix/mystays-show-more (pull request #1698)
hotfix: my stays - pass language to trpc

* hotfix: my stays - pass language to trpc


Approved-by: Joakim Jäderberg
2025-04-01 18:18:47 +00:00
Joakim Jäderberg
87d97db324 Merged in fix/pageview-tracking (pull request #1687)
Fix/pageview tracking

* Restructure pageview tracking

* Update trpc version and turn off batching

* Remove unused state and remove logs

* cleanup

* remove unused code and console.logs


Approved-by: Linus Flood
2025-04-01 06:43:54 +00:00
Linus Flood
a1f539a810 Merged in fix/mystays-urls (pull request #1647)
Fix mystays url

* Fix mystays url


Approved-by: Michael Zetterberg
2025-03-26 13:17:08 +00:00
Linus Flood
ee741cc0e8 Merged in hotfix/mystays-url (pull request #1644)
Revert mystays booking url

* Revert mystays booking url


Approved-by: Michael Zetterberg
2025-03-26 13:01:14 +00:00
Linus Flood
4cd6e7b55b Merged in fix/tracking-pageload-issues (pull request #1630)
fix(tracking): fixes not sending pageview events when promise isn't resolving

* fix(tracking): fixes not sending pageview events when promise isn't resolving

* Refactor


Approved-by: Anton Gunnarsson
2025-03-25 12:33:04 +00:00
Christian Andolf
d67d04e416 fix(LOY-206): add missing lang input to friends transactions query, handles both server and client side 2025-03-25 09:42:37 +01: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
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
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
Christian Andolf
b0df70e552 feat(SW-1710): add access checks to my stay page for viewing booking 2025-03-10 09:45:56 +01: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
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
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
Linus Flood
0c498d82ca Merged in feat/trackingsdk-client (pull request #1420)
feat: trackingsdk as client component

* feat: trackingsdk as client component

* Cleanup

* Merge changes from feat/trackingsdk-client

* revert yarn.lock

* Added lcpTime and wait with tracking until we have the values


Approved-by: Joakim Jäderberg
2025-02-27 07:22:58 +00:00
Anton Gunnarsson
15fa01cbb2 Merged in fix/unpin-zod-version (pull request #1419)
Unpin zod version

Approved-by: Linus Flood
2025-02-26 12:46:26 +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