UHF-9311: Unit search paragraph changes and improvements

modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_search.default.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.field.paragraph.unit_search.field_search_results_terms
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
+    - field.field.paragraph.unit_search.field_unit_search_meta_desc
     - field.field.paragraph.unit_search.field_unit_search_meta_label
     - field.field.paragraph.unit_search.field_unit_search_meta_placehold
     - field.field.paragraph.unit_search.field_unit_search_title
@@ -21,6 +22,7 @@ third_party_settings:
       children:
         - field_unit_search_meta_label
         - field_unit_search_meta_placehold
+        - field_unit_search_meta_desc
         - field_unit_search_meta_button
         - field_search_results_term
         - field_search_results_terms
@@ -42,15 +44,15 @@ mode: default
 content:
   field_search_results_term:
     type: string_textfield
-    weight: 7
+    weight: 8
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_search_results_terms:
     type: string_textfield
-    weight: 8
+    weight: 9
     region: content
     settings:
       size: 60
@@ -66,12 +68,20 @@ content:
     third_party_settings: {  }
   field_unit_search_meta_button:
     type: string_textfield
-    weight: 6
+    weight: 7
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_unit_search_meta_desc:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: { }
   field_unit_search_meta_label:
     type: string_textfield
     weight: 4

modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_search.default.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.field.paragraph.unit_search.field_search_results_terms
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
+    - field.field.paragraph.unit_search.field_unit_search_meta_desc
     - field.field.paragraph.unit_search.field_unit_search_meta_label
     - field.field.paragraph.unit_search.field_unit_search_meta_placehold
     - field.field.paragraph.unit_search.field_unit_search_title
@@ -49,6 +50,13 @@ content:
     third_party_settings: {  }
     weight: 5
     region: content
+  field_unit_search_meta_desc:
+    type: basic_string
+    label: above
+    settings: { }
+    third_party_settings: { }
+    weight: 8
+    region: content
   field_unit_search_meta_label:
     type: string
     label: hidden

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_search_results_term.yml

@@ -8,8 +8,8 @@ id: paragraph.unit_search.field_search_results_term
 field_name: field_search_results_term
 entity_type: paragraph
 bundle: unit_search
-label: 'Search results singular term'
-description: 'Term used on the search results title when there is exactly one result from the search.'
+label: 'Search results title for one result without the number'
+description: 'For example: beach'
 required: false
 translatable: false
 default_value: {  }

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_search_results_terms.yml

@@ -8,8 +8,8 @@ id: paragraph.unit_search.field_search_results_terms
 field_name: field_search_results_terms
 entity_type: paragraph
 bundle: unit_search
-label: 'Search results plural term'
-description: 'Term used on the search results title when there is zero or more than one result from the search.'
+label: 'Search results title for multiple results without the number'
+description: 'For example: beaches'
 required: false
 translatable: false
 default_value: {  }

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_unit_search_description.yml

@@ -10,8 +10,8 @@ id: paragraph.unit_search.field_unit_search_description
 field_name: field_unit_search_description
 entity_type: paragraph
 bundle: unit_search
-label: Description
-description: ''
+label: 'Search description'
+description: 'For example: You can search for the closest playground by address.'
 required: false
 translatable: false
 default_value: {  }

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_unit_search_meta_button.yml

@@ -8,13 +8,11 @@ id: paragraph.unit_search.field_unit_search_meta_button
 field_name: field_unit_search_meta_button
 entity_type: paragraph
 bundle: unit_search
-label: 'Search button'
-description: ''
+label: 'Search button text'
+description: "The button's text is set to 'Search' by default. It is not recommended to change the text."
 required: false
 translatable: false
-default_value:
-  -
-    value: 'Search for units'
+default_value: {  }
 default_value_callback: ''
 settings: {  }
 field_type: string

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml

@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_unit_search_meta_desc
+    - paragraphs.paragraphs_type.unit_search
+id: paragraph.unit_search.field_unit_search_meta_desc
+field_name: field_unit_search_meta_desc
+entity_type: paragraph
+bundle: unit_search
+label: 'Additional description under the search input'
+description: 'For example: Street name and house number'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_unit_search_meta_label.yml

@@ -9,12 +9,10 @@ field_name: field_unit_search_meta_label
 entity_type: paragraph
 bundle: unit_search
 label: 'Search label'
-description: ''
+description: 'For example: Address'
 required: false
 translatable: false
-default_value:
-  -
-    value: 'Search for a unit'
+default_value: {  }
 default_value_callback: ''
 settings: {  }
 field_type: string

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml

@@ -8,13 +8,11 @@ id: paragraph.unit_search.field_unit_search_meta_placehold
 field_name: field_unit_search_meta_placehold
 entity_type: paragraph
 bundle: unit_search
-label: 'Search placeholder'
-description: ''
+label: 'Placeholder text for the search input'
+description: 'For example: Kotikatu 1'
 required: false
 translatable: false
-default_value:
-  -
-    value: 'Enter name, address or postal code'
+default_value: {  }
 default_value_callback: ''
 settings: {  }
 field_type: string

modules/helfi_tpr_config/config/install/field.field.paragraph.unit_search.field_unit_search_title.yml

@@ -8,8 +8,8 @@ id: paragraph.unit_search.field_unit_search_title
 field_name: field_unit_search_title
 entity_type: paragraph
 bundle: unit_search
