Merge pull request #802 from City-of-Helsinki/UHF-11045

UHF-11045: Fix autocomplete route
City-of-Helsinki · Dec 17, 2024 · 496d288 · 496d288
2 parents bd298d2 + 87738bf
commit 496d288
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php
@@ -6,6 +6,7 @@
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
 
 /**
  * Search form for near you page.
@@ -30,6 +31,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#attached' => [
         'drupalSettings' => [
           'helsinki_near_you_form' => [
+            'autocompleteRoute' => Url::fromRoute('helfi_etusivu.helsinki_near_you_autocomplete')->tosTring(),
             'minCharAssistiveHint' => $this->t('Type @count or more characters for results', [], ['context' => $translation_context]),
             'inputAssistiveHint' => $this->t(
               'When autocomplete results are available use up and down arrows to review and enter to select. Touch device users, explore by touch or with swipe gestures.',
@@ -51,6 +53,11 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#placeholder' => $this->t('Eg. Vaasankatu 5', [], ['context' => 'Helsinki near you']),
       '#required' => TRUE,
       '#title' => $this->t('Address'),
+      '#label_attributes' => [
+        'class' => [
+          'hds-text-input__label',
+        ],
+      ],
       '#type' => 'helfi_etusivu_autocomplete',
       '#wrapper_attributes' => [
         'class' => [

diff --git a/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js b/public/themes/custom/hdbt_subtheme/dist/js/autocomplete.min.js
diff --git 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.0
+  version: 1.0.1
   dependencies:
     - hdbt_subtheme/a11y_autocomplete
     - core/drupal

diff --git a/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js b/public/themes/custom/hdbt_subtheme/src/js/autocomplete.js
@@ -21,6 +21,7 @@
     }
 
     const {
+      autocompleteRoute,
       noResultsAssistiveHint,
       someResultsAssistiveHint,
       oneResultAssistiveHint,
@@ -39,7 +40,7 @@
         }
 
         try {
-          const response = await fetch(`/helsinki-near-you/results/autocomplete?q=${searchTerm}`, {});
+          const response = await fetch(`${autocompleteRoute}?q=${searchTerm}`, {});
           const data = await response.json();
           results(data);
         }