Commit Graph
100 Commits
Author SHA1 Message Date
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
Joakim Jäderberg 3a1cf12638 Merged in fix/eurobonus-zod-schema (pull request #2854)
SW-3505: Fix getEuroBonusProfile schema to match OpenAPI spec

* update getEuroBonusProfile schema to match OpenAPI spec

* update getEuroBonusProfile schema to match OpenAPI spec

* update getEuroBonusProfile schema to match OpenAPI spec


Approved-by: Anton Gunnarsson
2025-09-23 13:03:44 +00:00
Joakim Jäderberg c46e71d76e Merged in feature/SW-3505-fetch-eurobonus-points (pull request #2847)
feat(SW-3505): add endpoint for getting eurobonus profile

* feat(SW-3505): add endpoint for getting eurobonus profile

* make sure we add loginType to session

* no need to run zod parsing twice

* Make SAS environment variables mandatory


Approved-by: Anton Gunnarsson
2025-09-23 12:13:20 +00:00
Joakim Jäderberg 8cd6f1d3a5 Merged in fix/revalidate-debug-logs (pull request #2840)
chore: change to using debug logs for revalidate call

* chore: change to using debug logs for revalidate call


Approved-by: Anton Gunnarsson
2025-09-23 12:06:20 +00:00
Joakim Jäderberg a7b19e8b14 Merged in fix/trust-host-partner-sas (pull request #2844)
add trust host setting for partner-sas auth

* add trust host setting for partner-sas auth


Approved-by: Anton Gunnarsson
2025-09-22 12:33:14 +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
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
Joakim Jäderberg 9620bfe76d Merged in SW-3476-use-separate-curity-client-for-service-tokens-for-partner-sas (pull request #2809)
feat(SW-3476): add support for using different curity clients when creating service tokens

* fix(SW-3476): add support for using different curity clients when creating service tokens

* remove log statement


Approved-by: Hrishikesh Vaipurkar
2025-09-18 07:04:45 +00:00
Joakim Jäderberg 8661e5c348 Merged in chore/icon-readme-update (pull request #2817)
Update icon generation script and remove unused font file

* Update icon generation script and remove unused font file


Approved-by: Matilda Landström
2025-09-17 12:58:23 +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 4893eb8b25 Merged in SW-3459-setup-booking-confirmation-page-in-sas (pull request #2794)
Setup booking-confirmation page in SAS

* Setup booking-confirmation page in SAS
move booking-confirmation tracking to booking-flow

* remove unused param

* Add test cards to documentation

* Fix payment callback page to use correct status


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
2025-09-11 12:19:26 +00:00
Joakim Jäderberg c3e78fcadd Merged in feature/SW-3457-enter-details-on-sas (pull request #2792)
Add enter-details page to SAS

* Add enter-details page to SAS


Approved-by: Anton Gunnarsson
2025-09-11 09:05:47 +00:00
Joakim Jäderberg 4b4690a724 Merged in SW-3458-fix-faulty-svg-param-stroke-width (pull request #2791)
fix faulty kebab case properties for svgs

* fix faulty kebab case properties for svgs


Approved-by: Anton Gunnarsson
2025-09-11 09:05:32 +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
Joakim Jäderberg 6fa301f8e7 Merged in SW-3396-move-my-saved-cards-to-design-system (pull request #2762)
SW-3396 move my saved cards to design system

* Move PaymentOption, PaymentOptionsGroup, PaymentIcons and MySavedCards (renamed SelectPaymentMethod) to design-system

* Remove unused svg payment icons

* cleanu

* cleanup

* trackUpdatePaymentMethod: remove hotelId argument that was never passed


Approved-by: Anton Gunnarsson
2025-09-04 13:01:36 +00:00
Joakim Jäderberg 8c3f8c74db Merged in feature/SW-3365-blurry-images (pull request #2746)
Feature/SW-3365 reduce upscaling of images (fix blurry images)

* fix: handle when images are wider than 3:2 but rendered in a 3:2 container

* use dimensions everywhere applicable

* fall back to using <img sizes='auto' /> if possible

* imageLoader: never nest

* remove empty test file


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-09-02 17:52:31 +00:00
Joakim Jäderberg f77520cd04 Merged in chore/remove-unused-useRoomContext (pull request #2747)
chore: delete unused useRoomContext

* chore: delete unused useRoomContext

* merge


Approved-by: Matilda Landström
2025-09-02 11:58:37 +00:00
Joakim Jäderberg a0fa238b27 Merged in fix/left-align-ameneties (pull request #2734)
* left align sho all ameneties
2025-08-29 11:48:40 +00:00
Joakim Jäderberg 2a9313362f Merged in feature/SW-3327-move-hotel-info-card-to-design-system (pull request #2730)
Feature/SW-3327 move hotel info card to design system

* wip

* wip

* wip

* wip moving hotelinfocard

* add controls for HotelInfoCard in storybook

* merge


Approved-by: Anton Gunnarsson
2025-08-29 10:09:48 +00:00
Joakim Jäderberg a0580de52f Merged in redirect-update-2025-08-29 (pull request #2733)
* rerun update


Approved-by: Anton Gunnarsson
2025-08-29 09:47:05 +00:00
Joakim Jäderberg 784c353b1e Merged in update-redirects-2025-08-28 (pull request #2723)
* update redirects
* format redirect-json to allow new lines

Approved-by: Bianca Widstam
2025-08-28 11:52:32 +00:00
Joakim Jäderberg 13e1594b2a Merged in fix/SW-3308-hotelcard-disappears-to-early (pull request #2704)
revert: delay marking a hotel card as non-hovered

* fix: delay marking a hotel card as non-hovered


Approved-by: Hrishikesh Vaipurkar
2025-08-28 08:27:11 +00:00
Joakim Jäderberg 4ed1cd1843 Merged in fix/storybook-static-folder (pull request #2718)
Storybook Avatar: Use images from public folder

* make sure we import files from the correct folder


Approved-by: Chuma Mcphoy (We Ahead)
2025-08-27 14:09:10 +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
Joakim Jäderberg 45a8fd8c43 Merged in fix/linting-booking-flow (pull request #2709)
Fix/linting booking flow

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string
* add no-extraneous-dependencies lint check to booking-flow

Approved-by: Anton Gunnarsson
2025-08-27 12:02:37 +00:00
Joakim Jäderberg 80c3327419 Merged in fix/linting (pull request #2708)
Fix/linting

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string

Approved-by: Anton Gunnarsson
2025-08-27 09:22:37 +00:00
Joakim Jäderberg c54c1ec540 Merged in SW-3270-move-interactive-map-to-design-system-or-booking-flow (pull request #2681)
SW-3270 move interactive map to design system or booking flow

* wip

* wip

* merge

* wip

* add support for locales in design-system

* add story for HotelCard

* setup alias

* .

* remove tracking from design-system for hotelcard

* pass isUserLoggedIn

* export design-system-new-deprecated.css from design-system

* Add HotelMarkerByType to Storybook

* Add interactive map to Storybook

* fix reactintl in vitest

* rename env variables

* .

* fix background colors

* add storybook stories for <Link />

* merge

* fix tracking for when clicking 'See rooms' in InteractiveMap

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3270-move-interactive-map-to-design-system-or-booking-flow

* remove deprecated comment


Approved-by: Anton Gunnarsson
2025-08-25 11:26:16 +00:00
Joakim Jäderberg f8a4b88170 Merged in fix/skip-flaky-date-test (pull request #2653)
chore: skip date.test.tsx due to flakyness

* chore: skip date.test.tsx due to flakyness


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
2025-08-18 07:46:34 +00:00
Joakim Jäderberg 1bd6ce81b8 Merged in feature/SW-3245-move-jsontohtml (pull request #2661)
Feature/SW-3245 move jsontohtml

* wip

* Move JsonToHtml -> design-system

* Fix semantic issues within Stories

* replace imports of 'storybook/react-vite' with 'storybook/nextjs-vite'

* merge


Approved-by: Anton Gunnarsson
2025-08-18 07:46:21 +00:00
Joakim Jäderberg af391a568a Merged in fix/design-system-format-after-generate (pull request #2662)
design-system: format files after they have been generated

* design-system: format files after they have been generated


Approved-by: Anton Gunnarsson
2025-08-15 11:37:35 +00:00
Joakim Jäderberg f531c7a49f Merged in feature/storybook-tests (pull request #2623)
Feature/storybook tests

* feature: add interaction tests for storybook and upgrade storybook@9

* add a11y testing for storybook

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

* Test and build only required packages

* .

* .

* .

* .

* .

* .

* .

* disable playwright tests in netlify ci

* .

* debug out process.env

* don't run playwright on CI

* remove unused netlify-plugin-playwright-cache

* .

* .

* .

* .

* .

* .

* remove turbo dependancy to design-system#test

* merge

* merge


Approved-by: Anton Gunnarsson
2025-08-14 06:25:08 +00:00
Joakim Jäderberg e3067331c6 Merged in fix/remove-old-select-rate (pull request #2647)
Fix/remove old select rate

* remove old select-rate

* Fix imports

* renamed SelectRate2 -> SelectRate
2025-08-13 13:43:48 +00:00
Joakim Jäderberg 68cd061c6d Merged in feature/select-rate-vertical-data-flow (pull request #2535)
Feature/select rate vertical data flow

* add fix from SW-2666

* use translations for room packages

* move types to it's own file

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* merge

* feature/select-rate: double rate for campaing rates

* revert NODE_ENV check in Cookiebot script

* revert testing values

* fix(SW-3171): fix all filter selected in price details

* fix(SW-3166): multiroom anchoring when changing filter

* fix(SW-3172): check hotelType, show correct breakfast message

* Merge branch 'feature/select-rate-vertical-data-flow' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* fix: show special needs icons for subsequent roomTypes SW-3167

* fix: Display strike through text when logged in SW-3168

* fix: Reinstate the scrollToView behaviour when selecting a rate SW-3169

* merge

* .

* PR fixes

* fix: don't return notFound()

* .

* always include defaults for room packages

* merge

* merge

* merge

* Remove floating h1 for new select-rate


Approved-by: Anton Gunnarsson
2025-08-13 12:45:40 +00:00
Joakim Jäderberg 855f795d50 Merged in feature/transpile-design-system (pull request #2621)
Feature/transpile design system

* remove example, we should use storybook instead

* remove example, we should use storybook instead

* css-modules cannot have :root, moved affected css-variables to globals.css

* .

* scandic-web no longer depends on design-system#build

* * Update readme
* Remove test code


Approved-by: Anton Gunnarsson
2025-08-12 09:07:33 +00:00
Joakim Jäderberg ef6235cf43 Merged in fix/stylus-failing-builds (pull request #2568)
Remove stylus deps and replace with extension

* fix: remove stylus deps and replace with extension

* chore: update yarn.lock
2025-07-23 09:16:49 +00:00
Joakim Jäderberg daf765f3d5 Merged in feature/wrap-logging (pull request #2511)
Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood
2025-07-03 12:37:04 +00:00
Joakim Jäderberg 3169bd892b Merged in fix/datepicker-select-first-of-month (pull request #2497)
fix: able to select 1st of month on the 1st of each month

* fix: able to select 1st of month on the 1st of each month


Approved-by: Anton Gunnarsson
2025-07-01 13:33:11 +00:00
Joakim Jäderberg 9b491c5364 Merged in fix/resolve-entry-clearing-cache (pull request #2445)
fix: use shared cache key when revalidating urls

* fix: use shared cache key when revalidating urls


Approved-by: Linus Flood
2025-06-26 06:23:03 +00:00
Joakim Jäderberg 105c4d9cf3 Merged in feature/redis-queue-deletes (pull request #2397)
Feature/redis queue deletes

* feat: add queuing for deletes

* merge

* .

* .

* .


Approved-by: Linus Flood
2025-06-19 09:20:38 +00:00
Joakim Jäderberg 3af994b0a9 Merged in feat/redis-api-send-logs (pull request #2290)
feature: send logs to Sentry for Redis-Api

* feature: send logs to Sentry for Redis-Api


Approved-by: Linus Flood
2025-06-19 08:28:53 +00:00
Joakim Jäderberg bb98c2652e Merged in fix/missing-batchsize-bicep-config (pull request #2385)
add missing bicep setup for deleteBatchSize

* add missing bicep setup for deleteBatchSize
2025-06-18 07:47:25 +00:00
Joakim Jäderberg d5f49ccaa1 Merged in fix/batch-size-in-env (pull request #2384)
fix: able to set batch delete size via env

* fix: able to set batch delete size via env


Approved-by: Linus Flood
2025-06-18 06:38:48 +00:00
Joakim Jäderberg de6117f7f7 Merged in fix/redis-adjust-batch-settings (pull request #2374)
fix: adjust batch size and remove timeout between delete-calls

* fix: adjust batch size and remove timeout between delete-calls

* chore: adjust scaling


Approved-by: Linus Flood
2025-06-17 07:12:44 +00:00
Joakim Jäderberg 180a100140 Merged in fix/SW-2964-hide-booking-code-switcher (pull request #2345)
fix: as a temporary fix hide booking code switcher and add a way to do a search without bookingcode

* fix: as a temporary fix hide booking code switcher and add a way to do a search without bookingcode


Approved-by: Linus Flood
2025-06-13 07:07:22 +00:00
Joakim Jäderberg a95ef65d02 Merged in feat/use-hash-for-graphql-cache (pull request #2251)
Feature: Use hash of query+variables for graphql cache instead of gitsha

* feature: use a hash of query+variables as part of the cache key instead of gitsha

* .

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/use-hash-for-graphql-cache

* use correct json stringify

* merge

* remove edgeRequest in favor of request

* add more indicative logging


Approved-by: Linus Flood
2025-06-03 06:39:04 +00:00
Joakim Jäderberg ef3b29b9f1 Merged in fix/SW-2945-cache-timings-for-resolve-entry (pull request #2264)
Fix/SW-2945 cache timings for resolve entry

* fix: cache resolveentry() harder and revalidate on publish instead

* logging: use debug logging for requests and add logging when tll is invalid


Approved-by: Linus Flood
2025-06-02 08:35:55 +00:00
Joakim JäderbergandLinus Flood 26b005d72a Merged in fix/cache-graphql-data (pull request #2248)
fix: add missing cache for cms data

* fix: cache cms data


Approved-by: Linus Flood
2025-05-28 08:28:21 +00:00
Joakim Jäderberg b20c8ce42b Merged in fix/warmup-autocomplete-data-2 (pull request #2218)
fix: chunked data overwrote it self

* fix: chunked data overwrote it self


Approved-by: Linus Flood
2025-05-26 09:39:48 +00:00
Joakim Jäderberg 196ea2994f Merged in fix/warmup-autocomplete-data (pull request #2212)
warmup autocomplete data

* warmup autocomplete data


Approved-by: Anton Gunnarsson
2025-05-26 08:23:20 +00:00
Joakim Jäderberg 231ea05348 Merged in fix/refetching-availability-on-select (pull request #2204)
don't use rateCode to determine if bookingCode should come from the room or the 'big' input

* don't use rateCode to determine if bookingCode should come from the room or the 'big' input


Approved-by: Linus Flood
2025-05-23 09:55:35 +00:00
Joakim JäderbergandLinus Flood cc34cdcf74 Merged in fix/SW-2848-RTE-with-copied-divs (pull request #2173)
fix: handle when content has copied divs from episervers RTE

* fix: handle when content has copied divs from episervers RTE


Approved-by: Matilda Landström
2025-05-22 11:03:29 +00:00
Joakim Jäderberg 39b89c5d51 Merged in fix/SW-2890-select-rate-not-updating (pull request #2190)
fix: select-rate didn't update results when switching back to a recent search SW-2890

* fix: select-rate didn't update results when switching back to a recent search


Approved-by: Linus Flood
2025-05-22 09:21:46 +00:00
Joakim Jäderberg 5272af2ab1 Merged in fix/SW-2839-prevent-fetching-hotel-availability-with-invalid-input (pull request #2166)
Prevent calling availability for cities if input model is invalid

* fix: make sure that input data is valid


Approved-by: Linus Flood
2025-05-21 04:47:05 +00:00
Joakim Jäderberg 6634bfa93f Merged in fix/SW-2827-wrong-key (pull request #2162)
fix: error key was wrong for hotel availability input object

* fix: error key was wrong


Approved-by: Linus Flood
2025-05-20 12:54:16 +00:00
Joakim Jäderberg 3de4f9e406 Merged in fix/SW-2827-availability-for-old-dates (pull request #2158)
fix: add error handling for hotel room availability

* fix: add error handling for hotel room availability

* fix: update error codes

* fix: have one error message to rule them all. them as in permutations of invalid dates


Approved-by: Linus Flood
2025-05-20 12:25:36 +00:00
Joakim Jäderberg 3e50132bc9 Merged in fix/SW-2822-missing-meetingroom-images (pull request #2151)
fix: meeting rooms with missing images

* fix: meeting rooms with missing images


Approved-by: Linus Flood
2025-05-20 05:43:43 +00:00
Joakim Jäderberg b486fd1ad0 Merged in fix/SW-2804-missing-meeting-rooms (pull request #2138)
fix: return [] when we get a 404 for meeting rooms for a hotel

* fix: return [] when we get a 404 for meeting rooms for a hotel


Approved-by: Linus Flood
2025-05-19 08:35:47 +00:00
Joakim Jäderberg 4f0c61f68f Merged in revert-version (pull request #2128)
revert including version in layouts and api responses

* revert including version in layouts and api responses


Approved-by: Linus Flood
2025-05-16 12:57:17 +00:00
Joakim Jäderberg ec29664a60 Merged in fix/capture-errors-in-trpc (pull request #2103)
Fix/capture errors in trpc

* fix: import @sentry/nextjs, not @sentry/node

* add sentry logging for errors in trpc


Approved-by: Linus Flood
2025-05-16 11:44:25 +00:00
Joakim Jäderberg f40a666170 Merged in feat/add-version-to-responses (pull request #2118)
feature: add a version tag to responses SW-2792

* feature: add a version tag to responses


Approved-by: Linus Flood
2025-05-16 11:38:41 +00:00
Joakim Jäderberg 31d75ffa74 Merged in fix/default-page-settings (pull request #2076)
fix: default page settings when invalid or missing

* fix: default page settings when invalid or missing since most pages don't have pageSettings


Approved-by: Anton Gunnarsson
2025-05-15 10:41:16 +00:00
Joakim Jäderberg a71ccbdf22 Merged in feature/hardcode-release-branch-warming (pull request #2052)
fix: hardcode release branch warmup

* fix: hardcode release branch warmup

* .


Approved-by: Anton Gunnarsson
2025-05-13 13:19:09 +00:00
Joakim JäderbergandLinus Flood aceb88cb1a Merged in fix/seo-whitelist-scandic-friends (pull request #2071)
fix: SEO whitelist /scandic-friends

* fix: SEO whitelist /scandic-friends

* fix: SEO whitelist /scandic-friends


Approved-by: Linus Flood
2025-05-13 09:35:28 +00:00
Joakim JäderbergandLinus Flood 45d474385c Merged in fix/noindex-contentpages (pull request #2066)
fix: add noindex+nofollow to contentpages

* fix: add noindex+nofollow to contentpages

* fix: move no-index/no-follow to the shared generateMetadata function instead

* remove comment


Approved-by: Erik Tiekstra
2025-05-13 08:29:49 +00:00
Joakim JäderbergandLinus Flood 40570c356a Merged in fix/current-languageswitcher-nofollow (pull request #2064)
fix: add no-follow to links in language switcher

* fix: add no-follow to links in language switcher


Approved-by: Linus Flood
2025-05-13 07:47:47 +00:00
Joakim Jäderberg 7031ad3fae Merged in fix/bump-redis-prod-sku (pull request #2061)
fix: bump redis SKU in prod

* fix: bump redis SKU in prod


Approved-by: Linus Flood
2025-05-13 06:26:41 +00:00
Joakim Jäderberg cbbde963dc Merged in fix/my-pages-menu-not-translated (pull request #2045)
fix: my pages menu not translated

* fix: my pages menu not translated
fix: able to pass lang to getIntl()


Approved-by: Michael Zetterberg
2025-05-12 07:57:11 +00:00
Joakim Jäderberg e23f8694e3 Merged in fix/open-up-hotelreservation-pages (pull request #2020)
fix: open up hotelreservation

* fix: open up hotelreservation


Approved-by: Michael Zetterberg
2025-05-09 09:31:22 +00:00
Joakim Jäderberg 3ea26259df Merged in fix/redis-api-model-validation (pull request #2000)
* fix: model response validation for 204
* log: add more logging when deleting keys
* add version to health endpoint


Approved-by: Anton Gunnarsson
2025-05-07 13:45:35 +00:00
Joakim Jäderberg 33ef22ae23 Merged in fix/redis-api-set-socket-timeout (pull request #1991)
fix: redis - set timeout for calls and sockets

Approved-by: Michael Zetterberg
2025-05-07 09:16:25 +00:00
Joakim Jäderberg b977877e93 Merged in fix/limit-time-to-response-for-cache-calls (pull request #1990)
fix: add timeout for redis-api calls SW-2635

Approved-by: Michael Zetterberg
2025-05-07 09:15:58 +00:00
Joakim Jäderberg 814a1c534b Merged in fix/redis-api-set-sentry-environment-via-bicep (pull request #1981)
fix: set sentry environment through bicep deploys

* fix: set sentry environment through bicep deploys


Approved-by: Anton Gunnarsson
2025-05-06 13:06:28 +00:00