Commit Graph

159 Commits

Author SHA1 Message Date
Anton Gunnarsson
16fbdb7ae0 Merged in fix/refactor-currency-display (pull request #3434)
fix(SW-3616): Handle EuroBonus point type everywhere

* Add tests to formatPrice

* formatPrice

* More work replacing config with api points type

* More work replacing config with api points type

* More fixing with currency

* maybe actually fixed it

* Fix MyStay

* Clean up

* Fix comments

* Merge branch 'master' into fix/refactor-currency-display

* Fix calculateTotalPrice for EB points + SF points + cash


Approved-by: Joakim Jäderberg
2026-01-15 09:32:17 +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
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
Matilda Haneling
6a008ba342 Merged in fix/book-149-incorrect-onfocus-behaviour-booking-widget (pull request #3320)
Fix/book 149 incorrect onfocus behaviour booking widget

* fix(BOOK-149): fixed labels shifting

* fix(BOOK-149): reintroduced sticky position

* fix(BOOK-149): added missing border to "where" text field

* added overflow to datepicker

* comment fixes

* removed separate typography declaration

* changed to onPress

* fix(BOOK-149): moved components to separate files

* fix(BOOK-149): removed desktop & mobile specific css classes

* fix(BOOK-149): new implementation of date and room modals

* dependencies update

* fix(BOOK-149): fixed child age dropdown issue, related error message, and Rooms & Guests container height

* updated info button to new variant

* fix(BOOK-149): prevent scrolling of background when modals are open in Tablet mode

* fixed overlay issue and added focus indicator on mobile

* fixed missing space in css

* rebase and fixed icon buttons after update

* simplified to use explicit boolean

* PR comments fixes

* more PR comment fixes

* PR comment fixes

* fixed setIsOpen((prev) => !prev)

* fixed issues with room error not showing properly on mobile

* fixing pr comments

* fixed flickering on GuestRoomModal


Approved-by: Erik Tiekstra
2026-01-12 14:18:51 +00:00
Anton Gunnarsson
d371d45fd2 Merged in chore/configure-knip (pull request #3417)
Add knip configuration

* Add knip configuration


Approved-by: Joakim Jäderberg
2026-01-12 09:07:10 +00:00
Linus Flood
cd59102ef4 Merged in feat/svg-instead-of-fonts (pull request #3411)
feat(SW-3695): use svg icons instead of font icons

* feat(icons): use svg instead of font icons

* feat(icons): use webpack/svgr for inlined svgs. Now support for isFilled again

* Merge master

* Remove old font icon


Approved-by: Joakim Jäderberg
2026-01-09 13:14:09 +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
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
Rasmus Langvad
edca33c49f Merged in feat/SW-3655-input-component (pull request #3296)
feat: (SW-3655) new Input and FormInput components

* First version new Input and FormInput components

* Handle aria-describedby with react-aria instead of manually add it

* Update breaking unit and stories tests

* Merge branch 'master' into feat/SW-3655-input-component

* Update example form

* Merge branch 'master' into feat/SW-3655-input-component

* New lock file


Approved-by: Linus Flood
2025-12-08 08:51:03 +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
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
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
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
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
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
Bianca Widstam
07193a519c Merged in fix/BOOK-630-multiroom-select-rate (pull request #3272)
fix(BOOK-630): pinned nuqs version

* fix(BOOK-630): pinned nuqs version


Approved-by: Joakim Jäderberg
2025-12-02 08:15:05 +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
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
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
Erik Tiekstra
b41aab56a6 feat(BOOK-101): Added functionality to show active map card when focus is within the hotel card
Approved-by: Bianca Widstam
2025-11-26 07:40:12 +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
Linus Flood
5eaaea527f Merged in feat/sw-3623-fetchretry (pull request #3180)
feat(SW_3623): remove fetch-retry

* feat(SW_3623): remove fetch-retry


Approved-by: Joakim Jäderberg
2025-11-20 13:24:34 +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
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
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
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
Anton Gunnarsson
dc42a22513 Merged in chore/add-tests-to-getAdditionalPrice (pull request #3065)
chore: Refactor types and add tests to parts of price calcuations

* Add tests to sumPackages

* Refactor types and add tests to getAdditionalPrice

* Don't always generate coverage

* Add tests and refactor types of getRedemptionPrice


Approved-by: Joakim Jäderberg
2025-11-04 12:09:04 +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
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
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
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
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
Joakim Jäderberg
8ebc48b138 Merged in feat/SW-3461-setup-auth-with-sas-eurobonus (pull request #2825)
Feat/SW-3461 setup auth with sas eurobonus

* feat(SW-3461): Setup auth for sas eurobonus

* .

* feat: setup auth towards SAS

* Fix auth via SAS and add logout route

* .

* merge

* auth via SAS

* fix powered by scandic logo

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3461-setup-auth-with-sas-eurobonus

* Include access_token in jwt after successful login

* merge


Approved-by: Anton Gunnarsson
2025-09-22 09:30:36 +00:00
Anton Gunnarsson
7adb9ded46 Merged in feat/sw-3472-booking-flow-parameterization (pull request #2811)
feat(SW-3272): Add BookingFlowConfig

* Add BookingFlowConfig

* Rename "provider" to BookingFlowConfig

* Change bookingCode to boolean

* Fix error


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-09-19 11:56:50 +00:00
Anton Gunnarsson
08804e8675 Merged in chore/cleanup-scandic-web (pull request #2831)
chore: Cleanup scandic-web

* Remove unused files

* Remove unused and add missing packages

* Remove unused exports


Approved-by: Linus Flood
2025-09-18 15:33:00 +00:00
Joakim Jäderberg
ae7a62c88f Merged in feature/SW-3149-send-logs-to-sentry (pull request #2802)
Feature/SW-3149 send logs to sentry

* Use sentry for logging

* .

* fix(SW-3149) Send logs to Sentry

* remove experimental flag for logs

* add sentry settings for partner-sas

* feat(SW-3108): Added external link option to top primary button on content/collection page

Approved-by: Matilda Landström

* fix(BOOK-152): Removed old header references inside useStickyPosition hook to fix offset issue for the sitewide alert

Approved-by: Matilda Landström

* Merged in fix/LOY-360-team-member-text-for-retired-employees (pull request #2799)

fix(LOY-360): improve text for retired employees

* fix(LOY-360): improve text for retired employees


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström

* Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795)

fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): add callback page for guarantee on webview


Approved-by: Linus Flood

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(BOOK-144): Make image clickable instead of a button to avoid being able to click outside of the image area

Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)

* Merged in fix/BOOK-127-translate-validation-text (pull request #2800)

fix(BOOK-127): translate terms required message

* fix(BOOK-127): translate terms required message


Approved-by: Erik Tiekstra

* Merged in feat/LOY-354-L7-Progress-Card (pull request #2786)

Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra

* Merged in fix/BOOK-132-tracking-breakfast (pull request #2803)

fix(BOOK-132): add breakfastOption tracking

* fix(BOOK-132): add breakfastOption tracking


Approved-by: Joakim Jäderberg

* Merged in fix/enter-details-errors-missing (pull request #2806)

fix: Add missing messages to BookingFlowInput errors

* Add missing messages to BookingFlowInput errors

* Fix errors

* zippy zip

* phoney


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg

* Merged in feature/copy-static-files-via-build-scripts (pull request #2798)

SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood

* Merged in feat/SW-2999-cleanup (pull request #2810)

feat(SW-2999): cleanup current web

* feat(SW-2999): cleanup current web

* Merge master

* Removed unused fonts


Approved-by: Joakim Jäderberg

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* merge


Approved-by: Linus Flood
2025-09-18 07:59:44 +00:00
Anton Gunnarsson
65e4623b52 Merged in chore/fix-partner-sas-todos (pull request #2823)
chore: Fix partner-sas todos

* Add onError to TrpcProvider

* Add AdobeSDKScript

* Add GTMScript

* Add adobeDataLayer script

* Add ReactQueryDevtools

* Move components to correct folder


Approved-by: Joakim Jäderberg
2025-09-18 07:28:14 +00:00
Joakim Jäderberg
48324ef935 Merged in feature/copy-static-files-via-build-scripts (pull request #2798)
SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood
2025-09-16 10:59:33 +00:00
Joakim Jäderberg
7dee6d5083 Merged in chore/move-enter-details (pull request #2778)
Chore/move enter details

Approved-by: Anton Gunnarsson
2025-09-11 07:16:24 +00:00
Joakim Jäderberg
a87cef91d4 Merged in fix/turn-off-application-insights (pull request #2764)
Fix/turn off application insights

* remove applicationInsights

* remove applicationInsights


Approved-by: Linus Flood
2025-09-05 11:49:00 +00:00
Anton Gunnarsson
711589ff5e Merged in chore/add-formatjs-linting-to-booking-flow (pull request #2761)
chore: Add formatjs linting to booking-flow

* Add formatjs linting to booking-flow

* Fix lock file


Approved-by: Joakim Jäderberg
2025-09-04 13:52:56 +00:00
Hrishikesh Vaipurkar
55e25d6c75 Merged in chore/SW-3397-move-confirmation-component-with (pull request #2759)
chore(SW-3397) Moved Confirmation component with Header to booking-flow package

* chore(SW-3397) Moved Confirmation component with Header to booking-flow package

* chore(SW-3397): Optimised code


Approved-by: Anton Gunnarsson
2025-09-04 13:07:11 +00:00
Anton Gunnarsson
f7ef58eafa Merged in feat/sw-2874-move-select-rate (pull request #2750)
Approved-by: Joakim Jäderberg
2025-09-03 08:30:05 +00:00
Hrishikesh Vaipurkar
0a4bf40a15 Merged in chore/SW-3321-move-selectratecontext-to- (pull request #2729)
chore(SW-3321): Moved Select rate context to booking-flow package

* chore(SW-3321): Moved Select rate context to booking-flow package

* chore(SW-3321): Optimised code


Approved-by: Joakim Jäderberg
2025-09-02 07:40:01 +00:00
Anton Gunnarsson
ecd567f54f Merged in feat/sw3370-move-phone-utils (pull request #2743)
feat(SW-3370): Move phone utils to common

* Move phone utils to common

* Update lock file


Approved-by: Joakim Jäderberg
2025-09-02 06:53:58 +00:00
Anton Gunnarsson
87402a2092 Merged in feat/sw-2873-move-selecthotel-to-booking-flow (pull request #2727)
feat(SW-2873): Move select-hotel to booking flow

* crude setup of select-hotel in partner-sas

* wip

* Fix linting

* restructure tracking files

* Remove dependency on trpc in tracking hooks

* Move pageview tracking to common

* Fix some lint and import issues

* Add AlternativeHotelsPage

* Add SelectHotelMapPage

* Add AlternativeHotelsMapPage

* remove next dependency in tracking store

* Remove dependency on react in tracking hooks

* move isSameBooking to booking-flow

* Inject searchParamsComparator into tracking store

* Move useTrackHardNavigation to common

* Move useTrackSoftNavigation to common

* Add TrackingSDK to partner-sas

* call serverclient in layout

* Remove unused css

* Update types

* Move HotelPin type

* Fix todos

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Fix component


Approved-by: Joakim Jäderberg
2025-09-01 08:37:00 +00:00
Joakim Jäderberg
72f4f72a17 Merged in SW-3317-move-toast-to-design-system (pull request #2716)
SW-3317 move toast to design system

* chore: Move toast to design-system and add interaction tests

* Move toast to design-system and add storybook tests

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3317-move-toast-to-design-system

* merge

* move sonner dependency to @scandic-hotels/design-system


Approved-by: Anton Gunnarsson
2025-08-27 13:03:17 +00:00
Anton Gunnarsson
e4a66499e5 Merged in feat/sw-3322-move-base-tracking-to-common (pull request #2713)
feat(SW-3322): Move base tracking to common package

* Move base tracking to common package

* Update lock file


Approved-by: Joakim Jäderberg
2025-08-27 12:29:46 +00:00