OEL-1367: Recover input name, add region and form_id to button form array and...

OEL-1367: Recover input name, add region and form_id to button form array and set the region configuration in the validation.

modules/oe_whitelabel_search/src/Form/SearchForm.php

@@ -46,8 +46,12 @@ class SearchForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, array $config = NULL): array {
     $form_state->set('oe_whitelabel_search_config', $config);
+    $input_value = '';
 
-    $form['#region'] = $config['form']['layout'];
+    $form['#region'] = $config['form']['region'];
+    if (!empty($config['input']['name'])) {
+      $input_value = $this->getRequest()->get($config['input']['name']);
+    }
 
     $form['search_input'] = [
       '#type' => 'textfield',
@@ -56,17 +60,18 @@ class SearchForm extends FormBase {
       '#size' => 20,
       '#margin_class' => 'mb-0',
       '#form_id' => $this->getFormId(),
-      '#region' => $config['form']['layout'],
-      '#default_value' => $this->getRequest()->get('search_api_fulltext'),
+      '#region' => $config['form']['region'],
+      '#default_value' => $input_value,
       '#required' => TRUE,
     ];
 
     $form['submit'] = [
-      '#type' => 'pattern',
-      '#id' => 'button',
+      '#type' => 'submit',
       '#input' => TRUE,
       '#is_button' => TRUE,
       '#executes_submit_callback' => TRUE,
+      '#form_id' => $this->getFormId(),
+      '#region' => $config['form']['region'],
     ];
 
     if (!$config['view_options']['enable_autocomplete']) {
@@ -78,7 +83,7 @@ class SearchForm extends FormBase {
     $form['search_input']['#search_id'] = $config['view_options']['id'];
     $form['search_input']['#additional_data'] = [
       'display' => $config['view_options']['display'],
-      'filter' => 'search_api_fulltext',
+      'filter' => $config['input']['name'],
     ];
 
     return $form;
@@ -93,7 +98,7 @@ class SearchForm extends FormBase {
       'language' => $this->languageManager->getCurrentLanguage(),
       'absolute' => TRUE,
       'query' => [
-        'search_api_fulltext' => $form_state->getValue('search_input'),
+        $config['input']['name'] => $form_state->getValue('search_input'),
       ],
     ]);
     $form_state->setRedirectUrl($url);

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

@@ -93,15 +93,10 @@ class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
     return [
       'form' => [
         'action' => '',
+        'region' => '',
       ],
       'input' => [
         'name' => '',
-        'label' => '',
-        'classes' => '',
-        'placeholder' => $this->t('Search'),
-      ],
-      'button' => [
-        'classes' => '',
       ],
       'view_options' => [
         'enable_autocomplete' => FALSE,
@@ -125,15 +120,19 @@ class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
       '#default_value' => $config['form']['action'],
       '#required' => TRUE,
     ];
-
-    $form['layout'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Layout'),
-      '#options' => [
-        'navigation_right' => 'Navigation right Layout',
-        'header' => 'Header Layout',
-      ],
-      '#default_value' => $config['form']['layout'] ?? 'navigation_right',
+    $form['input'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Input Field Settings'),
+      '#open' => TRUE,
+      '#tree' => TRUE,
+      '#description' => $this->t('Fill in the settings of the Input field.'),
+    ];
+    $form['input']['input_name'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Input name'),
+      '#description' => $this->t('A name for the search input. Is the Query parameter of the contextual filter used at the Search API view.'),
+      '#default_value' => $config['input']['name'],
+      '#required' => TRUE,
     ];
 
     $form['enable_autocomplete'] = [
@@ -185,11 +184,6 @@ class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function blockSubmit($form, FormStateInterface $form_state): void {
-    $values = $form_state->getValues();
-    $this->setConfigurationValue('form', [
-      'action' => $form_state->getValue('form_action'),
-      'layout' => $values['layout'],
-    ]);
     $this->setConfigurationValue('view_options', [
       'id' => $form_state->getValue('view_id'),
       'display' => $form_state->getValue('view_display'),
@@ -203,6 +197,12 @@ class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
   public function blockValidate($form, FormStateInterface $form_state): void {
     $values = $form_state->getValues();
 
+    $completeForm = $form_state->getCompleteForm();
+    $this->setConfigurationValue('form', [
+      'action' => $form_state->getValue('form_action'),
+      'region' => $completeForm['region']['#value'],
+    ]);
+
     if (!$this->moduleHandler->moduleExists('views') || !$this->moduleHandler->moduleExists('search_api_autocomplete')) {
       return;
     }