Commit Graph

4655 Commits

Author SHA1 Message Date
Christian Andolf
8dbd36bdbd Merged in fix/remove-filtering-date-country (pull request #2278)
fix: remove filtering from date and country select for better mobile experience

Approved-by: Linus Flood
Approved-by: Chuma Mcphoy (We Ahead)
2025-06-04 11:36:17 +00:00
Erik Tiekstra
8e6274a88a fix(SW-1960): Changes to how we handle hash inside hotelpages after Next15 upgrade
Approved-by: Michael Zetterberg
Approved-by: Linus Flood
2025-06-04 10:30:27 +00:00
Christian Andolf
b2972318bb Merged in fix/link-inline-flex (pull request #2287)
fix: make links inline flex so not to take up an entire row

Approved-by: Erik Tiekstra
2025-06-04 10:02:44 +00:00
Christian Andolf
afd3a7d9ca fix: date and country selects now still uses the filtering in desktop 2025-06-04 12:00:49 +02:00
Erik Tiekstra
a8f167025d fix(SW-2933): Making the hotels/city listing render correct for SEO purposes
Approved-by: Matilda Landström
2025-06-04 09:05:05 +00:00
Christian Andolf
7ff6fd465a fix: make links inline flex so not to take up an entire row 2025-06-04 10:16:32 +02:00
Bianca Widstam
0bd78bc7a6 Merged in fix/SW-2929-hotjar-suppress-confirmation (pull request #2286)
fix(SW-2929): suppress personal info on confirmation page

* fix(SW-2929): suppress personal info on confirmation page


Approved-by: Christian Andolf
2025-06-04 08:02:40 +00:00
Christian Andolf
b9043ce5c9 Merged in fix/LOY-245-close-dropdown-selected (pull request #2271)
fix(LOY-245): close dropdown when selecting value

Approved-by: Michael Zetterberg
2025-06-04 07:42:36 +00:00
Christian Andolf
0b339e52a6 fix(LOY-245): close dropdown when selecting value 2025-06-04 09:22:53 +02:00
Christian Andolf
7497203df2 fix: remove filtering from date and country select for better mobile experience 2025-06-04 09:19:35 +02:00
Erik Tiekstra
52d266b357 fix(SW-2934): Added all sitemap entries as their own url entry, not just as alternates
Approved-by: Linus Flood
2025-06-04 06:57:30 +00:00
Linus Flood
800b329998 Merged in fix/my-stay-webview-3 (pull request #2281)
feat/my-stay-webview - check if user else redirect to refresh page

* feat/my-stay-webview - check if user else redirect to refresh page


Approved-by: Joakim Jäderberg
2025-06-04 06:26:42 +00:00
Linus Flood
93b76d405a Merged in feat/SW-2960-update-plugin (pull request #2283)
feat(#SW-2960): Update netlify/plugin-nextjs to latest

* feat(#SW-2960): Update netlify/plugin-nextjs to latest

* added lock file


Approved-by: Joakim Jäderberg
2025-06-04 06:26:32 +00:00
Linus Flood
8b57c72a7c Merged in chore/nextjs-15.3.3 (pull request #2284)
chore(next) - update Nextjs to 15.3.3 to fix rsc payload getting cached

* chore(next) - update Nextjs to 15.3.3 to fix rsc payload getting cached


Approved-by: Joakim Jäderberg
2025-06-04 06:18:50 +00:00
Bianca Widstam
c632d0c269 Merged in fix/SW-2929-hotjar-name-confirmation-page (pull request #2282)
fix(SW-2929): hotjar suppress name on confirmation page

* fix(SW-2929): hotjar suppress name on confirmation page


Approved-by: Linus Flood
2025-06-03 18:26:11 +00:00
Linus Flood
68763ee1fd Merged in fix/sitemap-fixes (pull request #2280)
fix:sitemap - added null check and correct content-type

* fix:sitemap - added null check and correct content-type

* Revert test code


Approved-by: Erik Tiekstra
2025-06-03 14:48:24 +00:00
Anton Gunnarsson
dd4ef527df Merged in chore/eslint9 (pull request #2029)
chore: Update to ESLint 9

* wip: apply codemod and upgrade swc plugin

* Update eslint to 9 in scandic-web

apply code mod to config
fix existing lint issues

* Remove uneccessary fixupConfigRules

* Update eslint to 9 in design-system

* Add lint turbo dependency

* Move redis-api to eslint and prettier instead of biome

* Simplify eslint configs

* Clean up

* Apply linting


Approved-by: Linus Flood
2025-06-03 14:26:44 +00:00
Anton Gunnarsson
91278feb40 Merged in fix/popover-with-design-system-trigger-not-showing (pull request #2276)
Fix popovers using triggers from design-system not working

* Fix peer dependency in design-system package


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-06-03 12:53:33 +00:00
Erik Tiekstra
b796e91379 feat(SW-2944): Filtering roomTypes with CustomOccuppancy type to only show the biggest
Approved-by: Matilda Landström
2025-06-03 12:52:48 +00:00
Bianca Widstam
984805ea8d Merged in feat/SW-1936-ui-room-card (pull request #2268)
feat(SW-1936): update room card ui

* feat(SW-1936): update room card ui


Approved-by: Linus Flood
2025-06-03 12:51:33 +00:00
Simon Emanuelsson
9580281421 fix: allow any type of phone number 2025-06-03 11:54:05 +00:00
Arvid Norlin
79e669020a wip: new PhoneCountryCode Select 2025-06-03 11:54:04 +00:00
Christian Andolf
5f12dedb50 Merged in fix/trigger-open-country-select-focus (pull request #2274)
fix: open country select dropdown on focus

Approved-by: Chuma Mcphoy (We Ahead)
2025-06-03 11:17:09 +00:00
Michael Zetterberg
17f1a59e97 fix: sync English labels 2025-06-03 12:02:49 +02:00
Christian Andolf
5877a9d228 fix: open country select dropdown on focus 2025-06-03 11:56:26 +02:00
Erik Tiekstra
12b22ba8cd fix(SW-2928): Added different margins on wellness content wrapper depending on which buttons are present
Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-06-03 09:33:52 +00:00
Erik Tiekstra
be98c2faf6 feat(SW-1409): Synced tabnavigation headings and section headings on hotel pages
* feat(SW-2409): Added same headings to relevant sidepeeks


Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-06-03 09:22:28 +00:00
Erik Tiekstra
a47b2f46d3 fix(SW-435): Fixed issue with Nordic Swan logo because getLang was not awaited
Approved-by: Linus Flood
2025-06-03 09:21:59 +00:00
Hrishikesh Vaipurkar
f9e838e77a Merged in fix/SW-2838-in-select-hotel-lang-switch- (pull request #2261)
fix: SW-2838 Use of city identifier instead of city name

* fix: SW-2838 Updated selection to city identifier instead of city name


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-06-03 07:58:00 +00:00
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
7694a188da Merged in chore/remove-duplicate-upcoming-stays (pull request #2244)
chore: remove duplicate upcoming stays block

Approved-by: Michael Zetterberg
2025-06-02 13:29:03 +00: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