UHF-10555: Merge branch 'dev' of github.com:City-of-Helsinki/drupal-h…

…elfi-etusivu into UHF-10555
City-of-Helsinki · Dec 4, 2024 · 7e849f1 · 7e849f1
2 parents af5ed59 + 3cee5f7
commit 7e849f1
Show file tree

Hide file tree

Showing 17 changed files with 157 additions and 76 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-10
+12
diff --git a/composer.json b/composer.json
@@ -38,6 +38,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "dg/bypass-finals": "^1.5",
         "dmore/chrome-mink-driver": "^2.8",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^10.0",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml
@@ -1,7 +1,7 @@
 social_media:
   facebook_share:
     text: 'Jaa Facebook-palvelussa'
-    api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
+    api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
     attributes: "target|_blank\r\nclass|facebook-share"
   linkedin:
     text: 'Jaa LinkedIn-palvelussa'

diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml
@@ -1,7 +1,7 @@
 social_media:
   facebook_share:
     text: 'Dela på Facebook'
-    api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
+    api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
     attributes: "target|_blank\r\nclass|facebook-share"
   linkedin:
     text: 'Dela på Linkedin'

diff --git a/conf/cmi/search_api.index.news.yml b/conf/cmi/search_api.index.news.yml
@@ -11,7 +11,7 @@ dependencies:
     - field.storage.node.field_news_item_tags
     - field.storage.node.field_news_neighbourhoods
     - field.storage.node.field_short_title
-    - search_api.server.news
+    - search_api.server.default
   module:
     - helfi_etusivu
     - helfi_react_search
@@ -280,4 +280,4 @@ options:
   cron_limit: 50
   index_directly: true
   track_changes_in_references: true
-server: news
+server: default
diff --git a/conf/cmi/search_api.index.news_terms.yml b/conf/cmi/search_api.index.news_terms.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - search_api.server.news
+    - search_api.server.default
   module:
     - helfi_etusivu
     - helfi_react_search
@@ -113,4 +113,4 @@ options:
   cron_limit: 50
   index_directly: true
   track_changes_in_references: true
-server: news
+server: default
diff --git a/conf/cmi/search_api.server.news.yml → conf/cmi/search_api.server.default.yml b/conf/cmi/search_api.server.news.yml → conf/cmi/search_api.server.default.yml
@@ -4,7 +4,7 @@ status: true
 dependencies:
   module:
     - elasticsearch_connector
-id: news
+id: default
 name: news
 description: ''
 backend: elasticsearch

diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module
@@ -244,9 +244,9 @@ 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 engel on Helsinki near you landing page.
+  // Set the theme color to suomenlinna on Helsinki near you landing page.
   if ($route === 'helfi_etusivu.helsinki_near_you') {
-    $variables['theme_color'] = 'engel';
+    $variables['theme_color'] = 'suomenlinna';
   }
 }
 

diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php
@@ -80,6 +80,9 @@ public function content(Request $request) : array|RedirectResponse {
       ],
       '#back_link_label' => $this->t('Edit address', [], ['context' => 'Helsinki near you']),
       '#back_link_url' => $return_url,
+      '#cache' => [
+        'contexts' => ['url.query_args:q'],
+      ],
       '#coordinates' => $addressData ? $addressData['coordinates'] : NULL,
       '#theme' => 'helsinki_near_you_results_page',
       '#title' => $this->t(

diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php
@@ -31,12 +31,22 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#required' => TRUE,
       '#title' => $this->t('Address'),
       '#type' => 'textfield',
+      '#wrapper_attributes' => [
+        'class' => ['helfi-etusivu-near-you-form__address-input'],
+      ],
     ];
 
     $form['actions']['#type'] = 'actions';
     $form['actions']['submit'] = [
+      '#attributes' => [
+        'class' => [
+          'hds-button',
+          'hds-button--primary',
+          'helfi-search__submit-button',
+        ],
+      ],
       '#type' => 'submit',
-      '#value' => $this->t('Search'),
+      '#value' => $this->t('Search', [], ['context' => 'Helsinki near you']),
     ];
 
     return $form;

diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po
@@ -84,3 +84,7 @@ msgstr "Esimerkiksi Vaasankatu 5"
 msgctxt "Helsinki near you"
 msgid "The address you input yielded no results. You may want to try a different address."
 msgstr "Antamallasi osoitteella ei löytynyt tuloksia. Voit kokeilla muuttaa hakuehtojasi."
+
+msgctxt "Helsinki near you"
+msgid "Search"
+msgstr "Hae"
diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po
@@ -73,3 +73,7 @@ msgstr "Till exempel Vasagatan 5"
 msgctxt "Helsinki near you"
 msgid "The address you input yielded no results. You may want to try a different address."
 msgstr "Adressen du angav gav inga resultat. Du kanske vill prova en annan adress."
+
+msgctxt "Helsinki near you"
+msgid "Search"
+msgstr "Söka"