-label: Title
-description: ''
+label: 'Search title (H2)'
+description: 'For example: Search for beaches'
 required: true
 translatable: false
 default_value: {  }

modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_search_meta_desc.yml

@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - paragraphs
+id: paragraph.field_unit_search_meta_desc
+field_name: field_unit_search_meta_desc
+entity_type: paragraph
+type: string_long
+settings:
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/helfi_tpr_config/config/install/views.view.unit_search.yml

@@ -303,7 +303,7 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Use
+          submit_button: Search
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: Sort

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_search_results_term.yml

@@ -1,2 +1,2 @@
-label: 'Hakutulosten yksikkötermi'
-description: 'Termi jota käytetään hakutulosten otsikossa kun tuloksia on tasan yksi.'
+label: 'Hakutulosten otsikko (H3) yhdelle hakutulokselle ilman numeroa'
+description: 'Esim. uimaranta'

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_search_results_terms.yml

@@ -1,2 +1,2 @@
-label: 'Hakutulosten monikkotermi'
-description: 'Termi jota käytetään hakutulosten otsikossa kun tuloksia on nolla tai enemmän kuin yksi.'
+label: 'Hakutulosten otsikko (H3) monelle hakutulokselle ilman numeroa'
+description: 'Esim. uimarantaa'

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml

@@ -1 +1,2 @@
-label: Kuvaus
+label: 'Haun kuvausteksti'
+description: 'Esim. Voit etsiä lähintä leikkipuistoa osoitteen mukaan.'

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml

@@ -1,4 +1,2 @@
-label: 'Hakukentän painike'
-default_value:
-  -
-    value: 'Hae toimipisteitä'
+label: 'Suodata painikkeen teksti'
+description: 'Painikkeen tekstiksi tulee oletuksena "Etsi". Suositus on, että tekstiä ei muuteta.'

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml

@@ -0,0 +1,2 @@
+label: 'Lisäohjeistus hakukentän alle'
+description: 'Esim. Kadunnimi ja talonumero'

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml

@@ -1,4 +1,2 @@
-label: 'Hakukentän otsikko'
-default_value:
-  -
-    value: 'Hae toimipisteitä'
+label: 'Hakukentän otsikko (label)'
+description: 'Esim. Osoite'

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml

@@ -1,4 +1,2 @@
-label: 'Hakukentän oletusteksti'
-default_value:
-  -
-    value: 'Syötä nimi, osoite tai postinumero'
+label: 'Esimerkkiteksti hakukenttään (placeholder)'
+description: 'Esim. Kotikatu 1'

modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml

@@ -1 +1,2 @@
-label: Otsikko
+label: 'Haun otsikko (H2)'
+description: 'Esim. Etsi uimarantoja'

modules/helfi_tpr_config/config/optional/language/fi/views.view.unit_search.yml

@@ -20,7 +20,7 @@ display:
             items_per_page_options_all_label: '- Kaikki -'
       exposed_form:
         options:
-          submit_button: Käytä
+          submit_button: Etsi
           reset_button_label: Palauta
           exposed_sorts_label: Järjestä
           sort_asc_label: Nouseva

modules/helfi_tpr_config/config/optional/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml

@@ -1 +1,2 @@
-label: Beskrivning
+label: Sök beskrivning
+description: 'T.ex. Du kan söka efter närmaste lekplats efter adress.'

modules/helfi_tpr_config/config/optional/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml

@@ -1 +1,2 @@
-label: Titel
+label: Sök titel
+description: 'T.ex. Sök badstränder'

modules/helfi_tpr_config/config/optional/language/sv/views.view.unit_search.yml

@@ -15,7 +15,7 @@ display:
             offset_label: Kompensera
       exposed_form:
         options:
-          submit_button: Verkställ
+          submit_button: Sök
           reset_button_label: Återställ
           exposed_sorts_label: 'Sortera efter'
           sort_asc_label: Stigande

modules/helfi_tpr_config/helfi_tpr_config.install

@@ -388,3 +388,12 @@ function helfi_tpr_config_update_9054(): void {
   \Drupal::service('helfi_platform_config.config_update_helper')
     ->update('helfi_tpr_config');
 }
+
+/**
+ * UHF-9311: Add new field for Unit Search paragraph and update labels.
+ */
+function helfi_tpr_config_update_9055(): void {
+  // Re-import 'helfi_tpr_config' configuration.
+  \Drupal::service('helfi_platform_config.config_update_helper')
+    ->update('helfi_tpr_config');
+}

modules/helfi_tpr_config/helfi_tpr_config.module

@@ -465,7 +465,7 @@ function helfi_tpr_config_form_views_exposed_form_alter(&$form, $form_state) : v
     return;
   }
 
-  if ($paragraph->hasField('field_unit_search_meta_button')) {
+  if ($paragraph->hasField('field_unit_search_meta_button') && isset($paragraph->get('field_unit_search_meta_button')->value)) {
     $form['actions']['submit']['#value'] = $paragraph
       ->get('field_unit_search_meta_button')
       ->value;
@@ -482,6 +482,12 @@ function helfi_tpr_config_form_views_exposed_form_alter(&$form, $form_state) : v
       ->get('field_unit_search_meta_placehold')
       ->value;
   }
+
+  if ($paragraph->hasField('field_unit_search_meta_desc')) {
+    $form['#info']['filter-combine']['description'] = $paragraph
+      ->get('field_unit_search_meta_desc')
+      ->value;
+  }
 }
 
 /**