MAGE-986 Refactor config to utilize Autocomplete helper

Author: cammonro

Block/Adminhtml/System/Config/Form/Field/Checkboxes.php

@@ -10,7 +10,6 @@ class Checkboxes extends Field
     protected function _getElementHtml(AbstractElement $element)
     {
         $html = '';
-        $elementId = $element->getHtmlId();
         $name = $element->getName();
         $options = $element->getValues();
         $values = empty($element->getValue()) ? [] : explode(',', $element->getValue()); // store as CSV in config

Block/Configuration.php

@@ -209,24 +209,7 @@ public function getConfiguration()
                     'openInNewWindow'        => in_array(InstantSearchRedirectOptions::OPEN_IN_NEW_WINDOW, $this->instantSearchConfig->getInstantRedirectOptions())
                 ]
             ],
-            'autocomplete' => [
-                'enabled' => $config->isAutoCompleteEnabled(),
-                'selector' => $config->getAutocompleteSelector(),
-                'sections' => $config->getAutocompleteSections(),
-                'nbOfProductsSuggestions' => $config->getNumberOfProductsSuggestions(),
-                'nbOfCategoriesSuggestions' => $config->getNumberOfCategoriesSuggestions(),
-                'nbOfQueriesSuggestions' => $config->getNumberOfQueriesSuggestions(),
-                'isDebugEnabled' => $config->isAutocompleteDebugEnabled(),
-                'isNavigatorEnabled' => $config->isAutocompleteNavigatorEnabled(),
-                'debounceMilliseconds' => $config->getAutocompleteDebounceMilliseconds(),
-                'minimumCharacters' => $config->getAutocompleteMinimumCharacterLength(),
-                'redirects' => [
-                    'enabled'                => $this->autocompleteConfig->isAutocompleteRedirectEnabled(),
-                    'showSelectableRedirect' => $this->autocompleteConfig->getAutocompleteRedirectMode() !== AutocompleteRedirectMode::SUBMIT_ONLY,
-                    'showHitsWithRedirect'   => $this->autocompleteConfig->getAutocompleteRedirectMode() !== AutocompleteRedirectMode::SELECTABLE_REDIRECT,
-                    'openInNewWindow'        => $this->autocompleteConfig->isAutocompleteRedirectInNewWindowEnabled()
-                ]
-            ],
+            'autocomplete' => $this->getAutocompleteConfiguration(),
             'landingPage' => [
                 'query' => $this->getLandingPageQuery(),
                 'configuration' => $this->getLandingPageConfiguration(),
@@ -400,6 +383,29 @@ public function getConfiguration()
         return $transport->getData();
     }
 
+    protected function getAutocompleteConfiguration(): array
+    {
+        $config = $this->autocompleteConfig;
+        return [
+            'enabled'                   => $config->isEnabled(),
+            'selector'                  => $config->getDomSelector(),
+            'sections'                  => $config->getAdditionalSections(),
+            'nbOfProductsSuggestions'   => $config->getNumberOfProductsSuggestions(),
+            'nbOfCategoriesSuggestions' => $config->getNumberOfCategoriesSuggestions(),
+            'nbOfQueriesSuggestions'    => $config->getNumberOfQueriesSuggestions(),
+            'isDebugEnabled'            => $config->isDebugEnabled(),
+            'isNavigatorEnabled'        => $config->isKeyboardNavigationEnabled(),
+            'debounceMilliseconds'      => $config->getDebounceMilliseconds(),
+            'minimumCharacters'         => $config->getMinimumCharacterLength(),
+            'redirects' => [
+                'enabled'                => $config->isRedirectEnabled(),
+                'showSelectableRedirect' => $config->getRedirectMode() !== AutocompleteRedirectMode::SUBMIT_ONLY,
+                'showHitsWithRedirect'   => $config->getRedirectMode() !== AutocompleteRedirectMode::SELECTABLE_REDIRECT,
+                'openInNewWindow'        => $config->isRedirectInNewWindowEnabled()
+            ]
+        ];
+    }
+
     protected function areCategoriesInFacets($facets)
     {
         return in_array('categories', array_column($facets, 'attribute'));