Commit Graph

176 Commits

Author SHA1 Message Date
Erik Tiekstra
3f632e6031 Merged in fix/BOOK-293-button-variants (pull request #3371)
fix(BOOK-293): changed variants and props on IconButton component

* fix(BOOK-293): changed variants and props on IconButton component

* fix(BOOK-293): inherit color for icon


Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
2025-12-19 12:32:52 +00:00
Anton Gunnarsson
6ee262ad89 Merged in chore/booking-flow-cleaning (pull request #3354)
chore: Clean booking-flow

* Clean booking-flow

* Fix type issue


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-12-17 13:04:26 +00:00
Anton Gunnarsson
eb3b18b35e Merged in chore/partner-sas-404-page (pull request #3339)
chore: Fix partner-sas 404 page

* Fix 404 page

* Fix 404 links

* Fix links


Approved-by: Matilda Landström
2025-12-17 13:03:33 +00:00
Joakim Jäderberg
79f1c516c0 Merged in fix/dont-send-expected-error-types-to-sentry (pull request #3358)
fix: don't send expected errors to Sentry

* fix: don't send expected errors to Sentry

* remove BAD_REQUEST from ignore-list for TRPC errors due to BAD_REQUEST being used improperly


Approved-by: Anton Gunnarsson
2025-12-17 12:46:07 +00:00
Matilda Landström
3dce2d310f Merged in refactor/SW-2826-align-urls (pull request #3359)
refactor(SW-2826): align urls

* refactor(SW-2826): align urls


Approved-by: Anton Gunnarsson
2025-12-17 09:33:08 +00:00
Joakim Jäderberg
f27ba7ccb6 Merged in chore/release-pipeline (pull request #3352)
Add scripts for handling deployments

Approved-by: Linus Flood
2025-12-16 11:42:51 +00:00
Anton Gunnarsson
c153e0db50 Merged in chore/delete-unused-files (pull request #3346)
chore: Delete unused files

* Delete unused files

Ignore design-system for now


Approved-by: Joakim Jäderberg
2025-12-12 13:56:51 +00:00
Anton Gunnarsson
e5149846e5 Merged in chore/upgrade-to-next16 (pull request #3305)
chore(SW-3665): Upgrade to Next 16

* Upgrade partner-sas

* Upgrade scandic-web to next 16

* Update peerDep versions

* Fix revalidateTag

* Remove comment

* Merge branch 'master' into chore/upgrade-to-next16

* Update netlify adapter

* Build with webpack instead of turbopack

* Revert from proxy to middleware

* Merge branch 'master' into chore/upgrade-to-next16

* Revert proxy type

* Fix react types versions

* 16.0.9

* Bump to 16.0.10


Approved-by: Linus Flood
2025-12-12 09:17:15 +00:00
Anton Gunnarsson
7faa9933a2 Merged in feat/sw-3642-inject-sas-eb-payment (pull request #3243)
feat(SW-3642): Enable SAS EB payments

* Wip add SAS eb payment

* Add validate payment call

* Check booking status payment method to determine validation

* Clean up getPaymentData

* Fix PartnerPoints casing

* Add comment for validatePartnerPayment error handling

* Remove comment


Approved-by: Joakim Jäderberg
2025-12-11 13:23:12 +00:00
Joakim Jäderberg
7eb74ea239 Merged in chore/replace-deprecated-body (pull request #3300)
Replace deprecated <Body> with <Typography>

* chore: replace deprecated body component

* refactor: replace Body component with Typography across various components

* merge


Approved-by: Bianca Widstam
Approved-by: Matilda Landström
2025-12-09 12:45:34 +00:00
Matilda Landström
359f034041 Merged in feat/Lokalise-fetch-9.12.25 (pull request #3318)
Fetch from Lokalise 9.12.25

* Fetch from Lokalise 9.12.25


Approved-by: Bianca Widstam
2025-12-09 10:16:44 +00:00
Joakim Jäderberg
8b94540d19 Merged in chore/redirect-counter (pull request #3302)
Counter name is now searchable and add counter for redirects

* refactor: createCounter() only takes one argument, the name of the counter. Makes it easier to search for

* feat: add counter when we do a redirect from redirect-service


Approved-by: Linus Flood
2025-12-08 10:24:05 +00:00
Joakim Jäderberg
de4b3c1c3c Merged in chore/eslint-curly-braces (pull request #3304)
Chore/eslint curly braces

* Add eslint rule for curly braces

* run eslint --fix for all files


Approved-by: Linus Flood
2025-12-08 07:56:21 +00:00
Linus Flood
3bd23bf56e Merged in feat/book-595-gla-tracking-fix (pull request #3294)
feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* Fixed on SAS as well


Approved-by: Joakim Jäderberg
2025-12-05 08:01:48 +00:00
Anton Gunnarsson
d6623adf9f Merged in fix/next-security-patch (pull request #3291)
fix: Bump Next for security patch

* Bump next for security patch


Approved-by: Linus Flood
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-12-04 09:56:06 +00:00
Joakim Jäderberg
a016e18e4a Merged in feature/SW-3539-log-number-of-logins (pull request #3284)
feat(SW-3539): count number of logins

* feat(SW-3539): count number of logins


Approved-by: Anton Gunnarsson
2025-12-03 09:50:59 +00:00
Matilda Haneling
7acfde7b49 Merged in fix/hamburger-menu-freezes (pull request #3276)
fix(BOOK-613): pinned react aria compnents and aria overlays versions

* fix(BOOK-613): pinned react aria compnents and aria overlays versions


Approved-by: Linus Flood
2025-12-03 07:46:01 +00:00
Anton Gunnarsson
d6ed81d90b Merged in fix/sw-3648-fix-hero-gradient (pull request #3277)
fix(SW-3648): Correct hero gradient colors

* Fix hero gradient colors


Approved-by: Linus Flood
2025-12-02 12:28:25 +00:00
Anton Gunnarsson
7c247d7100 Merged in fix/sw-3645-mobile-menu-overlap (pull request #3260)
fix(SW-3645): Use same close button for mobile menus

* Use same close button for mobile menus


Approved-by: Linus Flood
2025-12-02 12:27:57 +00:00
Anton Gunnarsson
5da3e457cb Merged in chore/migrate-from-next-lint (pull request #3263)
chore: Migrate from next lint to eslint

* Migrate scandic-web

* Migrate partner-sas

* Enable any rule in partner-sas


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-12-02 10:08:56 +00:00
Anton Gunnarsson
be28982e73 Merged in fix/sw-3650-prevent-line-break-in-user-menu (pull request #3274)
fix(SW-3650): Prevent line break in user menu

* Add nowrap to points container


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-12-02 10:08:47 +00:00
Joakim Jäderberg
f5dd6740d0 Merged in chore/upgrade-vitest4 (pull request #3253)
chore: upgrade to vitest@4

* chore: upgrade to vitest@4


Approved-by: Anton Gunnarsson
2025-12-01 12:41:12 +00:00
Linus Flood
3e7e0b1d7d Merged in feat/lokalise-sync-011225 (pull request #3258)
feat(lokalise): sync 1/12

* feat(lokalise): sync 1/12
2025-12-01 08:14:23 +00:00
Joakim Jäderberg
9294f0958b Merged in feat/SW-3639-autologin-sas (pull request #3245)
Feat/SW-3639 autologin sas

* wip

* cleanup

* remove commented code and default lang to EN


Approved-by: Anton Gunnarsson
2025-11-28 13:00:42 +00:00
Rasmus Langvad
c65091b36a Merged in feat/SW-3644-storybook-v10 (pull request #3240)
feat(SW-3644): Storybook v10

* Auto update to Storybook v10

* Add scandic theme and logo

* Update yarn.lock

* Update formatting of package.json

* Update vitest config and playwright plugin

* Remove vitest 4 update

* Re-added comment

* Update the Typography component to explicitly return React.ReactNode

* Add an explicit type assertion to the export

* Add an explicit type assertion to the export for Checkbox

* Explicit return type assertion

* Add an explicit type assertion to the export

* Update @types/react and fix ts warnings

* Updated typings


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-11-28 08:05:40 +00:00
Matilda Landström
86e15a58c6 Merged in lokalise-profiling-consent (pull request #3242)
chore: fetch from Lokalise

* chore: fetch from Lokalise

* fix: change to correct label


Approved-by: Linus Flood
2025-11-27 12:52:32 +00:00
Matilda Landström
1dabd3cdc7 Merged in chore/Lokalise-update-20251127 (pull request #3241)
chore: fetch from Lokalise

* chore: fetch from Lokalise


Approved-by: Linus Flood
2025-11-27 08:34:18 +00:00
Joakim Jäderberg
aa007afedf Merged in fix/remove-session-on-sas-refresh-error (pull request #3204)
fix(sas auth): remove session when we get a RefreshAccessTokenError

* fix(sas auth): remove session when we get a RefreshAccessTokenError


Approved-by: Linus Flood
2025-11-24 07:35:58 +00:00
Linus Flood
fd6909add5 Merged in feat/book-595-gla-tracking (pull request #3187)
feat(BOOK-595): add pageview tracking to gla-callback and get-booking pages

* feat(BOOK-595): add pageview tracking to gla-callback and get-booking pages


Approved-by: Bianca Widstam
2025-11-20 13:50:40 +00:00
Joakim Jäderberg
b1d7fbad88 Merged in chore/upgrade-sentry (pull request #3191)
feat: upgrade sentry and use metrics

* feat: upgrade sentry and use metrics

* remove ununsed deps

* rename span

* .


Approved-by: Linus Flood
2025-11-20 13:24:53 +00:00
Anton Gunnarsson
36cd1a5cdf Merged in fix/sw-3627-pass-user-access-token-payment-callback (pull request #3189)
fix(SW-3627): Pass social session user token to payment callback apge

* Pass social session user token to payment callback apge


Approved-by: Linus Flood
2025-11-20 12:36:40 +00:00
Joakim Jäderberg
db30588f63 Merged in feature/SW-3595-sas-info-boxes (pull request #3177)
Feature/SW-3595 Add info boxes to SAS start page & Eurobonus alert to select-hotel page on SAS

* wip

* feat(SW-3595): Add info boxes to SAS start page

* Add InfoBox to design-system
* Add background gradient to SAS start page

* update variable naming and conditionalize the eurobonus message on select-hotel

* SAS startpage update default message

* make select-hotel a bit more generic with slot={} instead of alert={}


Approved-by: Anton Gunnarsson
2025-11-19 10:50:04 +00:00
Linus Flood
4c4957be41 Merged in feat/lokalise-sync-181125 (pull request #3166)
feat(lokalise): sync 18/11-25

* feat(lokalise): sync 18/11-25


Approved-by: Matilda Landström
2025-11-19 07:13:39 +00:00
Anton Gunnarsson
42571949bd Merged in fix/sw-3607-mobile-menu-position-incorrect (pull request #3158)
fix(SW-3607): Add missing CSS variables for mobile menu positioning

* Add missing CSS variables for mobile menu positioning


Approved-by: Joakim Jäderberg
2025-11-14 12:18:55 +00:00
Linus Flood
966429313b Merged in feat/lokalise-sync-131125 (pull request #3157)
feat(lokalise): sync 13/11-25

* feat(lokalise): sync 13/11-25


Approved-by: Matilda Landström
2025-11-13 15:38:31 +00:00
Anton Gunnarsson
6ed5dd1394 Merged in feat/add-config-flag-for-saved-credit-cards (pull request #3151)
feat(SW-3611): Add config flag for saved credit cards

* Add config flag for saved credit cards


Approved-by: Linus Flood
2025-11-13 13:20:05 +00:00
Joakim Jäderberg
aca2c1d60c Merged in feature/simple-sas-book-url (pull request #3082)
feature(SAS): add simple url for entering the booking flow /[lang]/book-hotel/[city]

* Merged in fix/book-115-hidden-focus-indicators (pull request #2925)

Fix/book 115 hidden focus indicators

* added focus ring to "how it works" text and close button in modal

* fix(BOOK-115): added focus ring to Hotel Sidepeek close button

* fix(BOOK-115): enabled selecting ancillaries with keyboard nav

* fix(BOOK-115): added focus indicator to "View and print receipt" in Manage Stay

* fix(BOOK-105 & BOOK-115): combined the two radio groups in payment selection to one, fixes focus indicator issue

* fix(BOOK-115): added focus indicator to shortcut links

* fix(BOOK-115): updated ancillaries keyboard selection

* fix(BOOK-115): removed tabIndex from Link component

* fix(BOOK-115): fixed single payment radio button not focusable

* fix(BOOK-115): updated  to onKeyDown

* added id to "credit card"

* removed toUpperCase() on lables

* removed brackets

* moved the focus indicator to the DS Button component

* removed !important from ButtonLink css

* changed <label> to <fieldset> and <legend> and added aria…
* 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

* Merged in fix/BOOK-457-select-rate-lowestroomprice- (pull request #3061)

* Fix(BOOK-457): Reduced lowestRoomPrice tracking call from multiple times to one

* fix(BOOK-457): feat(SW-3590): Included RoomsLoadedEvent on select-rate page

Approved-by: Linus Flood

* Merged in feature/SW-3506-refresh-tokens (pull request #3064)

feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3506-refresh-tokens


Approved-by: Anton Gunnarsson

* Merged in feat/BOOK-434-users-should-redirect-to- (pull request #3087)

* feat(BOOK-434): Redirect user to city/country page if wrong filter url
* feat(BOOK-434): Handled map view

Approved-by: Erik Tiekstra

* Merged in fix/SW-3553-logged-in-details- (pull request #3073)

* fix(SW-3553): Fixed screen scolled & locked on click of menu

Approved-by: Joakim Jäderberg

* Merged in feat/book-522-align (pull request #3101)

feat(BOOK-522): align items in topmenu, header and booking widget

* feat(BOOK-522): align items in topmenu, header and booking widget

* Delete old css variable and use new

* Fixed underline on icons


Approved-by: Erik Tiekstra

* Merged in fix/LOY-444-points-to-keep-left-text (pull request #3086)

fix(LOY-444): fix markerLabel text when left aligned

* fix(LOY-444): fix markerLabel text when left aligned


Approved-by: Matilda Landström

* 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

* Merged in fix/system-fragment (pull request #3102)

fix: faulty system fragment

* fix: faulty system fragment


Approved-by: Linus Flood

* fix(BOOK-498): removed and changed z-index values to have booking widget overlapping correctly on mobile.

Approved-by: Bianca Widstam
Approved-by: Hrishikesh Vaipurkar

* Merged in revert-gql (pull request #3104)

Revert gql

* Revert "Merged in fix/system-fragment (pull request #3102)"

This reverts commit 0d479eb337.

* Revert "Merged in chore/replace-graphql-tag/loader (pull request #3096)"

This reverts commit e9bd159e98.

* Merged in fix/BOOK-438-breadcrumbs-seo-filter (pull request #3103)

feat(BOOK-438): add breadcrumbs on seofilter pages

* feat(BOOK-438): add breadcrumbs on seofilter pages

* feat(BOOK-438): remove unused function


Approved-by: Hrishikesh Vaipurkar

* Merged in chore/regular-price-tests (pull request #3075)

chore: Add tests for regular price calculations

* Add tests for calculateRegularPrice

* Add tests for getRegularPrice

* Add multiroom test


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood

* Merged in fix/wrap-webviews-with-sessionprovider (pull request #3111)

Wrap webviews with SessionProvider

* wrap webviews with sessionprovider


Approved-by: Linus Flood

* feat(BOOK-488): Trimming booking code before validating

Approved-by: Bianca Widstam

* feat(BOOK-472): Different placement of no availability alert on mobile viewports

Approved-by: Bianca Widstam

* Merged in feat/sw-3601-hookfix (pull request #3113)

Feat(SW-3601): useIsUserLoggedIn needs to check webview token 

* fix(SW-3601): useIsUserLoggedIn needs to check webview token

* Check if we have webview token as well

* .


Approved-by: Joakim Jäderberg

* Merged in fix/add-missing-partner-data (pull request #3116)

fix: Add param to getScandicUser for extended data

* Add param to getScandicUser for extended data


Approved-by: Linus Flood

* Merged in feat/sw-3596-cache (pull request #3106)

feat(SW-3598): Don't call redis api if cachetime=0

* feat(SW-3596): no cache if ttl=0

* Fixed on set as well

* No cache if redemption

* Revert no cache if redemption


Approved-by: Joakim Jäderberg

* feat(BOOK-212): Refactored LoginButton and added successful tracking functionality

Approved-by: Linus Flood

* Merged in fix/document-undefined (pull request #3118)

Fix/document undefined

* fix: check if document is undefined

* fix: check if document is undefined


Approved-by: Linus Flood

* Merged in feat/sw-3604-webviews (pull request #3123)

feat(SW-3604): wrap mystay with bookingflowconfig

* feat(SW-3604): wrap mystay with bookingflowconfig


Approved-by: Joakim Jäderberg

* Merged in feature/turbopack (pull request #3117)

Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/simple-sas-book-url
2025-11-13 13:01:26 +00:00
Joakim Jäderberg
f6b06556f6 Merged in chore/typegen-nextjs-routes (pull request #3147)
Make check-types dependent on next typegen

* add typegen as a prestep


Approved-by: Anton Gunnarsson
2025-11-13 09:28:07 +00:00
Joakim Jäderberg
dc53ab9245 Merged in chore/upgrade-next (pull request #3124)
Upgrade next@15.5.6

* chore: upgrade next@15.5.6

* chore: upgrade turborepo@2.6.1

* fix typings for scandic-web

* fix: set correct type for pages

* cleanup

* fix more route.ts typing issues

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next

* explicitly import the types


Approved-by: Linus Flood
2025-11-13 07:33:56 +00:00
Linus Flood
2b2894749d Merged in feat/sw-3551-robots (pull request #3139)
feat(SW-3551): added a robots.txt file

* feat(SW-3551): added a robots.txt file

* Added to sas page as well


Approved-by: Bianca Widstam
2025-11-12 14:18:21 +00:00
Linus Flood
19495eed28 Merged in feat/basic-user (pull request #3135)
feat(SW-3610): Get basic user from api

* feat(SW-3610): Get basic user from api

* .

* Optional profileid


Approved-by: Anton Gunnarsson
2025-11-12 14:00:56 +00:00
Anton Gunnarsson
94ac475d5e Merged in fix/update-build-ignore-script (pull request #3129)
fix: Add missing package to ignore script

* Add missing package to ignore script
2025-11-11 14:58:09 +00:00
Joakim Jäderberg
de9b5d7686 Merged in fix/social-login-scopes (pull request #3126)
Set profile_read scope for social login

* set profile_read scope


Approved-by: Anton Gunnarsson
2025-11-11 12:35:27 +00:00
Joakim Jäderberg
bc5a606289 Merged in feature/turbopack (pull request #3117)
Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood
2025-11-11 09:51:40 +00:00
Anton Gunnarsson
0b569e28ce Merged in fix/add-missing-partner-data (pull request #3116)
fix: Add param to getScandicUser for extended data

* Add param to getScandicUser for extended data


Approved-by: Linus Flood
2025-11-10 15:23:07 +00:00
Linus Flood
5770dcdd9c Merged in revert-gql (pull request #3104)
Revert gql

* Revert "Merged in fix/system-fragment (pull request #3102)"

This reverts commit 0d479eb337.

* Revert "Merged in chore/replace-graphql-tag/loader (pull request #3096)"

This reverts commit e9bd159e98.
2025-11-07 13:13:28 +00:00
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
Joakim Jäderberg
61af689853 Merged in feature/SW-3506-refresh-tokens (pull request #3064)
feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3506-refresh-tokens


Approved-by: Anton Gunnarsson
2025-11-07 09:59:41 +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
Joakim Jäderberg
07ef6d96d6 Merged in chore/remove-jsonsort-dictionaries (pull request #3084)
chore: No need to sort dictionary files anymore now that we have man-made IDs

* No need to sort dictionary files anymore now that we have man-made IDs


Approved-by: Erik Tiekstra
Approved-by: Linus Flood
2025-11-06 14:18:50 +00:00