OEL-3411: Set default button label in search block header, if not already set.

config/optional/block.block.oe_whitelabel_search_form.yml

@@ -24,7 +24,7 @@ settings:
     label: Search
     placeholder: Search
   button:
-    label: ''
+    label: Search
   view_options:
     enable_autocomplete: false
     id: null

modules/oe_whitelabel_search/oe_whitelabel_search.post_update.php

@@ -19,3 +19,29 @@ function oe_whitelabel_search_post_update_00001(&$sandbox) {
   $block->set('settings', $settings);
   $block->save();
 }
+
+/**
+ * Set default button label in search block if it's not already set.
+ */
+function oe_whitelabel_search_post_update_00002(&$sandbox) {
+  $theme_manager = \Drupal::service('theme.manager');
+  $current_theme = $theme_manager->getActiveTheme()->getName();
+
+  $block_storage = \Drupal::entityTypeManager()->getStorage('block');
+  $blocks = $block_storage->loadByProperties(['theme' => $current_theme, 'plugin' => 'whitelabel_search_block']);
+
+  $updated_blocks = [];
+  foreach ($blocks as $block) {
+    $settings = $block->get('settings');
+    if (empty($settings['button']['label'])) {
+      $settings['button']['label'] = t('Search');
+      $block->set('settings', $settings);
+      $block->save();
+      $updated_blocks[] = $block->id();
+    }
+  }
+  if (!empty($updated_blocks)) {
+    return 'The following search blocks have been updated: ' . implode(', ', $updated_blocks);
+  }
+  return 'No search block needed to be updated.';
+}

modules/oe_whitelabel_search/src/Plugin/Block/SearchBlock.php

@@ -101,7 +101,7 @@ public function defaultConfiguration() {
         'placeholder' => $this->t('Search'),
       ],
       'button' => [
-        'label' => '',
+        'label' => $this->t('Search'),
       ],
       'view_options' => [
         'enable_autocomplete' => FALSE,

templates/overrides/search/input--submit--navigation-right--oe-whitelabel-search-form.html.twig

@@ -6,14 +6,9 @@
  * @see ./core/modules/system/templates/input.html.twig
  */
 #}
-{% if element['#value'] is not empty %}
-  {% set label %}
-    <span class="d-none d-lg-inline-block">{{ element['#value']|t }}</span>
-  {% endset %}
-{% endif %}
 {{ pattern('button', {
   'variant': 'light',
-  'label': label,
+  'label': element['#value']|t,
   'icon': 'search',
   'type': 'submit',
   'icon_position': 'before',