From 439ee01ef53c1db3ed84c58a02153e40d3fa45fa Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Mon, 27 Jan 2025 15:10:15 +0200 Subject: [PATCH 01/13] UHF-11235: Add controller for events page --- .../custom/helfi_etusivu/helfi_etusivu.module | 12 ++++- .../helfi_etusivu/helfi_etusivu.routing.yml | 8 +++ .../HelsinkiNearYouEventsController.php | 50 +++++++++++++++++++ .../helsinki-near-you-events.html.twig | 29 +++++++++++ 4 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php create mode 100644 public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 59e7fe9e9..4a01e8bf2 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -244,8 +244,13 @@ function helfi_etusivu_helfi_hero_design_alter(array &$designs, FieldStorageDefi function helfi_etusivu_preprocess_html(&$variables): void { $route = \Drupal::routeMatch()->getRouteName(); - // Set the theme color to suomenlinna on Helsinki near you landing page. - if ($route === 'helfi_etusivu.helsinki_near_you') { + // Set the theme color to suomenlinna on Helsinki near you landing pages. + $near_you_pages = [ + 'helfi_etusivu.helsinki_near_you', + 'helfi_etusivu.helsinki_near_you_events' + ]; + + if (in_array($route, $near_you_pages)) { $variables['theme_color'] = 'suomenlinna'; } } @@ -347,6 +352,9 @@ function helfi_etusivu_theme() : array { ], 'template' => 'helsinki-near-you-hero-block', ], + 'helsinki_near_you_events' => [ + 'template' => 'helsinki-near-you-events', + ] ]; } diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml index aea5c225f..351a0843c 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml @@ -20,3 +20,11 @@ helfi_etusivu.helsinki_near_you_autocomplete: _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouResultsController::addressSuggestions' requirements: _role: 'authenticated' + +helfi_etusivu.helsinki_near_you_events: + path: '/helsinki-near-you/events' + defaults: + _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouEventsController::content' + _title: 'Events near you' + requirements: + _role: 'authenticated' diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php new file mode 100644 index 000000000..74a154f27 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php @@ -0,0 +1,50 @@ + [ + 'drupalSettings' => [ + 'helfi_events' => [ + 'baseUrl' => LinkedEvents::BASE_URL, + 'data' => [ + 'helfi-coordinates-based-event-list' => [ + 'events_api_url' => $this->linkedEvents->getEventsRequest(), + 'field_event_location' => TRUE, + 'field_event_time' => TRUE, + 'useLocationSearch' => TRUE, + ], + ], + 'useExperimentalGhosts' => TRUE, + ], + ], + ], + '#theme' => 'helsinki_near_you_events', + '#title' => $this->t( + 'Events near you', + [], + ['context' => 'Helsinki near you'] + ) + ]; + } +} diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig new file mode 100644 index 000000000..de1fecacf --- /dev/null +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig @@ -0,0 +1,29 @@ +
+
+ {% embed "@hdbt/misc/component.twig" with + { + component_classes: [ + 'component--react-search', + 'component--event-list', + 'component--coordinates-based-list', + ] + } + %} + {% block component_content %} + {# Hook React app to this div #} + {{ attach_library('hdbt/event-list') }} + + {# Indicate JS not enabled #} + + {% endblock %} + {% endembed %} +
+
From 02de37f1e1ef1cd6a7d1b8b8dde8733d9d884927 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Thu, 6 Feb 2025 18:18:10 +0200 Subject: [PATCH 02/13] UHF-11235: Fix autosuggest sorting --- .../custom/hdbt_subtheme/dist/js/autocomplete.min.js | 2 +- public/themes/custom/hdbt_subtheme/package-lock.json | 12 ++++++------ .../custom/hdbt_subtheme/src/js/autocomplete.js | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js b/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js index 361209f09..746f7c71e 100644 --- a/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js +++ b/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js @@ -1 +1 @@ -!function(){"use strict";((Drupal,t)=>{const e=t=>{if(!A11yAutocomplete)throw new Error("A11yAutocomplete object not found. Make sure the library is loaded.");if(!drupalSettings.helsinki_near_you_form)throw new Error("Helsinki near you form object not found. Configuration cannot be loaded for autocomplete.");const{autocompleteRoute:e,noResultsAssistiveHint:i,someResultsAssistiveHint:s,oneResultAssistiveHint:o,highlightedAssistiveHint:n,inputAssistiveHint:u,minCharAssistiveHint:r}=drupalSettings.helsinki_near_you_form;A11yAutocomplete(t,{classes:{wrapper:"helfi-etusivu-autocomplete"},source:async(t,i)=>{if(t.length<3)return i([]);try{const s=await fetch(`${e}?q=${t}`,{});i(await s.json())}catch(t){console.error(t),i([])}},minChars:3,minCharAssistiveHint:r,inputAssistiveHint:u,noResultsAssistiveHint:i,someResultsAssistiveHint:s,oneResultAssistiveHint:o,highlightedAssistiveHint:n})};Drupal.behaviors.helfi_etusivu_autocomplete={attach:function(i,s){t("a11y_autocomplete_element","[data-helfi-etusivu-autocomplete]",i).forEach(e)}}})(Drupal,once)}(); \ No newline at end of file +!function(){"use strict";((Drupal,t)=>{const e=t=>{if(!A11yAutocomplete)throw new Error("A11yAutocomplete object not found. Make sure the library is loaded.");if(!drupalSettings.helsinki_near_you_form)throw new Error("Helsinki near you form object not found. Configuration cannot be loaded for autocomplete.");const{autocompleteRoute:e,noResultsAssistiveHint:s,someResultsAssistiveHint:i,oneResultAssistiveHint:o,highlightedAssistiveHint:n,inputAssistiveHint:u,minCharAssistiveHint:r}=drupalSettings.helsinki_near_you_form;A11yAutocomplete(t,{classes:{wrapper:"helfi-etusivu-autocomplete"},source:async(t,s)=>{if(t.length<3)return s([]);try{const i=await fetch(`${e}?q=${t}`,{});s(await i.json())}catch(t){console.error(t),s([])}},minChars:3,minCharAssistiveHint:r,inputAssistiveHint:u,noResultsAssistiveHint:s,someResultsAssistiveHint:i,sort:!1,oneResultAssistiveHint:o,highlightedAssistiveHint:n})};Drupal.behaviors.helfi_etusivu_autocomplete={attach:function(s,i){t("a11y_autocomplete_element","[data-helfi-etusivu-autocomplete]",s).forEach(e)}}})(Drupal,once)}(); \ No newline at end of file diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 782b9b9b0..21c9fd948 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3342,9 +3342,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001692", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", - "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==", + "version": "1.0.30001697", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001697.tgz", + "integrity": "sha512-GwNPlWJin8E+d7Gxq96jxM6w0w+VFeyyXRsjU58emtkYqnbwHqXm5uT2uCmO0RQE9htWknOP4xtBlLmM/gWxvQ==", "funding": [ { "type": "opencollective", @@ -13105,9 +13105,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001692", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", - "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==" + "version": "1.0.30001697", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001697.tgz", + "integrity": "sha512-GwNPlWJin8E+d7Gxq96jxM6w0w+VFeyyXRsjU58emtkYqnbwHqXm5uT2uCmO0RQE9htWknOP4xtBlLmM/gWxvQ==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js b/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js index a591bba6b..82766d3f2 100644 --- a/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js +++ b/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js @@ -54,6 +54,7 @@ inputAssistiveHint, noResultsAssistiveHint, someResultsAssistiveHint, + sort: false, oneResultAssistiveHint, highlightedAssistiveHint, }); From 6e5efa14de2ecca1f1f64a98c457f8ff2e14c6d5 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 07:29:06 +0200 Subject: [PATCH 03/13] UHF-11235: Add configs for events near you --- .../helfi_etusivu/helfi_etusivu.install | 21 +++++++++++++++++++ .../HelsinkiNearYouEventsController.php | 12 +++++++++-- .../HelsinkiNearYouResultsController.php | 10 ++++++++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.install b/public/modules/custom/helfi_etusivu/helfi_etusivu.install index 28a1ca70d..2edb3e0ed 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.install +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.install @@ -314,3 +314,24 @@ function helfi_etusivu_update_9013(): void { } } } + +/** + * UHF-11235: Add events landing page to helsinki-near-you. + */ +function helfi_etusivu_update_9014(): void { + $paths = [ + [ + 'path' => '/helsinki-near-you/events', + 'alias' => '/helsinki-lahellasi/tapahtumat', + 'langcode' => 'fi', + ], + [ + 'path' => '/helsinki-near-you/events', + 'alias' => '/helsingfors-nara-dig/utbildningar', + 'langcode' => 'sv', + ] + ]; + foreach ($paths as $path) { + PathAlias::create($path)->save(); + } +} diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php index 74a154f27..663cbbbff 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php @@ -22,6 +22,8 @@ public function __construct(protected readonly LinkedEvents $linkedEvents) { * Returns a renderable array. */ public function content() : array { + $events_url = $this->linkedEvents->getEventsRequest(); + return [ '#attached' => [ 'drupalSettings' => [ @@ -29,9 +31,15 @@ public function content() : array { 'baseUrl' => LinkedEvents::BASE_URL, 'data' => [ 'helfi-coordinates-based-event-list' => [ - 'events_api_url' => $this->linkedEvents->getEventsRequest(), + 'events_api_url' => $events_url, + 'field_event_count' => 10, 'field_event_location' => TRUE, 'field_event_time' => TRUE, + 'field_free_events' => TRUE, + 'field_remote_events' => TRUE, + 'places' => $this->linkedEvents->getPlacesList($events_url), + 'useFullLocationFilter' => TRUE, + 'useFullTopicsFilter' => TRUE, 'useLocationSearch' => TRUE, ], ], @@ -43,7 +51,7 @@ public function content() : array { '#title' => $this->t( 'Events near you', [], - ['context' => 'Helsinki near you'] + ['context' => 'Helsinki near you event search'] ) ]; } diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index cfe3942a7..a8d8d8003 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -75,6 +75,12 @@ public function content(Request $request) : array|RedirectResponse { ]; $newsArchiveUrl = $this->getInternalSearchLink(InternalSearchLink::NEWS_ARCHIVE, $newsQuery); + $eventsNearYouRoute = Url::fromRoute('helfi_etusivu.helsinki_near_you_events', [], [ + 'query' => [ + 'address' => $addressName, + ] + ]); + return [ '#attached' => [ 'drupalSettings' => [ @@ -87,9 +93,11 @@ public function content(Request $request) : array|RedirectResponse { 'dwithin_metres' => 2000, ]), 'field_event_count' => 3, + 'hidePagination' => TRUE, ], ], - 'seeAllButtonOverride' => $this->t('See all events', [], ['context' => 'Helsinki near you']), + 'seeAllButtonOverride' => $this->t('See all events near you', [], ['context' => 'Helsinki near you']), + 'seeAllNearYouLink' => $eventsNearYouRoute->toString(), 'useExperimentalGhosts' => TRUE, ], 'helfi_news_archive' => [ From d292b9ceeeb800bccbc8cecbfd1fc1a9db169a22 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 08:31:32 +0200 Subject: [PATCH 04/13] UHF-11235: Add hero block to events near you page --- ...ubtheme_helsinkinearyoueventsheroblock.yml | 25 +++++++++++++++ .../custom/helfi_etusivu/helfi_etusivu.module | 14 +++++++- .../HelsinkiNearYouEventsController.php | 5 +++ .../Block/HelsinkiNearYouEventsHeroBlock.php | 32 +++++++++++++++++++ ...sinki-near-you-events-hero-block.html.twig | 6 ++++ .../helsinki-near-you-events.html.twig | 4 ++- .../custom/helfi_etusivu/translations/fi.po | 20 ++++++++++++ .../custom/helfi_etusivu/translations/sv.po | 21 ++++++++++++ 8 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml create mode 100644 public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php create mode 100644 public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events-hero-block.html.twig diff --git a/conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml new file mode 100644 index 000000000..50c10e8c4 --- /dev/null +++ b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml @@ -0,0 +1,25 @@ +uuid: e100646b-2af9-4b0d-ae6e-d2b74498f2fc +langcode: fi +status: true +dependencies: + module: + - helfi_etusivu + - system + theme: + - hdbt_subtheme +id: hdbt_subtheme_helsinkinearyoueventsheroblock +theme: hdbt_subtheme +region: before_content +weight: 0 +provider: null +plugin: helsinki_near_you_events_hero_block +settings: + id: helsinki_near_you_events_hero_block + label: 'Helsinki near you events hero block' + label_display: '0' + provider: helfi_etusivu +visibility: + request_path: + id: request_path + negate: false + pages: "/helsinki-near-you/events\r\n/helsinki-lahellasi/tapahtumat\r\n/helsingfors-nara-dig/utbildningar" diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 4a01e8bf2..13e4fbb08 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -261,9 +261,14 @@ function helfi_etusivu_preprocess_html(&$variables): void { function helfi_etusivu_preprocess_page(&$variables): void { $route = \Drupal::routeMatch()->getRouteName(); + $near_you_pages = [ + 'helfi_etusivu.helsinki_near_you', + 'helfi_etusivu.helsinki_near_you_events' + ]; + // There is hero block on Helsinki near you landing page but // since it isn't a paragraph we must set this variable manually. - if ($route === 'helfi_etusivu.helsinki_near_you') { + if (in_array($route, $near_you_pages)) { $variables['has_hero'] = TRUE; } @@ -354,6 +359,13 @@ function helfi_etusivu_theme() : array { ], 'helsinki_near_you_events' => [ 'template' => 'helsinki-near-you-events', + ], + 'helsinki_near_you_events_hero_block' => [ + 'variables' => [ + 'hero_title' => NULL, + 'hero_description' => NULL, + ], + 'template' => 'helsinki-near-you-events-hero-block', ] ]; } diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php index 663cbbbff..0fff2a4d3 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php @@ -43,6 +43,11 @@ public function content() : array { 'useLocationSearch' => TRUE, ], ], + 'seeAllButtonOverride' => $this->t( + 'Search for more events on the Events website', + [], + ['context' => 'Helsinki near you events search'] + ), 'useExperimentalGhosts' => TRUE, ], ], diff --git a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php new file mode 100644 index 000000000..3fa4ce16c --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php @@ -0,0 +1,32 @@ + 'helsinki_near_you_events_hero_block', + '#hero_title' => $this->t('Events near you', [], ['context' => 'Helsinki near you']), + '#hero_description' => $this->t('Find events in your neighbourhood that interest you.', [], ['context' => 'Helsinki near you events search']), + ]; + return $build; + } +} diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events-hero-block.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events-hero-block.html.twig new file mode 100644 index 000000000..4f8d438a5 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events-hero-block.html.twig @@ -0,0 +1,6 @@ +{% embed '@hdbt/component/hero.twig' with { + design: 'with-helsinki-near-you', + title: hero_title, + description: hero_description, +} %} +{% endembed %} diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig index de1fecacf..b8bc195af 100644 --- a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig @@ -6,7 +6,9 @@ 'component--react-search', 'component--event-list', 'component--coordinates-based-list', - ] + ], + component_title: 'Find events near you'|t({}, {'context': 'Helsinki near you events search'}), + component_description: 'Browse events near you or search for events by theme, location or date.'|t({}, {'context': 'Helsinki near you events search'}), } %} {% block component_content %} diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index 3bee9a9d2..577598977 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -200,3 +200,23 @@ msgstr "Katu- ja puistohankkeet lähellä osoitetta @address" msgctxt "Helsinki near you address label" msgid "Plans under preparation near the address @address" msgstr "Valmisteilla olevat kaavat lähellä osoitetta @address" + +msgctxt "Helsinki near you events search" +msgid "For example, Kotikatu 1" +msgstr "Esim. Kotikatu 1" + +msgctxt "Helsinki near you events search" +msgid "Find events near you" +msgstr "Etsi tapahtumia lähelläsi" + +msgctxt "Helsinki near you events search" +msgid "Browse events near you or search for events by theme, location or date." +msgstr "Voit selata lähialueesi tapahtumia tai etsiä tapahtumia aiheen, tapahtumapaikan tai ajankohdan mukaan." + +msgctxt "Helsinki near you events search" +msgid "Find events in your neighbourhood that interest you." +msgstr "Löydä sinua kiinnostavat tapahtumat lähialueeltasi." + +msgctxt "Helsinki near you events search" +msgid "Search for more events on the Events website" +msgstr "Etsi lisää tapahtumia Tapahtumat-sivustolta" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 29a5d1ef2..5e4be7df8 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -189,3 +189,24 @@ msgstr "Gatu- och parkprojekt nära adressen @address" msgctxt "Helsinki near you address label" msgid "Plans under preparation near the address @address" msgstr "Detaljplaner under beredning nära adressen @address" + +msgctxt "Helsinki near you events search" +msgid "For example, Kotikatu 1" +msgstr "T.ex. Hemgatan 1" + +msgctxt "Helsinki near you events search" +msgid "Find events near you" +msgstr "Sök evenemang nära dig" + +msgctxt "Helsinki near you events search" +msgid "Browse events near you or search for events by theme, location or date." +msgstr "Du kan bläddra i evenemang nära dig eller söka evenemang enligt tema, plats eller tidpunkt." + + +msgctxt "Helsinki near you events search" +msgid "Find events in your neighbourhood that interest you." +msgstr "Hitta intressanta evenemang nära dig." + +msgctxt "Helsinki near you events search" +msgid "Search for more events on the Events website" +msgstr "Sök fler evenemang på webbplatsen Evenemang" From 41b0bd20d8c325229659192d90ffeaf7bd3710e2 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 09:32:10 +0200 Subject: [PATCH 05/13] UHF-11235: Extra configs for helsinki near you events page --- public/modules/custom/helfi_etusivu/helfi_etusivu.module | 3 ++- .../src/Controller/HelsinkiNearYouEventsController.php | 1 + .../helfi_etusivu/templates/helsinki-near-you-events.html.twig | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 13e4fbb08..ed12d2981 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -358,6 +358,7 @@ function helfi_etusivu_theme() : array { 'template' => 'helsinki-near-you-hero-block', ], 'helsinki_near_you_events' => [ + 'variables' => [], 'template' => 'helsinki-near-you-events', ], 'helsinki_near_you_events_hero_block' => [ @@ -366,7 +367,7 @@ function helfi_etusivu_theme() : array { 'hero_description' => NULL, ], 'template' => 'helsinki-near-you-events-hero-block', - ] + ], ]; } diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php index 0fff2a4d3..6c810d3ef 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php @@ -38,6 +38,7 @@ public function content() : array { 'field_free_events' => TRUE, 'field_remote_events' => TRUE, 'places' => $this->linkedEvents->getPlacesList($events_url), + 'showHeading' => FALSE, 'useFullLocationFilter' => TRUE, 'useFullTopicsFilter' => TRUE, 'useLocationSearch' => TRUE, diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig index b8bc195af..b73a307ec 100644 --- a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-events.html.twig @@ -5,7 +5,7 @@ component_classes: [ 'component--react-search', 'component--event-list', - 'component--coordinates-based-list', + 'component--full-width', ], component_title: 'Find events near you'|t({}, {'context': 'Helsinki near you events search'}), component_description: 'Browse events near you or search for events by theme, location or date.'|t({}, {'context': 'Helsinki near you events search'}), From 3ba7d60757995468d3c5ff6b0f35a52dc147fa90 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 11:07:41 +0200 Subject: [PATCH 06/13] UHF-11235: Fix config lang code --- ...block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml index 50c10e8c4..d13eebc4a 100644 --- a/conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml +++ b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyoueventsheroblock.yml @@ -1,5 +1,5 @@ uuid: e100646b-2af9-4b0d-ae6e-d2b74498f2fc -langcode: fi +langcode: en status: true dependencies: module: From 935b006edf38d8c4f3858fe7a1227325722163c7 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 11:18:30 +0200 Subject: [PATCH 07/13] UHF-11235: Fix phpcs --- public/modules/custom/helfi_etusivu/helfi_etusivu.install | 2 +- public/modules/custom/helfi_etusivu/helfi_etusivu.module | 4 ++-- .../src/Controller/HelsinkiNearYouEventsController.php | 3 ++- .../src/Controller/HelsinkiNearYouResultsController.php | 2 +- .../src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php | 2 +- public/modules/custom/helfi_etusivu/translations/fi.po | 4 ++++ public/modules/custom/helfi_etusivu/translations/sv.po | 4 ++++ 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.install b/public/modules/custom/helfi_etusivu/helfi_etusivu.install index 2edb3e0ed..b5bbe4357 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.install +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.install @@ -329,7 +329,7 @@ function helfi_etusivu_update_9014(): void { 'path' => '/helsinki-near-you/events', 'alias' => '/helsingfors-nara-dig/utbildningar', 'langcode' => 'sv', - ] + ], ]; foreach ($paths as $path) { PathAlias::create($path)->save(); diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index ed12d2981..57da44880 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -247,7 +247,7 @@ function helfi_etusivu_preprocess_html(&$variables): void { // Set the theme color to suomenlinna on Helsinki near you landing pages. $near_you_pages = [ 'helfi_etusivu.helsinki_near_you', - 'helfi_etusivu.helsinki_near_you_events' + 'helfi_etusivu.helsinki_near_you_events', ]; if (in_array($route, $near_you_pages)) { @@ -263,7 +263,7 @@ function helfi_etusivu_preprocess_page(&$variables): void { $near_you_pages = [ 'helfi_etusivu.helsinki_near_you', - 'helfi_etusivu.helsinki_near_you_events' + 'helfi_etusivu.helsinki_near_you_events', ]; // There is hero block on Helsinki near you landing page but diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php index 6c810d3ef..e414ffd5f 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php @@ -58,7 +58,8 @@ public function content() : array { 'Events near you', [], ['context' => 'Helsinki near you event search'] - ) + ), ]; } + } diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index a8d8d8003..5bc97dc19 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -78,7 +78,7 @@ public function content(Request $request) : array|RedirectResponse { $eventsNearYouRoute = Url::fromRoute('helfi_etusivu.helsinki_near_you_events', [], [ 'query' => [ 'address' => $addressName, - ] + ], ]); return [ diff --git a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php index 3fa4ce16c..11aa435a0 100644 --- a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php +++ b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouEventsHeroBlock.php @@ -6,7 +6,6 @@ use Drupal\Core\Block\Attribute\Block; use Drupal\Core\Block\BlockBase; -use Drupal\Core\Cache\Cache; use Drupal\Core\StringTranslation\TranslatableMarkup; /** @@ -29,4 +28,5 @@ public function build() : array { ]; return $build; } + } diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index 577598977..395a2ca10 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -220,3 +220,7 @@ msgstr "Löydä sinua kiinnostavat tapahtumat lähialueeltasi." msgctxt "Helsinki near you events search" msgid "Search for more events on the Events website" msgstr "Etsi lisää tapahtumia Tapahtumat-sivustolta" + +msgctxt "Helsinki near you events search" +msgid "See all events near you" +msgstr "Katso kaikki tapahtumat lähelläsi" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 5e4be7df8..75dfa1d65 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -210,3 +210,7 @@ msgstr "Hitta intressanta evenemang nära dig." msgctxt "Helsinki near you events search" msgid "Search for more events on the Events website" msgstr "Sök fler evenemang på webbplatsen Evenemang" + +msgctxt "Helsinki near you events search" +msgid "See all events near you" +msgstr "Se alla evenemang nära dig" From 782f1e3d66925f12ac24006c52c6b8174461ced2 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 11:32:49 +0200 Subject: [PATCH 08/13] UHF-11235: Add translations --- public/modules/custom/helfi_etusivu/translations/fi.po | 4 ++++ public/modules/custom/helfi_etusivu/translations/sv.po | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index 395a2ca10..292479268 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -224,3 +224,7 @@ msgstr "Etsi lisää tapahtumia Tapahtumat-sivustolta" msgctxt "Helsinki near you events search" msgid "See all events near you" msgstr "Katso kaikki tapahtumat lähelläsi" + +msgctxt "Helsinki near you events search" +msgid "Start by searching with your address." +msgstr "Aloita kirjoittamalla osoitteesi." diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 75dfa1d65..1206a2f59 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -214,3 +214,7 @@ msgstr "Sök fler evenemang på webbplatsen Evenemang" msgctxt "Helsinki near you events search" msgid "See all events near you" msgstr "Se alla evenemang nära dig" + +msgctxt "Helsinki near you events search" +msgid "Start by searching with your address." +msgstr "Börja med att söka med din adress." From 2aa2637ee1f6ff715480b5f257b23598fb2635d0 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 11:48:47 +0200 Subject: [PATCH 09/13] UHF-11235: Bump autocomplete version --- public/themes/custom/hdbt_subtheme/hdbt_subtheme.libraries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.libraries.yml b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.libraries.yml index f11f59127..f47f9a13e 100644 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.libraries.yml +++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.libraries.yml @@ -20,7 +20,7 @@ a11y_autocomplete: helfi_etusivu_autocomplete: js: dist/js/autocomplete.min.js: {} - version: 1.0.1 + version: 1.0.2 dependencies: - hdbt_subtheme/a11y_autocomplete - core/drupal From 4282e56b662ea2c9abaad692f842e7287a5c41c5 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 15:07:17 +0200 Subject: [PATCH 10/13] UHF-11235: Fix autosuggest filtering --- .../modules/custom/helfi_etusivu/translations/sv.po | 1 - .../custom/hdbt_subtheme/dist/js/autocomplete.min.js | 2 +- public/themes/custom/hdbt_subtheme/package-lock.json | 12 ++++++------ .../custom/hdbt_subtheme/src/js/autocomplete.js | 1 + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 1206a2f59..85ffebd89 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -202,7 +202,6 @@ msgctxt "Helsinki near you events search" msgid "Browse events near you or search for events by theme, location or date." msgstr "Du kan bläddra i evenemang nära dig eller söka evenemang enligt tema, plats eller tidpunkt." - msgctxt "Helsinki near you events search" msgid "Find events in your neighbourhood that interest you." msgstr "Hitta intressanta evenemang nära dig." diff --git a/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js b/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js index 746f7c71e..f3a1d8f93 100644 --- a/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js +++ b/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js @@ -1 +1 @@ -!function(){"use strict";((Drupal,t)=>{const e=t=>{if(!A11yAutocomplete)throw new Error("A11yAutocomplete object not found. Make sure the library is loaded.");if(!drupalSettings.helsinki_near_you_form)throw new Error("Helsinki near you form object not found. Configuration cannot be loaded for autocomplete.");const{autocompleteRoute:e,noResultsAssistiveHint:s,someResultsAssistiveHint:i,oneResultAssistiveHint:o,highlightedAssistiveHint:n,inputAssistiveHint:u,minCharAssistiveHint:r}=drupalSettings.helsinki_near_you_form;A11yAutocomplete(t,{classes:{wrapper:"helfi-etusivu-autocomplete"},source:async(t,s)=>{if(t.length<3)return s([]);try{const i=await fetch(`${e}?q=${t}`,{});s(await i.json())}catch(t){console.error(t),s([])}},minChars:3,minCharAssistiveHint:r,inputAssistiveHint:u,noResultsAssistiveHint:s,someResultsAssistiveHint:i,sort:!1,oneResultAssistiveHint:o,highlightedAssistiveHint:n})};Drupal.behaviors.helfi_etusivu_autocomplete={attach:function(s,i){t("a11y_autocomplete_element","[data-helfi-etusivu-autocomplete]",s).forEach(e)}}})(Drupal,once)}(); \ No newline at end of file +!function(){"use strict";((Drupal,t)=>{const e=t=>{if(!A11yAutocomplete)throw new Error("A11yAutocomplete object not found. Make sure the library is loaded.");if(!drupalSettings.helsinki_near_you_form)throw new Error("Helsinki near you form object not found. Configuration cannot be loaded for autocomplete.");const{autocompleteRoute:e,noResultsAssistiveHint:s,someResultsAssistiveHint:i,oneResultAssistiveHint:o,highlightedAssistiveHint:n,inputAssistiveHint:u,minCharAssistiveHint:a}=drupalSettings.helsinki_near_you_form;A11yAutocomplete(t,{allowRepeatValues:!0,classes:{wrapper:"helfi-etusivu-autocomplete"},source:async(t,s)=>{if(t.length<3)return s([]);try{const i=await fetch(`${e}?q=${t}`,{});s(await i.json())}catch(t){console.error(t),s([])}},minChars:3,minCharAssistiveHint:a,inputAssistiveHint:u,noResultsAssistiveHint:s,someResultsAssistiveHint:i,sort:!1,oneResultAssistiveHint:o,highlightedAssistiveHint:n})};Drupal.behaviors.helfi_etusivu_autocomplete={attach:function(s,i){t("a11y_autocomplete_element","[data-helfi-etusivu-autocomplete]",s).forEach(e)}}})(Drupal,once)}(); \ No newline at end of file diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 21c9fd948..abb7232a2 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3342,9 +3342,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001697", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001697.tgz", - "integrity": "sha512-GwNPlWJin8E+d7Gxq96jxM6w0w+VFeyyXRsjU58emtkYqnbwHqXm5uT2uCmO0RQE9htWknOP4xtBlLmM/gWxvQ==", + "version": "1.0.30001698", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001698.tgz", + "integrity": "sha512-xJ3km2oiG/MbNU8G6zIq6XRZ6HtAOVXsbOrP/blGazi52kc5Yy7b6sDA5O+FbROzRrV7BSTllLHuNvmawYUJjw==", "funding": [ { "type": "opencollective", @@ -13105,9 +13105,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001697", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001697.tgz", - "integrity": "sha512-GwNPlWJin8E+d7Gxq96jxM6w0w+VFeyyXRsjU58emtkYqnbwHqXm5uT2uCmO0RQE9htWknOP4xtBlLmM/gWxvQ==" + "version": "1.0.30001698", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001698.tgz", + "integrity": "sha512-xJ3km2oiG/MbNU8G6zIq6XRZ6HtAOVXsbOrP/blGazi52kc5Yy7b6sDA5O+FbROzRrV7BSTllLHuNvmawYUJjw==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js b/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js index 82766d3f2..cfdb91a75 100644 --- a/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js +++ b/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js @@ -31,6 +31,7 @@ } = drupalSettings.helsinki_near_you_form; A11yAutocomplete(element, { + allowRepeatValues: true, classes: { wrapper: 'helfi-etusivu-autocomplete' }, From 3443fd5d3d851fc4cabc65ac6cffb63539f308fa Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 15:33:43 +0200 Subject: [PATCH 11/13] UHF-11235: Fix translation context --- .../src/Controller/HelsinkiNearYouEventsController.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php index e414ffd5f..031b3b0be 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php @@ -54,11 +54,7 @@ public function content() : array { ], ], '#theme' => 'helsinki_near_you_events', - '#title' => $this->t( - 'Events near you', - [], - ['context' => 'Helsinki near you event search'] - ), + '#title' => $this->t('Events near you', [], ['context' => 'Helsinki near you']), ]; } From 5bc9a26146957c8c6319553c5166b28ad52fb569 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Fri, 7 Feb 2025 15:59:04 +0200 Subject: [PATCH 12/13] UHF-11235: Translate route title --- .../src/Controller/HelsinkiNearYouResultsController.php | 1 - public/modules/custom/helfi_etusivu/translations/fi.po | 3 +++ public/modules/custom/helfi_etusivu/translations/sv.po | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index 5bc97dc19..a04a21011 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -96,7 +96,6 @@ public function content(Request $request) : array|RedirectResponse { 'hidePagination' => TRUE, ], ], - 'seeAllButtonOverride' => $this->t('See all events near you', [], ['context' => 'Helsinki near you']), 'seeAllNearYouLink' => $eventsNearYouRoute->toString(), 'useExperimentalGhosts' => TRUE, ], diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index 292479268..55a7e2dd2 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -228,3 +228,6 @@ msgstr "Katso kaikki tapahtumat lähelläsi" msgctxt "Helsinki near you events search" msgid "Start by searching with your address." msgstr "Aloita kirjoittamalla osoitteesi." + +msgid "Events near you" +msgstr "Tapahtumat lähelläsi" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 85ffebd89..d0686f553 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -217,3 +217,6 @@ msgstr "Se alla evenemang nära dig" msgctxt "Helsinki near you events search" msgid "Start by searching with your address." msgstr "Börja med att söka med din adress." + +msgid "Events near you" +msgstr "Evenemang nära dig" From 86a37be7b168f4de5ff9ff19b93802a1a17b9e09 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Mon, 10 Feb 2025 14:34:33 +0200 Subject: [PATCH 13/13] UHF-11235: Update setting --- .../src/Controller/HelsinkiNearYouEventsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php index 031b3b0be..2083b313a 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouEventsController.php @@ -38,7 +38,7 @@ public function content() : array { 'field_free_events' => TRUE, 'field_remote_events' => TRUE, 'places' => $this->linkedEvents->getPlacesList($events_url), - 'showHeading' => FALSE, + 'hideHeading' => TRUE, 'useFullLocationFilter' => TRUE, 'useFullTopicsFilter' => TRUE, 'useLocationSearch' => TRUE,