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

Author: cammonro

Block/Algolia.php

@@ -5,6 +5,7 @@
 use Algolia\AlgoliaSearch\Helper\AlgoliaHelper;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Helper\Configuration\AutocompleteHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\InstantSearchHelper;
 use Algolia\AlgoliaSearch\Helper\Configuration\PersonalizationHelper;
 use Algolia\AlgoliaSearch\Helper\Data as CoreHelper;
 use Algolia\AlgoliaSearch\Helper\Entity\CategoryHelper;
@@ -42,6 +43,7 @@ class Algolia extends Template implements CollectionDataSourceInterface
     public function __construct(
         protected ConfigHelper          $config,
         protected AutocompleteHelper    $autocompleteConfig,
+        protected InstantSearchHelper   $instantSearchConfig,
         protected PersonalizationHelper $personalizationHelper,
         protected CatalogSearchHelper   $catalogSearchHelper,
         protected ProductHelper         $productHelper,

Block/Configuration.php

@@ -202,11 +202,11 @@ public function getConfiguration()
                 'hidePagination' => $config->hidePaginationInInstantSearchPage(),
                 'isDynamicFacetsEnabled' => $config->isDynamicFacetsEnabled(),
                 'redirects' => [
-                    'enabled' => $config->isInstantRedirectEnabled(),
-                    'onPageLoad' => in_array(InstantSearchRedirectOptions::REDIRECT_ON_PAGE_LOAD, $config->getInstantRedirectOptions()),
-                    'onSearchAsYouType' => in_array(InstantSearchRedirectOptions::REDIRECT_ON_SEARCH_AS_YOU_TYPE, $config->getInstantRedirectOptions()),
-                    'showSelectableRedirect' => in_array(InstantSearchRedirectOptions::SELECTABLE_REDIRECT, $config->getInstantRedirectOptions()),
-                    'openInNewWindow' => in_array(InstantSearchRedirectOptions::OPEN_IN_NEW_WINDOW, $config->getInstantRedirectOptions())
+                    'enabled'                => $this->instantSearchConfig->isInstantRedirectEnabled(),
+                    'onPageLoad'             => in_array(InstantSearchRedirectOptions::REDIRECT_ON_PAGE_LOAD, $this->instantSearchConfig->getInstantRedirectOptions()),
+                    'onSearchAsYouType'      => in_array(InstantSearchRedirectOptions::REDIRECT_ON_SEARCH_AS_YOU_TYPE, $this->instantSearchConfig->getInstantRedirectOptions()),
+                    'showSelectableRedirect' => in_array(InstantSearchRedirectOptions::SELECTABLE_REDIRECT, $this->instantSearchConfig->getInstantRedirectOptions()),
+                    'openInNewWindow'        => in_array(InstantSearchRedirectOptions::OPEN_IN_NEW_WINDOW, $this->instantSearchConfig->getInstantRedirectOptions())
                 ]
             ],
             'autocomplete' => [

Helper/ConfigHelper.php

@@ -47,9 +47,6 @@ class ConfigHelper
     public const INFINITE_SCROLL_ENABLE = 'algoliasearch_instant/instant_options/infinite_scroll_enable';
     public const HIDE_PAGINATION = 'algoliasearch_instant/instant_options/hide_pagination';
 
-    public const IS_INSTANT_REDIRECT_ENABLED = 'algoliasearch_instant/instant_redirects/enable';
-    public const INSTANT_REDIRECT_OPTIONS = 'algoliasearch_instant/instant_redirects/options';
-
     public const IS_POPUP_ENABLED = 'algoliasearch_autocomplete/autocomplete/is_popup_enabled';
     public const NB_OF_PRODUCTS_SUGGESTIONS = 'algoliasearch_autocomplete/autocomplete/nb_of_products_suggestions';
     public const NB_OF_CATEGORIES_SUGGESTIONS = 'algoliasearch_autocomplete/autocomplete/nb_of_categories_suggestions';
@@ -1063,21 +1060,6 @@ public function getAutocompleteMinimumCharacterLength(?int $storeId = null): int
         );
     }
 
-    public function isInstantRedirectEnabled(?int $storeId = null): bool
-    {
-        return $this->configInterface->isSetFlag(self::IS_INSTANT_REDIRECT_ENABLED, ScopeInterface::SCOPE_STORE, $storeId);
-    }
-
-    public function getInstantRedirectOptions(?int $storeId = null): array
-    {
-        $value = $this->configInterface->getValue(
-            self::INSTANT_REDIRECT_OPTIONS,
-            ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-        return empty($value) ? [] : explode(',', $value);
-    }
-
     /**
      * @param $originalIndexName
      * @param $storeId

Helper/Configuration/InstantSearchHelper.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Helper\Configuration;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class InstantSearchHelper
+{
+    public const IS_INSTANT_REDIRECT_ENABLED = 'algoliasearch_instant/instant_redirects/enable';
+    public const INSTANT_REDIRECT_OPTIONS = 'algoliasearch_instant/instant_redirects/options';
+
+    public function __construct(
+        protected ScopeConfigInterface $configInterface,
+    ) {}
+
+    public function isInstantRedirectEnabled(?int $storeId = null): bool
+    {
+        return $this->configInterface->isSetFlag(self::IS_INSTANT_REDIRECT_ENABLED, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
+    public function getInstantRedirectOptions(?int $storeId = null): array
+    {
+        $value = $this->configInterface->getValue(
+            self::INSTANT_REDIRECT_OPTIONS,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        return empty($value) ? [] : explode(',', $value);
+    }
+}