MAGE-986 Move new config options to discrete Autocomplete config helper

Author: cammonro

Block/Algolia.php

@@ -4,6 +4,7 @@
 
 use Algolia\AlgoliaSearch\Helper\AlgoliaHelper;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\AutocompleteHelper;
 use Algolia\AlgoliaSearch\Helper\Configuration\PersonalizationHelper;
 use Algolia\AlgoliaSearch\Helper\Data as CoreHelper;
 use Algolia\AlgoliaSearch\Helper\Entity\CategoryHelper;
@@ -40,6 +41,8 @@ class Algolia extends Template implements CollectionDataSourceInterface
 
     public function __construct(
         protected ConfigHelper          $config,
+        protected AutocompleteHelper    $autocompleteConfig,
+        protected PersonalizationHelper $personalizationHelper,
         protected CatalogSearchHelper   $catalogSearchHelper,
         protected ProductHelper         $productHelper,
         protected Currency              $currency,
@@ -53,7 +56,6 @@ public function __construct(
         protected CategoryHelper        $categoryHelper,
         protected SuggestionHelper      $suggestionHelper,
         protected LandingPageHelper     $landingPageHelper,
-        protected PersonalizationHelper $personalizationHelper,
         protected CheckoutSession       $checkoutSession,
         protected DateTime              $date,
         protected CurrentCategory       $currentCategory,

Block/Configuration.php

@@ -221,10 +221,10 @@ public function getConfiguration()
                 'debounceMilliseconds' => $config->getAutocompleteDebounceMilliseconds(),
                 'minimumCharacters' => $config->getAutocompleteMinimumCharacterLength(),
                 'redirects' => [
-                    'enabled' => $config->isAutocompleteRedirectEnabled(),
-                    'showSelectableRedirect' => $config->getAutocompleteRedirectMode() !== AutocompleteRedirectMode::SUBMIT_ONLY,
-                    'showHitsWithRedirect' => $config->getAutocompleteRedirectMode() !== AutocompleteRedirectMode::SELECTABLE_REDIRECT,
-                    'openInNewWindow' => $config->isAutocompleteRedirectInNewWindowEnabled()
+                    'enabled'                => $this->autocompleteConfig->isAutocompleteRedirectEnabled(),
+                    'showSelectableRedirect' => $this->autocompleteConfig->getAutocompleteRedirectMode() !== AutocompleteRedirectMode::SUBMIT_ONLY,
+                    'showHitsWithRedirect'   => $this->autocompleteConfig->getAutocompleteRedirectMode() !== AutocompleteRedirectMode::SELECTABLE_REDIRECT,
+                    'openInNewWindow'        => $this->autocompleteConfig->isAutocompleteRedirectInNewWindowEnabled()
                 ]
             ],
             'landingPage' => [

Helper/ConfigHelper.php

@@ -63,10 +63,6 @@ class ConfigHelper
     public const AUTOCOMPLETE_DEBOUNCE_MILLISEC = 'algoliasearch_autocomplete/autocomplete/debounce_millisec';
     public const AUTOCOMPLETE_MINIMUM_CHAR_LENGTH = 'algoliasearch_autocomplete/autocomplete/minimum_char_length';
 
-    public const IS_AUTOCOMPLETE_REDIRECT_ENABLED = 'algoliasearch_autocomplete/redirects/enable';
-    public const AUTOCOMPLETE_REDIRECT_MODE = 'algoliasearch_autocomplete/redirects/mode';
-    public const AUTOCOMPLETE_OPEN_REDIRECT_IN_NEW_WINDOW = 'algoliasearch_autocomplete/redirects/target';
-
     public const PRODUCT_ATTRIBUTES = 'algoliasearch_products/products/product_additional_attributes';
     public const PRODUCT_CUSTOM_RANKING = 'algoliasearch_products/products/custom_ranking_product_attributes';
     public const USE_ADAPTIVE_IMAGE = 'algoliasearch_products/products/use_adaptive_image';
@@ -1067,26 +1063,6 @@ public function getAutocompleteMinimumCharacterLength(?int $storeId = null): int
         );
     }
 
-    public function isAutocompleteRedirectEnabled(?int $storeId = null): bool
-    {
-        return $this->configInterface->isSetFlag(self::IS_AUTOCOMPLETE_REDIRECT_ENABLED, ScopeInterface::SCOPE_STORE, $storeId);
-    }
-
-    public function getAutocompleteRedirectMode(?int $storeId = null): int
-    {
-        return (int) $this->configInterface->getValue(
-            self::AUTOCOMPLETE_REDIRECT_MODE,
-            ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-    }
-
-    public function isAutocompleteRedirectInNewWindowEnabled($storeId = null): bool
-    {
-        return $this->configInterface->isSetFlag(self::AUTOCOMPLETE_OPEN_REDIRECT_IN_NEW_WINDOW, ScopeInterface::SCOPE_STORE, $storeId);
-    }
-
-
     public function isInstantRedirectEnabled(?int $storeId = null): bool
     {
         return $this->configInterface->isSetFlag(self::IS_INSTANT_REDIRECT_ENABLED, ScopeInterface::SCOPE_STORE, $storeId);

Helper/Configuration/AutocompleteHelper.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Helper\Configuration;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class AutocompleteHelper
+{
+    public const IS_AUTOCOMPLETE_REDIRECT_ENABLED = 'algoliasearch_autocomplete/redirects/enable';
+    public const AUTOCOMPLETE_REDIRECT_MODE = 'algoliasearch_autocomplete/redirects/mode';
+    public const AUTOCOMPLETE_OPEN_REDIRECT_IN_NEW_WINDOW = 'algoliasearch_autocomplete/redirects/target';
+
+    public function __construct(
+        protected ScopeConfigInterface $configInterface,
+    ) {}
+    public function isAutocompleteRedirectEnabled(?int $storeId = null): bool
+    {
+        return $this->configInterface->isSetFlag(self::IS_AUTOCOMPLETE_REDIRECT_ENABLED, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
+    public function getAutocompleteRedirectMode(?int $storeId = null): int
+    {
+        return (int) $this->configInterface->getValue(
+            self::AUTOCOMPLETE_REDIRECT_MODE,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
+
+    public function isAutocompleteRedirectInNewWindowEnabled($storeId = null): bool
+    {
+        return $this->configInterface->isSetFlag(self::AUTOCOMPLETE_OPEN_REDIRECT_IN_NEW_WINDOW, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
+}