Commit Graph

974 Commits

Author SHA1 Message Date
Michael Zetterberg
3d80f9fecb fix(SW-2458): change label for Hotel details link on Hotel page 2025-06-03 07:41:03 +00:00
Erik Tiekstra
0ed94b16c3 fix(SW-2906): Changed copyright token
Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-06-03 06:44:15 +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
Erik Tiekstra
6a639dfd7e feat(SW-2930): Aligned margins and spacing for RTE html with Figma
Approved-by: Christian Andolf
2025-06-03 05:45:14 +00:00
Erik Tiekstra
958906d3bf feat(SW-1901): Adjusted parking pricing on hotel pages
Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
2025-06-03 05:27:41 +00:00
Christian Andolf
726ea44105 Merged in fix/consistent-link-colors (pull request #2245)
feat: update links default color to match design documents

Approved-by: Michael Zetterberg
2025-06-02 14:38:16 +00:00
Anton Gunnarsson
03468ad824 Merged in fix/refactor-booking-flow-search-params (pull request #2148)
Fix: refactor booking flow search params

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* Prepare new parse function for booking flow search params

* Prepare serialize function for booking flow search params

* Improve handling of comma separated arrays

* Slightly refactor for readability

* Next abstracts URLSearchParams so handle the abstraction instead

* Refactor booking widget to use new search params parsing

* Rename search param functions

* Refactor select-hotel to use new search param parser

* Use new search params parser in select-rate and details

* Fix hotelId type

* Avoid passing down search params into BookingWidget components

* More updates to use new types instead of SearchParams<T>

* Remove types SelectHotelSearchParams and AlternativeSelectHotelSearchParams

* Fix parseBookingWidgetSearchParams return type

* Add error handling to booking search param parsers

* Fix modifyRateIndex handling in details page

* Clean up

* Refactor booking widget search param serializing to util function

* Move start page booking widget search param parsing to page

* Use new search param serializer in HandleErrorCallback

* Delete convertSearchParamsToObj & convertObjToSearchParams


Approved-by: Michael Zetterberg
2025-06-02 13:38:01 +00:00
Linus Flood
81887c83ff Merged in feat/sw-1245-bw-button-update (pull request #2262)
Feat/sw 1245 - Booking widget - change button text when new values

* feat(sw-1245) - use isDirty to update button text

* Change text only in booking flow

* Revert test code


Approved-by: Michael Zetterberg
2025-06-02 13:37:53 +00:00
Christian Andolf
13136509b6 fix: replace old spacing variables with new matching ones 2025-06-02 15:34:42 +02:00
Christian Andolf
b3b3704c86 feat: update links default color to match design documents 2025-06-02 15:34:40 +02:00
Christian Andolf
d782b85329 chore: remove duplicate upcoming stays block 2025-06-02 15:12:35 +02:00
Anton Gunnarsson
cbf9e7b7c2 Merged in chore/next15 (pull request #1999)
chore (SW-834): Upgrade to Next 15

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* wip: fix remaining issues from codemod

serverClient is now async because context use headers()
getLang is now async because it uses headers()

* Minor cleanup

* Inline react-material-symbols package

Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.

* Fix missing awaits

* Disable modal exit animations

Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563.
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html

* Remove unstable cache implementation and use in memory cache locally

* Fix ref type in SelectFilter

* Use cloneElement to add key prop to element


Approved-by: Linus Flood
2025-06-02 11:11:50 +00:00
Bianca Widstam
47abd7d5ef Merged in fix/SW-2165-map-navigate-hotel-card (pull request #2246)
fix(SW-2165): map navigate on enter press 

* fix(SW-2165): navigate on enter press and refactor

* fix(SW-2165): responsive design

* fix(SW-2165): replace spacing variables

* fix(SW-2165): resolve pr comment

* fix(SW-2165): remove isOpen, hide/show logic already handled

* fix(SW-2165): remove dialog

* fix(SW-2165): use buttonicon

* fix(SW-2165): do not focus on close button without tab

* fix(SW-2165): remove unneccessary css


Approved-by: Christian Andolf
2025-06-02 11:10:27 +00:00
Bianca Widstam
6df8c75d2d Merged in fix/SW-2189-trigger-email-on-blur (pull request #2223)
Fix/SW-2189 trigger on blur

* fix(SW-2189): do not trigger email when typing

* fix(SW-2189): use onblur on multiroom as well


Approved-by: Tobias Johansson
2025-06-02 11:03:36 +00:00
Michael Zetterberg
8d5fc6e678 fix: sync from Lokalise 2025-05-28 2025-06-02 10:07:43 +00:00
Erik Tiekstra
9a868e6fe5 feat(SW-2466): Sorting destinations by country depending on language
Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-06-02 09:38:20 +00:00
Erik Tiekstra
9aa5c294a3 fix(SW-2759): Sticky position for mobile map toggle button on hotel pages
Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-06-02 09:37:59 +00:00
Erik Tiekstra
5d6776c383 feat(SW-2042): Synced sidebar ui with design
Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-06-02 09:37:39 +00:00
Erik Tiekstra
09879d2f4a feat(SW-2134): Added support for images inside accordions
Approved-by: Matilda Landström
2025-06-02 09:37:20 +00:00
Christian Andolf
d36754e24d Merged in fix/ref-errors-typography (pull request #2240)
fix: rendering errors when applying components to children that are already applying to children

Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-06-02 08:36:02 +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
Erik Tiekstra
651a388fa3 fix(SW-2378): Added restriction to the map options to avoid showing grey area in the map
Approved-by: Christian Andolf
2025-06-02 08:12:07 +00:00
Anton Gunnarsson
b19d849b2b Merged in feat/sw-2923-link-sas-referenceid (pull request #2243)
Send SAS OTP referenceId to API

* Send SAS OTP referenceId to API

API needs the referenceId to pass along to SAS
as they use it to verify that OTP was successful.


Approved-by: Joakim Jäderberg
2025-06-02 08:01:23 +00:00
Matilda Landström
50a6f4e28c Merged in feat/SW-1880-pool-depth (pull request #2233)
feat/SW-1880-pool-depth

* feat(SW-1880): update pool depth

* fix(SW-1880): handle non existing values


Approved-by: Erik Tiekstra
2025-06-02 07:31:30 +00:00
Anton Gunnarsson
7e97b74c18 Merged in chore/remove-unused-code (pull request #2229)
Remove unused code

* Remove unused scandic-web files

* Remove unused exports


Approved-by: Joakim Jäderberg
2025-05-30 12:41:18 +00:00
Christian Andolf
d8ac5614e2 fix: rendering errors when applying components to children that are already applying to children 2025-05-28 14:43:03 +02:00
Niclas Edenvin
44e648e758 Merged in fix/SW-2292-new-hotel-header (pull request #2253)
fix(SW-2292): new design for hotel header on enter details

* fix(SW-2292): new design for hotel header on enter details


Approved-by: Michael Zetterberg
2025-05-28 12:19:11 +00:00
Linus Flood
b4e8a7f7cf Merged in fix/redirect-public-url (pull request #2250)
fix: use getPublicNextUrl when redirecting

* fix: use getPublicNextUrl when redirecting


Approved-by: Erik Tiekstra
2025-05-28 10:13:48 +00:00
Erik Tiekstra
bb5e7b65bb feat(SW-2144): added back-to-top button on destination map views
Approved-by: Matilda Landström
2025-05-28 08:54:27 +00:00
Erik Tiekstra
42701739a0 Merged in fix/SW-2921-countryName (pull request #2249)
fix(SW-2921): Moved countryName to attributes in locations schema

* fix(SW-2921): Moved countryName to attributes in locations schema


Approved-by: Linus Flood
2025-05-28 08:45:03 +00:00
Joakim Jäderberg
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
Niclas Edenvin
1d733c5ca3 Merged in fix/SW-2887-complete-booking-button-always-enabled (pull request #2227)
fix(SW-2887): don't disable the booking button
The complete button shouldn’t be disabled based on validation. This was already correct in desktop, but now it’s also correct in mobile.

* fix(SW-2887): don't disable the booking button


Approved-by: Tobias Johansson
Approved-by: Christian Andolf
2025-05-28 08:11:29 +00:00
Christian Andolf
76e377d5d5 Merged in fix/update-footer-variables (pull request #2239)
fix: match footer to design documents with typography and colors

Approved-by: Erik Tiekstra
2025-05-27 13:44:44 +00:00
Michael Zetterberg
528fbbce4a fix: change to permanent redirects were applicable 2025-05-27 12:01:22 +00:00
Erik Tiekstra
efbed53be4 fix(SW-2921): Fixed issue with countryName missing from locations response
* fix(SW-2921): Added more correct cache key to locations endpoint

Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-05-27 11:46:59 +00:00
Christian Andolf
ade0279c8d fix: match footer to design documents with typography and colors 2025-05-27 13:46:43 +02:00
Christian Andolf
ec31dcda1a Merged in fix/SW-2172-accessibility-issues-sidepeek-and-other-buttons (pull request #2202)
fix(SW-2172): update sidepeek buttons to use new ones for accessibility

Approved-by: Erik Tiekstra
2025-05-27 11:31:41 +00:00
Erik Tiekstra
368e8ad7b5 fix(SW-435): Now using our Image component instead of NextImage
Approved-by: Linus Flood
2025-05-27 10:56:16 +00:00
Christian Andolf
8e1a83ee7d fix(SW-2172): update sidepeek buttons to use new ones for accessibility
updated enter details header overlay to match design

updated change room button to use new one for accessibility

other minor fixes to match design
2025-05-27 12:05:04 +02:00
Simon Emanuelsson
39855d3c8a fix: trigger memberPrice modal for membership number too 2025-05-27 10:22:31 +02:00
Christian Andolf
3d95a08ab4 Merged in fix/set-default-text-color-body (pull request #2211)
fix: set default text color on body

Approved-by: Erik Tiekstra
2025-05-27 07:36:49 +00:00
Christian Andolf
46faf93aba Merged in fix/hotel-card-fixes (pull request #2209)
fix: update typography including missing header element in hotel cards

Approved-by: Tobias Johansson
Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-05-27 07:32:48 +00:00
Christian Andolf
883fd23949 Merged in fix/LOY-52-remove-spinner-stay-cards (pull request #2232)
fix(LOY-52): remove spinner on stay cards to prevent loading to spin indefinitely when opening link in a new tab

Approved-by: Linus Flood
2025-05-27 07:31:47 +00:00
Hrishikesh Vaipurkar
e2c1b066be Merged in feat/SW-2407-mystay-tc-to-modal (pull request #2082)
Feat/SW-2407 mystay tc to modal

* feat: SW-2407 Moved terms in modal view for my stay

* feat: SW-2407 Updated modal to show terms for reward nights and corporate cheque stay

* feat: SW-2407 Optimised code

* feat: SW-2407 Optimised code


Approved-by: Niclas Edenvin
2025-05-27 07:00:02 +00:00
Michael Zetterberg
db93cc7d0e fix: sync from Lokalise 2025-05-27 06:24:20 +00:00
Linus Flood
b633d51705 Merged in fix/redis-poll-interval (pull request #2220)
fix: redis - decrease poll interval

* fix: redis - decrease poll interval


Approved-by: Joakim Jäderberg
2025-05-27 06:12:48 +00:00
Erik Tiekstra
731000519b fix(SW-995): Made the room cards to have the same height as its neighbors
Approved-by: Matilda Landström
2025-05-27 05:33:06 +00:00
Erik Tiekstra
8b85235f1d feat(SW-2408): Improved meta titles for Hotel subpages
Approved-by: Matilda Landström
2025-05-27 05:32:50 +00:00
Christian Andolf
6f585a2c1e fix(LOY-52): remove spinner on stay cards to prevent loading to spin indefinitely when opening link in a new tab 2025-05-26 17:19:03 +02:00
Christian Andolf
642a6881e2 fix: update typography including missing header element in hotel cards
add responsive sizes to hotel card image

removed non-existing class
2025-05-26 16:56:54 +02:00