Merge pull request #1459 from algolia/update/MAGE-804

MAGE-804 Added configuration for analytics region

Author: mohitalgolia

Helper/AnalyticsHelper.php

@@ -51,11 +51,11 @@ class AnalyticsHelper
     private $analyticsConfig;
 
     /**
-     * Can be changed through DI
+     * Region can be modified via the Magento configuration
      *
      * @var string
      */
-    private $region;
+    protected $region;
 
     /**
      * @param AlgoliaHelper $algoliaHelper
@@ -77,7 +77,7 @@ public function __construct(
         $this->entityHelper = $entityHelper;
 
         $this->logger = $logger;
-        $this->region = $region;
+        $this->region = $this->configHelper->getAnalyticsRegion();
     }
 
     private function setupAnalyticsClient()
@@ -86,6 +86,7 @@ private function setupAnalyticsClient()
             return;
         }
 
+
         $this->analyticsClient = AnalyticsClient::create(
             $this->configHelper->getApplicationID(),
             $this->configHelper->getAPIKey(),

Helper/ConfigHelper.php

@@ -100,6 +100,7 @@ class ConfigHelper
         'algoliasearch_advanced/advanced/backend_rendering_allowed_user_agents';
     public const NON_CASTABLE_ATTRIBUTES = 'algoliasearch_advanced/advanced/non_castable_attributes';
     public const MAX_RECORD_SIZE_LIMIT = 'algoliasearch_advanced/advanced/max_record_size_limit';
+    public const ANALYTICS_REGION = 'algoliasearch_advanced/advanced/analytics_region';
     public const CONNECTION_TIMEOUT = 'algoliasearch_advanced/advanced/connection_timeout';
     public const READ_TIMEOUT = 'algoliasearch_advanced/advanced/read_timeout';
     public const WRITE_TIMEOUT = 'algoliasearch_advanced/advanced/write_timeout';
@@ -1715,6 +1716,19 @@ public function getMaxRecordSizeLimit($storeId = null)
         );
     }
 
+    /**
+     * @param $storeId
+     * @return string
+     */
+    public function getAnalyticsRegion($storeId = null)
+    {
+        return $this->configInterface->getValue(
+            self::ANALYTICS_REGION,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
+
     /**
      * @param $storeId
      * @return bool

Model/Source/AnalyticsRegion.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Model\Source;
+
+use Magento\Framework\Option\ArrayInterface;
+
+class AnalyticsRegion implements ArrayInterface
+{
+    public function toOptionArray()
+    {
+        return [
+            ['value' => 'us', 'label' => __('United States')],
+            ['value' => 'de', 'label' => __('Europe (Germany)')],
+        ];
+    }
+}

etc/adminhtml/system.xml

@@ -111,13 +111,13 @@
                 </field>
             </group>
             <group id="algolia_cookie_configuration" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Algolia Cookie Configuration</label>    
+                <label>Algolia Cookie Configuration</label>
                 <attribute type="expanded">1</attribute>
                 <comment>
                     <![CDATA[
                          If your Magento cookie settings, specifically <b>General > Web > Default Cookie Settings > Cookie Restriction Mode</b> is set to "No," we will consider it as Implicit Cookie Consent. In this case, the useCookie will be set to True by default for all insight events. Conversely, if <b>Cookie Restriction Mode is set to 'Yes,'</b> Insight events will not be allowed without explicit cookie consent.
                         ]]>
-                </comment>    
+                </comment>
                 <field id="default_consent_cookie_name" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Consent Cookie Name</label>
                     <comment>
@@ -1170,7 +1170,7 @@
                 <field id="customer_groups_enable" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Customer Groups</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <backend_model>Algolia\AlgoliaSearch\Model\Backend\Replica</backend_model>    
+                    <backend_model>Algolia\AlgoliaSearch\Model\Backend\Replica</backend_model>
                     <comment>
                         <![CDATA[
                             Do you want to take into account customer groups and display the price of the logged-in group instead of the default price?
@@ -1259,6 +1259,10 @@
                             If your Algolia plan allows a higher record size limit, you can customize the record size limit.]]>
                     </comment>
                 </field>
+                <field id="analytics_region" translate="label comment" type="select" sortOrder="96" showInDefault="1">
+                    <label>Analytics Region</label>
+                    <source_model>Algolia\AlgoliaSearch\Model\Source\AnalyticsRegion</source_model>
+                </field>  
                 <field id="connection_timeout" translate="label comment" type="text" sortOrder="100" showInDefault="1">
                     <label>Connection Timeout (In Seconds)</label>
                 </field>

etc/config.xml

@@ -81,6 +81,7 @@
         <algoliasearch_advanced>
             <advanced>
                 <max_record_size_limit>10000</max_record_size_limit>
+                <analytics_region>us</analytics_region>
                 <connection_timeout>2</connection_timeout>
                 <read_timeout>30</read_timeout>
                 <write_timeout>30</write_timeout>