Commit Graph
100 Commits
Author SHA1 Message Date
Joakim Jäderberg 16cc26632e Merged in chore/refactor-trpc-booking-routes (pull request #3510)
feat(BOOK-750): refactor booking endpoints

* WIP

* wip

* wip

* parse dates in UTC

* wip

* no more errors

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

* .

* cleanup

* import named z from zod

* fix(BOOK-750): updateBooking api endpoint expects dateOnly, we passed ISO date


Approved-by: Anton Gunnarsson
2026-02-02 14:28:14 +00:00
Joakim Jäderberg 3d02a5257a Merged in fix/SW-3707-footer-icon-color (pull request #3490)
fix(SW-3707): fix footer LanguageSwitcher icon colors

* fix(SW-3707): fix footer LanguageSwitcher icon colors


Approved-by: Anton Gunnarsson
2026-01-26 07:56:01 +00:00
Joakim Jäderberg 2ff8697b68 Merged in chore/get-only-release-tags-on-branch (pull request #3443)
chore: get only release-tags on current branch

* chore: get only release-tags on current branch


Approved-by: Linus Flood
2026-01-15 12:38:01 +00:00
Joakim Jäderberg 6835348af5 Merged in feature/SW-3700-reduce-biroscript-size (pull request #3444)
feat(SW-3700): Remove font ligatures from BiroScript

* feat(SW-3700): Remove font ligatures from BiroScript


Approved-by: Linus Flood
2026-01-15 12:37:46 +00:00
Joakim Jäderberg 7ee1499e8b Merged in chore/revert-plugin-change (pull request #3441)
revert plugin change

* revert plugin change
2026-01-15 07:16:28 +00:00
Joakim Jäderberg 2410d887df Merged in chore/include-tags-when-syncing-2 (pull request #3431)
actively fetch and push tags when syncing master -> test

* actively fetch and push tags when syncing master -> test

* git fetch --all --tags


Approved-by: Anton Gunnarsson
2026-01-14 12:46:25 +00:00
Joakim Jäderberg 982350149b Merged in chore/icon-suspense-boundary (pull request #3437)
Wrap material icon in a empty suspense boundary

* Wrap material icon in a empty suspense boundary

* skip lazy loading icons

* remove suspense boundary

* Don't import lazy from react when generating icon file


Approved-by: Linus Flood
2026-01-14 12:26:05 +00:00
Joakim Jäderberg d284e82828 Merged in chore/fix-tests (pull request #3430)
Chore/fix tests

* chore: Upgrade nextjs@16.1.1

* chore: upgrade next@16.1.1

* upgrade underlying types

* merge

* Fix broken tests

* bump @swc/plugin-formatjs to latest version

* bump sentry

* transpile "import-in-the-middle" & "require-in-the-middle"

* revert next@16.1.1 upgrade

* revert transpilation addition

* .
2026-01-13 13:48:06 +00:00
Joakim Jäderberg dba4c81618 Merged in chore/include-tags-when-syncing (pull request #3426)
Include tags when syncing master -> test

* include tags when syncing master -> test


Approved-by: Linus Flood
2026-01-13 12:40:57 +00:00
Joakim Jäderberg d9a6038b89 Merged in chore/move-env-watermark (pull request #3425)
chore: move EnvironmentWatermark

* chore: move EnvironmentWatermark


Approved-by: Linus Flood
2026-01-13 08:03:05 +00:00
Joakim Jäderberg 8befbf405a Merged in chore/icons-to-components (pull request #3420)
Convert all material symbols to react components

* convert all material symbols to react components

* remove svgr


Approved-by: Linus Flood
2026-01-12 14:55:08 +00:00
Joakim Jäderberg 562ad28cac Merged in chore/semver-build-info (pull request #3418)
build info should have + sign in semver

* build info should have + sign in semver
2026-01-12 09:47:31 +00:00
Joakim Jäderberg 488a396cfa Merged in feature/SW-3616-partner-points-my-stay (pull request #3407)
Feature/SW-3616 partner points my stay

* feat(SW-3616): display partner points in my stays

* null check roomPointType

* Lowercase POINTS in my stay

* include other than Scandic points when displaying price details modal


Approved-by: Anton Gunnarsson
2026-01-12 09:24:04 +00:00
Joakim Jäderberg 99537b13e8 Merged in chore/add-error-details-for-sentry (pull request #3378)
Include more details when throwing errors for debugging in Sentry

* WIP throw errors with more details for debugging in Sentry

* Fix throwing response-data

* Clearer message when a response fails

* Add message to errors

* better typings

* .

* Try to send profileID and membershipNumber to Sentry when we fail to parse the apiResponse

* rename notFound -> notFoundError

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/add-error-details-for-sentry


Approved-by: Linus Flood
2026-01-12 09:01:44 +00:00
Joakim Jäderberg 411a8a2a2e Merged in chore/add-package-to-semver (pull request #3408)
add package-name to semver

* add package-name to semver


Approved-by: Linus Flood
2026-01-09 07:48:47 +00:00
Joakim Jäderberg 36ddbc4435 Merged in chore/add-release-version-meta-tag (pull request #3399)
Add release version meta tag + preview environment

* include release version in meta tag

do polyfills in one place

* fix: add preview as a named sentry environment


Approved-by: Linus Flood
2026-01-08 15:05:43 +00:00
Joakim Jäderberg 1ba94ff70a Merged in chore/fix-semver (pull request #3393)
Chore/fix semver

* fix semver versioning

* fix semver versioning

* Merge branch 'chore/fix-semver' of bitbucket.org:scandic-swap/web into chore/fix-semver

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

* reset to master


Approved-by: Linus Flood
2026-01-07 10:49:14 +00:00
Joakim Jäderberg ae06b845da Merged in chore/remove-eslint-from-config (pull request #3388)
remove deprecated 'eslint' from next.config.ts

* remove deprecated 'eslint' from next.config.ts


Approved-by: Linus Flood
2026-01-07 07:26:30 +00:00
Joakim Jäderberg 028c77c923 Merged in chore/check-types-before-build (pull request #3326)
chore: check types before build

* chore: check types before build

* remove unused package.json scripts

* merge


Approved-by: Linus Flood
2026-01-07 07:06:36 +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
Joakim Jäderberg 2d09538db6 Merged in fix/redis-api-send-logs (pull request #3363)
fix(redis-api): logs were no longer sent to Sentry

* fix(redis-api): logs were no longer sent to Sentry

* revert @elysia/server-timing pin

* .


Approved-by: Linus Flood
2025-12-17 09:23:11 +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
Joakim Jäderberg 494bf2ba78 Merged in fix/BOOK-672-hotels-without-related-links (pull request #3348)
fix(BOOK-672): remove unused relationsships that threw when missing

* fix(BOOK-672): remove unused relationsships that threw when missing


Approved-by: Linus Flood
2025-12-15 13:19:05 +00:00
Joakim Jäderberg eb90c382b8 Merged in fix/remove-scandic-friends-robots-override (pull request #3322)
fix: remove /scandic-friends indexable override

* fix: remove /scandic-friends indexable override


Approved-by: Bianca Widstam
Approved-by: Anton Gunnarsson
2025-12-11 12:51:36 +00:00
Joakim Jäderberg fde77a06ce Merged in feature/redis-api-get-all-keys-endopoint (pull request #3306)
feature: Add getAllKeys endpoint

* feature: Add getAllKeys endpoint

* rename DELETE_BATCH_SIZE to SCAN_BATCH_SIZE


Approved-by: Anton Gunnarsson
2025-12-10 09:36:53 +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
Joakim Jäderberg 177c2e7176 Merged in feature/ai-instructions (pull request #3293)
chore: add ai instruction files

* chore: add ai instruction files

* let the instruction file apply to all files, not only ts files


Approved-by: Linus Flood
2025-12-08 12:23:22 +00:00
Joakim Jäderberg 5236b1dc71 Merged in fix/preprod-watermark (pull request #3307)
fix: watermark in preprod incorrectly showed test

* fix: watermark in preprod incorrectly showed test


Approved-by: Matilda Landström
2025-12-08 11:28:17 +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
Joakim Jäderberg 60f4b8d878 Merged in fix/redis-api-package-mismatch (pull request #3278)
Fix/redis api package mismatch

* Migrate scandic-web

* Migrate partner-sas

* Enable any rule in partner-sas

* fix: redis-api package version mismatch

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/redis-api-package-mismatch


Approved-by: Anton Gunnarsson
2025-12-03 09:54:30 +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
Joakim Jäderberg 99497488f3 Merged in chore/ignore-e2e-tests-in-ci (pull request #3285)
chore: ignore e2e tests when running yarn test

* chore: ignore e2e tests when running yarn test
2025-12-03 08:52:08 +00:00
Joakim Jäderberg 22d00bb363 Merged in feature/add-login-test-2 (pull request #3261)
e2e tests for my pages

* feature/add-e2e-tests-for-mypages

* remove unneccesary awaits


Approved-by: Linus Flood
2025-12-03 07:59:11 +00:00
Joakim Jäderberg 95473927f2 Merged in chore/block-commits-on-master (pull request #3264)
chore: block commits and pushes directly on master

* chore: block commits and pushes directly on master


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-12-02 08:05:25 +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
Joakim Jäderberg 3ec78b4fab refactor: update error handling and logging for improved error details display 2025-12-01 13:00:44 +01:00
Joakim Jäderberg f6a807758e Merged in chore/remove-enrichHotel-call (pull request #3244)
Chore/remove enrichHotel call

* chore: remove enrichHotel api call

* include cityId when errors happen

* remove unused funciton and cleanup code

* tests no longer expect us to have called a function that is not used

* remove commented code


Approved-by: Linus Flood
2025-12-01 07:49:59 +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
Joakim Jäderberg 3a6abb73c2 Merged in fix/align-react-versions (pull request #3250)
fix: align react versions

* fix: align react versions


Approved-by: Anton Gunnarsson
2025-11-28 10:03:29 +00:00
Joakim JäderbergandLinus Flood c4de9a2262 Merged in fix/logging-warmup-background (pull request #3235)
Fix/logging warmup background

* fix: logging in background functions

* fix logging

* fix logging

* fix logging

* fix: add error logging when unable to get from cache

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/logging-warmup-background


Approved-by: Linus Flood
2025-11-26 13:03:28 +00:00
Joakim JäderbergandLinus Flood 4174d43e16 Merged in fix/logging-warmup-background (pull request #3232)
Fix/logging warmup background

* fix: logging in background functions

* fix logging

* fix logging

* fix logging


Approved-by: Linus Flood
2025-11-26 12:21:42 +00:00
Joakim JäderbergandLinus Flood 5477343373 Merged in fix/dont-remove-items-when-unable-to-parse (pull request #3217)
fix: dont remove cache entries when unable to parse api response

* fix: dont remove cache entries when unable to parse api response


Approved-by: Linus Flood
2025-11-25 10:24:33 +00:00
Joakim JäderbergandLinus Flood c3381e8100 Merged in feat/redis-fix (pull request #3209)
Feat/redis fix

* feat(redis): delete multiple keys in one partition scan

* fix(BOOK-603): make it possible to do multiple deletes in redis at once using one partition scan

* filter out invalid keys

* fix: if no valid keys are present return early

* .

* fix: do redis deletes after scanning through all keys

* fix: do redis deletes after scanning through all keys


Approved-by: Linus Flood
2025-11-25 10:19:19 +00:00
Joakim Jäderberg 1ecbca40a3 Merged in fix/add-logging-when-cache-get-fails (pull request #3215)
fix: add logging when we fail to get cache data

* fix: add logging when we fail to get cache data


Approved-by: Linus Flood
2025-11-25 09:52:45 +00:00
Joakim Jäderberg 8ed16a0119 Merged in feat/redis-fix (pull request #3207)
Feat/redis fix

* feat(redis): delete multiple keys in one partition scan

* fix(BOOK-603): make it possible to do multiple deletes in redis at once using one partition scan


Approved-by: Linus Flood
2025-11-24 10:17:35 +00:00
Joakim Jäderberg 8a5fef6d3a Merged in chore/rename-trpc-distribution (pull request #3205)
rename trpc distribution

* rename trpc distribution


Approved-by: Linus Flood
2025-11-24 08:07:53 +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
Joakim Jäderberg dd9ffecb02 Merged in fix/reorder-trpc-reporting-middlewares (pull request #3193)
reorder trpc middlewares so that Sentry understands where errors occur

* reorder trpc middlewares so that Sentry understands where errors occur


Approved-by: Linus Flood
2025-11-24 07:34:53 +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
Joakim Jäderberg 0e66f1b6de Merged in fix/warmup-not-throwing (pull request #3179)
fix: warmup threw error

* fix: warmup threw error

* .


Approved-by: Linus Flood
2025-11-19 13:49:44 +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
Joakim Jäderberg f8dee7eb7f Merged in chore/watermark-environments (pull request #3159)
feat: display environment watermark

* feat: display environment watermark

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

* remove unused function


Approved-by: Linus Flood
2025-11-14 12:27:30 +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
Joakim Jäderberg 593cb04a5a Merged in fix/SW-3608-make-user-properties-optional (pull request #3133)
fix(SW-3608): make user properties, that are based on audience, optional

* fix(SW-3608): make user properties, that are based on audience, optional

* fix(SW-3608): make user properties, that are based on audience, optional

* .


Approved-by: Anton Gunnarsson
2025-11-12 12:20:47 +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
Joakim Jäderberg 0490badbb1 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
2025-11-11 07:21:29 +00:00
Joakim Jäderberg 0e2ed17e3b Merged in fix/wrap-webviews-with-sessionprovider (pull request #3111)
Wrap webviews with SessionProvider

* wrap webviews with sessionprovider


Approved-by: Linus Flood
2025-11-10 12:23:36 +00:00
Joakim Jäderberg 0d479eb337 Merged in fix/system-fragment (pull request #3102)
fix: faulty system fragment

* fix: faulty system fragment


Approved-by: Linus Flood
2025-11-07 12:45:36 +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
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
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
Joakim Jäderberg 392db172c4 Merged in chore/remove-svgr/webpack (pull request #3071)
remove unused @svgr/webpack

* remove unused @svgr/webpack

* merge


Approved-by: Linus Flood
2025-11-05 09:31:09 +00:00
Joakim Jäderberg 59143b4023 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
2025-11-04 10:20:06 +00:00
Joakim Jäderberg b8d887f82d Merged in chore/move-destinations-api-endpoint (pull request #3058)
chore: move /api/destinations/[country]/[?city] -> /api/web/destinations/[country]/[?city]

* chore: move /api/destinations/[country]/[?city] -> /api/web/destinations/[country]/[?city]
2025-11-03 13:33:45 +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
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
Joakim Jäderberg 56b44c16d4 Merged in chore/upgrade-netlify-nextjs-plugin (pull request #3032)
chore: upgrade @netlify/plugin-nextjs

* chore: upgrade @netlify/plugin-nextjs


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-10-29 13:36:27 +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 9c78d6a98a Merged in fix/my-stay-bookingflowconfig-missing (pull request #3020)
fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set

* fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set


Approved-by: Bianca Widstam
2025-10-27 14:55:00 +00:00
Joakim Jäderberg 3c72d043e2 Merged in fix/select-payment-method-set-form-name (pull request #3012)
Fix/select payment method set form name

* fix(selectPaymentMethod): Set form name for tests

* fix(selectPaymentMethod): Set form name for tests
2025-10-27 09:12:25 +00:00
Joakim Jäderberg 108bb2b319 Merged in chore/create-logger-tests (pull request #2996)
Tests for common/logger

* chore: add tests for createLogger

* chore: add tests for createLogger


Approved-by: Linus Flood
2025-10-24 13:28:56 +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
Joakim JäderbergandLinus Flood 6543ca5dc3 Merged in fix/remove-telemetry-console-log (pull request #3009)
chore: remove telemetry console.log()

* chore: remove telemetry console.log()


Approved-by: Linus Flood
2025-10-24 09:37:39 +00:00
Joakim Jäderberg aafad9781f 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
2025-10-22 11:00:03 +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
Joakim Jäderberg bb3ac1f105 Merged in fix/rename-logout-button (pull request #2978)
Fix rename button logout -> log out

* rename button logout -> log out

* rename button login -> log in


Approved-by: Linus Flood
2025-10-16 08:39:49 +00:00
Joakim Jäderberg b5817c5dcd Merged in fix/allow-double-locales (pull request #2977)
Fix/allow double locales

* allow double locales for now

* update redirects


Approved-by: Linus Flood
2025-10-16 07:59:42 +00:00
Joakim Jäderberg 5c96f98e2e Merged in chore/redirect-update (pull request #2939)
* Update redirects

* Merge

* Update redirects and handle empty entries


Approved-by: Linus Flood
2025-10-10 08:21:49 +00:00
Joakim Jäderberg f3f75e8ece Merged in feature/BOOK-401-handle-new-redirects-part-2 (pull request #2944)
feat(BOOK-401): Add support for new-url -> new-url in the redirect-service

* Switch to typescript

* add new dependencies for tests and typescript

* Switch to typescript

* add new dependencies for tests and typescript

* rewrite to typescript and include tests

* rewrite to typescript and include tests

* refactor: update README and scripts for CSV handling; rename update script to generate

* include csv-data folder

* feat(BOOK-401): Add support for new-url -> new-url in the redirect-service

* Add errors when given unsupported URLs

* merge


Approved-by: Linus Flood
2025-10-10 07:51:47 +00:00
Joakim Jäderberg eba6319ebe Merged in feature/BOOK-401-handle-new-redirects (pull request #2942)
feat(BOOK-401): redirect-service with tests and typings

* Switch to typescript

* add new dependencies for tests and typescript

* Switch to typescript

* add new dependencies for tests and typescript

* rewrite to typescript and include tests

* rewrite to typescript and include tests

* refactor: update README and scripts for CSV handling; rename update script to generate

* include csv-data folder


Approved-by: Linus Flood
2025-10-10 07:32:32 +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
Joakim Jäderberg 0e0efa48a8 Merged in fix/include-service-token-in-debug-data (pull request #2903)
fix: include service token in the debug route

* fix: include service token in the debug route


Approved-by: Bianca Widstam
Approved-by: Hrishikesh Vaipurkar
2025-10-03 13:16:51 +00:00
Joakim Jäderberg 9292c437f4 fix(SW-3442) getLowestRoomPrice - cannot read property of undefined
* fix: getLowestRoomPrice throws when given unexpected data
* dont track lowestRoomPrice if unavailable


Approved-by: Hrishikesh Vaipurkar
2025-10-03 13:16:25 +00:00
Joakim Jäderberg 5bf18f0412 Merged in fix/optional-chaining-lint-issue (pull request #2905)
* remove optional chaining with force unrwap


Approved-by: Bianca Widstam
2025-10-03 12:50:30 +00:00
Joakim Jäderberg bec3188199 Merged in fix/hotel-reservation-used-faulty-generateMetadata (pull request #2904)
fix: hotelReservation used faulty generateMetadata

* fix: hotelReservation used faulty generateMetadata


Approved-by: Bianca Widstam
2025-10-03 07:19:37 +00:00
Joakim Jäderberg ea5c82fef0 Merged in feature/SW-3515-join-scandic-friends-placeholder (pull request #2883)
feat(SW-3515): display placeholder for join scandic friends

* feat(SW-3515): display placeholder for join scandic friends

* add missing variant config


Approved-by: Linus Flood
2025-10-02 13:55:24 +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äderbergandLinus Flood 332abdfba0 Merged in fix/metadata-details-page (pull request #2895)
fix(SW-3490): Fix faulty metadata for enter-details

* fix(SW-3490): Fix faulty metadata for enter-details


Approved-by: Linus Flood
2025-10-01 11:53:05 +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
Joakim Jäderberg df8e223d23 Merged in SW-3490-set-metadata-for-routes (pull request #2881)
SW-3490 set metadata for routes
* feat(SW-3490): Set metadata title for hotelreservation paths

Approved-by: Anton Gunnarsson
2025-10-01 11:34:52 +00:00
Joakim Jäderberg e4c5363fe9 Merged in fix/BOOK-399-default-language (pull request #2877)
fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* PR fixes: reuse types and include local dev error message


Approved-by: Anton Gunnarsson
Approved-by: Linus Flood
2025-09-29 14:18:27 +00:00
Joakim Jäderberg e24c92918e Merged in fix/BOOK-398-polyfill-at (pull request #2876)
Fix/BOOK-398 polyfill at

* fix(BOOK-398): Add polyfills for .at()

* fix(BOOK-398): Add polyfills for .at()


Approved-by: Linus Flood
2025-09-29 06:58:31 +00:00
Joakim Jäderberg 50bac104fc Merged in fix/nullcheck-localStorage (pull request #2875)
fix(BOOK-397): localStorage could be undefined

* fix(BOOK-397): localStorage could be undefined


Approved-by: Linus Flood
2025-09-26 12:59:50 +00:00