Commit Graph

153 Commits

Author SHA1 Message Date
Joakim Jäderberg
e9bd159e98 Merged in chore/replace-graphql-tag/loader (pull request #3096)
Use turbopack for dev builds.
Remove graphql-tag/loader, replaced by gql`` tag literals instead.



Approved-by: Linus Flood
2025-11-07 12:33:17 +00:00
Linus Flood
1a24eb68c7 Merged in feat/sw-3596-console (pull request #3100)
feat(SW-3596): added lint rule for no console.log. Use logger instead.

* feat(SW-3596): added lint rule for no console.log. Use logger instead.


Approved-by: Joakim Jäderberg
2025-11-07 08:14:16 +00:00
Christel Westerberg
20bf89d206 Merged in fix/STAY-72-resend-booking-confirmation (pull request #3067)
feat(STAY-72): add resend confirmation button and endpoint

* feat(STAY-72): add resend confirmation button and endpoint

* fix: replace modify buttons with design system button


Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Erik Tiekstra
2025-11-06 13:40:15 +00:00
Joakim Jäderberg
ec511e2c8b Merged in feature/tsgo (pull request #3069)
Use tsgo for typechecking

* switch to tsgo for type-checking

* Merged in chore/remove-cypress (pull request #3066)

chore: remove unused dependencies

* chore: remove cypress

* remove unused deps

* update yarn.lock after removing unused deps


Approved-by: Anton Gunnarsson

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

* fix(BOOK-496): Slowed down the MarqueeText component animation

Approved-by: Matilda Landström

* switch to tsgo for type-checking

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

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

* switch to use yarn check-types in lint-staged

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


Approved-by: Linus Flood
2025-11-06 12:34:23 +00:00
Joakim Jäderberg
645a99a844 Merged in feature/LOY-415-sj-widget (pull request #3074)
feat(LOY-415): Add SJ widget

* feat(LOY-415): Add SJ widget
can be added as dynamic content to Content Pages

* feat(LOY-415): init SJ widget with a useEffect instead due to onLoad only being called the first time

* make sure to only initialize the SJ widget once and handle navigation


Approved-by: Erik Tiekstra
2025-11-05 13:05:15 +00:00
Chuma Mcphoy (We Ahead)
94f6af563d Merged in feat/LOY-421-Next-Stay (pull request #3026)
Feat(LOY-421): Next Stay

* feat(LOY-421): Next stay WIP

* fix(LOY-421): clean upp css and jsx

* chore(LOY-421): css cleanup

* fix(LOY-421): fix test

* only show button if isWebAppOrigin is true

* chore(LOY-421): update section header component

* chore(LOY-421): remove redundant test case


Approved-by: Matilda Landström
2025-11-05 09:09:57 +00:00
Matilda Landström
4970dfa2ed Merged in fix/LOY-439-boosted-by-sas-bug (pull request #3047)
fix(LOY-439): fix "boosted by sas" issue

* fix(LOY-439): fix "boosted by sas" issue


Approved-by: Chuma Mcphoy (We Ahead)
2025-11-04 09:09:30 +00:00
Erik Tiekstra
4491d1de8e feat(BOOK-62): Added new InfoCard component and using that on hotel pages
Approved-by: Bianca Widstam
2025-11-04 07:39:33 +00:00
Christel Westerberg
a2e0f7244a fix: Hide opt-out option for ancillary email 2025-11-03 16:05:54 +01:00
Hrishikesh Vaipurkar
1c7f72e95d Merged in fix/SW-3578-user-is-forced-to-login- (pull request #3044)
fix(SW-3578): Fixed session issue when sas session expires

* fix(SW-3578): Fixed session issue when sas session expires

* base socialLogin auto-features on validSession and being linked

* remove unused object

* remove 'import server-only' for isValidSession() since it's only using passed data

* remove isValidClientSession()


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
2025-11-03 12:50:25 +00:00
Joakim Jäderberg
15a2da333d Merged in feature/SW-3572-hotel-data-endpoint (pull request #3051)
SW-3572 API route for listing hotels per city or country

* wip hotel data endpoint

* Correct route params type

* wip

* skip static paths call

* timeout when getting destinations take too long

* call noStore when we get a timeout

* add cache-control headers

* .

* .

* .

* wip

* wip

* wip

* wip

* add route for getting hotels per country

* include city when listing by country

* fix distance SI unit

* fix sorting

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3572-hotel-data-endpoint

* packages/tracking passWithNoTests

* revalidate must be static value

* remove oxc reference

* cleanup

* cleanup hotel api route

* feat(SW-3572): cleanup error handling


Approved-by: Anton Gunnarsson
2025-11-03 12:10:22 +00:00
Anton Gunnarsson
eea21e67d9 Merged in feat/sw-3556-sas-userinfo-scandic-keys (pull request #3033)
feat(SW-3556): Add Scandic user details to tracking userinfo if linked

* Add scandic details to userinfo if linked


Approved-by: Hrishikesh Vaipurkar
2025-10-30 12:26:57 +00:00
Joakim Jäderberg
47210491c3 Merged in sync-lokalise-2025-10-30 (pull request #3038)
* sync lokalise

* sync defaultMessage


Approved-by: Anton Gunnarsson
2025-10-30 08:47:44 +00:00
Joakim Jäderberg
bf6ed7778e Merged in feat/syncDefaultMessage (pull request #3022)
Sync defaultMessage from lokalise

* Enhance translation sync functionality and tests

- Added logging for found component files during sync.
- Introduced tests for handling complex components with replacements.
- Updated regex in syncIntlFormatMessage to support optional second arguments.
- Removed unused test files.

* feat(syncDefaultMessage): add script for syncing default message with lokalise

* feat(syncDefaultMessage): add script for syncing default message with lokalise


Approved-by: Matilda Landström
2025-10-30 08:38:50 +00:00
Matilda Haneling
2c6d9860e1 Merged in feat/book-425-optimize-campaign-rate-card (pull request #3015)
Feat/book 425 optimize campaign rate card

* feat(BOOK-425): design updates to RateCard

* feat(BOOK-425): design updates to campaign BookingCodeChip

* feat(BOOK-425): fixed breakfast message & booking code chips on select rate and enter detailss

* feat(BOOK-425): fixed booking code chip on Booking Confirmation page

* fixed draft comments

* fixed more comments

* feat(BOOK-425): removed fixed height from RateCard banner

* fixed another variable comment

* fixed more pr comments

* fixed more pr comments

* updated ratecard campaign standard rate title color

* removed deconstructed props


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
2025-10-29 13:54:29 +00:00
Erik Tiekstra
4c10989e8e Feat/BOOK-424 campaign banner
Approved-by: Bianca Widstam
2025-10-29 12:47:40 +00:00
Christel Westerberg
377c8886ad Merged in fix/STAY-73-opt-in-email (pull request #3028)
Fix/STAY-73 opt in email

* fix: let user opt-in for modification email when adding ancillaries

* fix: add toast when successfully removing an ancillary


Approved-by: Erik Tiekstra
Approved-by: Elin Svedin
2025-10-29 12:45:18 +00:00
Joakim Jäderberg
a4f1a55e56 Merged in feat/SW-3549-handle-unlinked-account (pull request #3019)
fix(SW-3549): update social session management functions for clarity and consistency

* refactor(SW-3549): rename session management functions for clarity and consistency

* merge


Approved-by: Hrishikesh Vaipurkar
2025-10-28 09:51:30 +00:00
Joakim Jäderberg
3b3e7308cc Merged in feat/SW-3549-pass-scandic-token (pull request #2989)
Feat/SW-3549 pass scandic token

* WIP pass scandic token

* pass scandic token when booking

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* pass user token when doing availability search

* undo changes

* merge

* Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988)

fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages

* Merged in fix/update-promo-error-modal-text (pull request #2990)

fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall

* Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991)

fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar

* Merged in feat/lokalise-rebuild (pull request #2993)

Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood

* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994)

feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg

* merge

* replace getRedemptionTokenSafely() with context based instead

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* add booking scope

remove unused getMembershipNumber()


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
2025-10-24 13:17:02 +00:00
Linus Flood
acdc3dcec1 Merged in fix/book-453-linkconnection (pull request #2972)
fix(BOOK-453): avoid linkConnection invalid

* fix(BOOK-453): avoid linkConnection invalid

* test

* test

* test

* Merge master
2025-10-22 12:39:17 +00:00
Anton Gunnarsson
c435cdba68 Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988)
fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages
2025-10-22 07:04:21 +00:00
Hrishikesh Vaipurkar
2a28681259 Merged in fix/SW-3526-show-sas-eb-points-unlinked- (pull request #2987)
fix(SW-3256): Fixed Users with 0 points throws error
Approved-by: Anton Gunnarsson
2025-10-21 13:01:08 +00:00
Anton Gunnarsson
710309b7eb Merged in feat/sw-3545-update-sas-userinfo-tracking (pull request #2982)
feat(SW-3545): Update partner-sas userinfo tracking

* Update loginType to eurobonus

* Remove tracking booking code properties when disabled

* Add EB user data to tracking

* Fix type issue


Approved-by: Joakim Jäderberg
2025-10-17 09:35:37 +00:00
Anton Gunnarsson
bf19d3960b Merged in chore/remove-lodash (pull request #2983)
chore: Remove lodash-es

* lodash-es is not edge safe so replace it with native functions


Approved-by: Joakim Jäderberg
2025-10-17 07:47:20 +00:00
Joakim Jäderberg
291310e841 Merged in feature/curity-social-login (pull request #2963)
feat(SW-3541): Do social login after login to SAS

* feat(auth): wip social login via curity

* Setup social login auth flow

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/curity-social-login

* Added support for getting scandic tokens and refresh them

* feat: Enhance social login and session management with auto-refresh and improved error handling

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/curity-social-login

* wrap layout in suspense

* revert app/layout.tsx

* fix import

* cleanup

* merge

* merge

* dont pass client_secret in the url to curity

* add state validation when doing social login through /authorize

* remove debug logging


Approved-by: Anton Gunnarsson
2025-10-16 12:47:12 +00:00
Bianca Widstam
6c65951fa7 Merged in BOOK-448-select-rate-reload-bookingcode (pull request #2974)
(BOOK-448): prevent refetching select rate availability when adding room bookingcode

* (BOOK-448): prevent refetching select rate availability when adding room bookingcode


Approved-by: Linus Flood
2025-10-16 06:16:35 +00:00
Erik Tiekstra
c6f76b83cc Merged in fix/BOOK-456-destination-city-validation-error (pull request #2975)
fix(BOOK-456): Added nullish() to destination pages content and sidepeek content schema to avoid unexpected errors

* fix(BOOK-456): Added nullish() to destination pages content and sidepeek content schema to avoid unexpected errors


Approved-by: Linus Flood
2025-10-15 14:41:26 +00:00
Matilda Landström
33f4952d94 Merged in fix/mising-promo-campaign-ref (pull request #2969)
fix: missing promo ref

* fix: missing promo ref


Approved-by: Erik Tiekstra
2025-10-15 11:03:55 +00:00
Matilda Landström
38d7cd677a Merged in fix/mising-promo-campaign-ref (pull request #2968)
fix: add missing promo campaign page ref

* fix: add missing promo campaign page ref


Approved-by: Erik Tiekstra
2025-10-15 08:51:48 +00:00
Hrishikesh Vaipurkar
78ede453a2 Merged in feat/SW-3526-show-sas-eb-points-rate-in- (pull request #2933)
feat(SW-3526): Show EB points rate and label in booking flow

* feat(SW-3526): Show EB points rate and label in booking flow

* feat(SW-3526) Optimized points currency code

* feat(SW-3526) Removed extra multiplication for token expiry after rebase

* feat(SW-3526): Updated to exhaustive check and thow if type error

Approved-by: Anton Gunnarsson
2025-10-15 06:54:44 +00:00
Hrishikesh Vaipurkar
73af1eed9b Merged in fix/SW-3536-wl-cannot-initialize-payment- (pull request #2953)
fix SW-3536 Fixed create booking call for sas logged in users in the partner site
Approved-by: Anton Gunnarsson
2025-10-14 09:35:53 +00:00
Chuma Mcphoy (We Ahead)
29f51e655e Merged in fix/LOY-359-revert-to-loyalty-level-to-support-boosted-level (pull request #2954)
fix(LOY-359): Revert back to allow non-native loyalty level in overview cards

* fix(LOY-359): Revert back to allow non-native loyalty level in overview cards


Approved-by: Erik Tiekstra
2025-10-13 06:51:59 +00:00
Linus Flood
205e5a1843 Merged in fix/getProfile-2 (pull request #2951)
fix: get profile

* fix: get profile


Approved-by: Anton Gunnarsson
2025-10-10 10:58:14 +00:00
Linus Flood
1668baf04b Merged in fix/getProfile (pull request #2950)
Fix/getProfile

* fix(mypages): do not fetch SAS data on overview page and use correct mfa value when masking personal data

* Merge branch 'master' into fix/getProfile

* feat(profile): revert and dont mask data :O


Approved-by: Anton Gunnarsson
2025-10-10 10:42:23 +00:00
Erik Tiekstra
50aaa095eb fix(BOOK-412): Using internalCategoryName to map ancillaries and show translated categoryName only
Approved-by: Linus Flood
2025-10-10 09:10:51 +00:00
Linus Flood
f70d4d7c7f Merged in fix/getProfile (pull request #2945)
fix(mypages): do not fetch SAS data on overview page and use correct mfa value when masking personal data

* fix(mypages): do not fetch SAS data on overview page and use correct mfa value when masking personal data


Approved-by: Anton Gunnarsson
2025-10-10 07:45:06 +00:00
Anton Gunnarsson
a5759205ec Merged in feat/sw-3525-sas-member-type-in-tracking (pull request #2931)
feat(SW-3525): Set correct member type in tracking for partner-sas

* Set correct member type in tracking for partner-sas


Approved-by: Joakim Jäderberg
2025-10-09 12:47:38 +00:00
Erik Tiekstra
d298d5c2ff feat(BOOK-436): Added manage cookie bot dynamic content to content pages
Approved-by: Linus Flood
2025-10-09 12:46:17 +00:00
Chuma Mcphoy (We Ahead)
2f10a453d4 Merged in fix/LOY-399-include-lang-in-activate-call (pull request #2927)
fix(LOY-399): Add lang to promo campaign call

* fix(LOY-399): Add lang to promo campaign call


Approved-by: Matilda Landström
2025-10-08 11:26:08 +00:00
Joakim Jäderberg
17df3ee71a Merged in feature/SW-3516-pass-eurobonus-number-on-booking (pull request #2902)
* feat(SW-3516): Include partnerLoyaltyNumber on bookings

- Added user context to BookingFlowProviders for user state management.
- Updated booking input and output schemas to accommodate new user data.
- Refactored booking mutation logic to include user-related information.
- Improved type definitions for better TypeScript support across booking components.


Approved-by: Anton Gunnarsson
2025-10-08 10:48:42 +00:00
Erik Tiekstra
b685c928e4 fix(BOOK-413): Respecting original_url inside RTE for entry links
Approved-by: Matilda Landström
2025-10-08 07:25:32 +00:00
Matilda Landström
2176a7dd6f Merged in feat/LOY-394-promos-linkable (pull request #2918)
feat(LOY-394): add promo campaign page link

* feat(LOY-394): make promo campaigns linkable from everewhere


Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
2025-10-07 13:30:34 +00:00
Erik Tiekstra
36aa5089ea fix(BOOK-138): Fixed several issues after country map functionality was added
* fix(BOOK-138): Fixed issue when hovering markers and info windows for both city cluster marker as city markers.

Approved-by: Matilda Landström
2025-10-07 11:37:54 +00:00
Matilda Landström
d88cd3f418 Merged in fix/content-connection-block (pull request #2922)
fix: add back content block connection

* fix: add back content block connection


Approved-by: Chuma Mcphoy (We Ahead)
2025-10-07 10:32:39 +00:00
Hrishikesh Vaipurkar
d3368e9b85 Merged in feat/SW-2782-create-sas-branded-header (pull request #2878)
feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated UI as per design

* feat(SW-2782): Optimised code with use of Popover and modal from RAC


Approved-by: Anton Gunnarsson
2025-10-06 08:46:26 +00:00
Erik Tiekstra
7fcd5833bd feat(BOOK-414): Added hotel branding themes to hotelpages
Approved-by: Matilda Landström
2025-10-02 12:34:38 +00:00
Matilda Landström
ea130ffaf8 Merged in feat/LOY-362-content-block (pull request #2897)
feat(LOY-362): fix content block

* feat(LOY-362): fix content block


Approved-by: Chuma Mcphoy (We Ahead)
2025-10-02 06:34:46 +00:00
Joakim Jäderberg
8498026189 Merged in chore/refactor-hotel-trpc-routes (pull request #2891)
Chore/refactor hotel trpc routes

* chore(SW-3519): refactor trpc hotel routers

* chore(SW-3519): refactor trpc hotel routers

* refactor

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/refactor-hotel-trpc-routes


Approved-by: Linus Flood
2025-10-01 12:55:45 +00:00
Joakim Jäderberg
764e7cf49a Merged in fix/include-info-when-missingLangInTRPC (pull request #2890)
* chore: include more info when we get missing lang in tRPC context


Approved-by: Linus Flood
2025-10-01 11:43:12 +00:00
Erik Tiekstra
4f151b143e Merged in fix/metadata-schema (pull request #2893)
fix: Updated metadata schema to handle transformed hotel data

* fix: Updated metadata schema to handle transformed hotel data


Approved-by: Linus Flood
2025-10-01 11:33:58 +00:00