Commit Graph

51 Commits

Author SHA1 Message Date
Anton Gunnarsson
bbcabfa0ba Merged in feat/sw-2864-move-hotels-router-to-trpc-package (pull request #2410)
feat (SW-2864): Move booking router to trpc package

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Move booking router to trpc package

* Merge branch 'master' into feat/sw-2864-move-hotels-router-to-trpc-package


Approved-by: Linus Flood
2025-06-26 09:02:59 +00:00
Anton Gunnarsson
002d093af4 Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389)
feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package


Approved-by: Linus Flood
2025-06-26 07:53:01 +00:00
Anton Gunnarsson
846fd904a6 Merged in feat/sw-2859-set-up-shared-trpc-package (pull request #2319)
feat(SW-2859): Create trpc package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Clean up tests

* Create trpc package and move initialization

* Move errors and a few procedures

* Move telemetry to common package

* Move tokenManager to common package

* Add Sentry to procedures

* Clean up procedures

* Fix self-referencing imports

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* Fix lang imports


Approved-by: Linus Flood
2025-06-18 12:14:20 +00:00
Chuma Mcphoy (We Ahead)
2101b79db1 Merged in feat/LOY-230-Microsoft-Entra-ID-Auth (pull request #2113)
Feat(LOY-230): DTMC Routes with Entra ID Auth & Error Page Handling

* feat(LOY-230): Link Scandic Friends and Azure accounts

* fix(LOY-230): remove employee id param setting

* fix(LOY-230): return token in jwt callback for auth.dtmc.ts


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-06-18 10:22:04 +00:00
Christian Andolf
bd24506ad0 Merged in fix/restore-icon-variant-link (pull request #2340)
fix: restore icon variant for link since inline-flex makes its children inline but not the box itself

Approved-by: Arvid Norlin
2025-06-13 10:19:14 +00:00
Christian Andolf
9551a629fa refactor: move divider to design system
remove not used variants and duplicate colors
2025-06-13 11:27:50 +02:00
Christian Andolf
9ee0ec2d46 fix: restore icon variant for link since inline-flex makes its children inline but not the box itself 2025-06-12 14:41:02 +02:00
Chuma Mcphoy (We Ahead)
144a33fa30 Merged in feat/LOY-233-success-banner-for-dtmc-linking (pull request #2328)
feat(LOY-233): create success banner for successful DTMC linking

* feat(LOY-233): create success banner for successful DTMC linking

* fix(LOY-233): code cleanup

* fix(LOY-233): use new design vars for alert bg colors


Approved-by: Erik Tiekstra
2025-06-11 08:52:28 +00:00
Christian Andolf
d7579e88d6 fix(LOY-243): adjust font-sizes in text and gap on container 2025-06-09 17:21:03 +02:00
Christian Andolf
7fdffb8e1d feat(LOY-243): add change name disclaimer to profile 2025-06-09 12:46:28 +02:00
Christian Andolf
21566eb5b5 fix: performance fixes for dtmc animation 2025-06-05 10:34:57 +02:00
Christian Andolf
13136509b6 fix: replace old spacing variables with new matching ones 2025-06-02 15:34:42 +02:00
Christian Andolf
b3b3704c86 feat: update links default color to match design documents 2025-06-02 15:34:40 +02:00
Anton Gunnarsson
cbf9e7b7c2 Merged in chore/next15 (pull request #1999)
chore (SW-834): Upgrade to Next 15

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* wip: fix remaining issues from codemod

serverClient is now async because context use headers()
getLang is now async because it uses headers()

* Minor cleanup

* Inline react-material-symbols package

Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.

* Fix missing awaits

* Disable modal exit animations

Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563.
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html

* Remove unstable cache implementation and use in memory cache locally

* Fix ref type in SelectFilter

* Use cloneElement to add key prop to element


Approved-by: Linus Flood
2025-06-02 11:11:50 +00:00
Christian Andolf
aa06a0654d fix: cleanup profile pages in renaming to follow naming convention
cleanup profile page html to be valid

replace old temp design system components with new ones

divider is now correctly an hr element

less section elements to be valid html
2025-05-23 09:20:21 +02:00
Anton Gunnarsson
9af93fecda Update framer-motion 2025-05-22 14:00:38 +02:00
Christian Andolf
76994f6e01 fix: replace temp design system components with design system package in surprises 2025-05-21 17:13:46 +02:00
Linus Flood
ad5ec80645 Merged in feat/sw-2855-urls (pull request #2177)
feat: sw-2855 urls

* feat: sw-2855 urls


Approved-by: Joakim Jäderberg
2025-05-21 09:11:02 +00:00
Christian Andolf
822043f433 fix(LOY-93): add quickfix for hiding confetti canvas when reduced motion is turned on
we shouldn't need this fix but currently tsparticles doesn't support this because of a bug in their lib
2025-05-19 15:55:39 +02:00
Christian Andolf
6fad2a6022 fix: handle non loaded surprises in case they're returned as null from server 2025-05-19 10:59:55 +02:00
Christian Andolf
84d4faf6df fix(LOY-199): add missing benefits link 2025-05-19 09:15:50 +02:00
Anton Gunnarsson
94a00d40b7 Merged in feat/sw-2526-update-sas-error-handling-after-api-changes (pull request #1886)
SW-2526 - Update error handling for link SAS account

* Update error handling for link SAS account

* Capture schema validation error and send to Sentry

* Add cases for unhandled otp errors


Approved-by: Joakim Jäderberg
2025-05-12 11:48:31 +00:00
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
Christian Andolf
2b32a9c1ff chore: rename functions to make more sense 2025-05-09 09:57:55 +02:00
Christian Andolf
485fddfa3d fix: make sure of design system button and inherent typography props 2025-05-09 09:57:40 +02:00
Christian Andolf
494f44f216 Merged in feat/LOY-198-dtmc-card-animation (pull request #2010)
feat(LOY-198): dtmc card animation when hovering

Approved-by: Chuma Mcphoy (We Ahead)
2025-05-08 14:55:06 +00:00
Christian Andolf
53c21bb601 feat(LOY-199): add benefits link to dtmc modal 2025-05-08 14:25:16 +02:00
Christian Andolf
d53b07b907 feat(LOY-198): dtmc card animation when hovering 2025-05-08 11:59:20 +02:00
Christian Andolf
62eef660fe feat(LOY-197): add screen wake lock to dtmc 2025-05-07 14:01:51 +02:00
Christian Andolf
0066c058e3 fix(LOY-196): change svg color to be derived from css and variables instead 2025-05-07 10:48:08 +02:00
Christian Andolf
8ca0aee25e fix(LOY-196): replace employee number with dummy value
add support for className to modal
2025-05-07 10:32:32 +02:00
Christian Andolf
9b22459837 feat(LOY-196): add modal to dtmc button containing card 2025-05-06 15:08:54 +02:00
Christian Andolf
7359ab4afd feat(LOY-195): digital team member card button on my pages overview 2025-05-06 14:46:12 +02:00
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Anton Gunnarsson
8f67e20300 Merged in fix/sw-2453-refresh-data-on-tier-match (pull request #1866)
Refresh page if tier match happens on My Pages SAS page

* Refresh page if tier match happens on My Pages SAS page


Approved-by: Joakim Jäderberg
2025-04-28 07:28:58 +00:00
Christian Andolf
8a9107cdf2 fix: now using the correct method to instantiate motion since its constructor is deprecated in favor of the create method 2025-04-16 14:11:24 +02: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
3449ccec52 Merged in feat/sw-2232-sas-api-updates (pull request #1786)
SW-2232 Adapt SAS router to API changes

* Adapt sas procedures to api changes

* Remove debug logs

* Capture performLevelUpgrade error

* More sentry logging

* Merge branch 'master' into feat/sw-2232-sas-api-updates


Approved-by: Joakim Jäderberg
2025-04-14 13:42:58 +00: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
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
Christian Andolf
5e55b60807 fix: add new feature flag for surprises 2025-04-07 14:26:13 +02:00
Matilda Landström
1239f0c662 Merged in feat/SW-1711-SW-2077-icons (pull request #1709)
Fix(SW-1711)/(SW-2077): Export icons individually

* fix(SW-1711): export icons individually


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-04-07 07:25:25 +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
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
45d57a9c89 fix(LOY-175): fix issues of getting correct expiration date on reward coupon 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
ac8df04c49 fix(LOY-192): fix toasts for surprises in webviews 2025-03-20 16:27:24 +01: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
Christian Andolf
b45157818f feat(LOY-154): add expiration date to rewards 2025-03-11 16:25:33 +01: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