Merge branch 'develop' into update/MAGE-556

Author: mohitalgolia

Block/Configuration.php

@@ -309,6 +309,7 @@ public function getConfiguration()
                 'relevance' => __('Relevance'),
                 'categories' => __('Categories'),
                 'products' => __('Products'),
+                'suggestions' => __('Suggestions'),
                 'searchBy' => __('Search by'),
                 'searchForFacetValuesPlaceholder' => __('Search for other ...'),
                 'showMore' => __('Show more products'),

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGE LOG
 
+## 3.10.1
+
+### FIXES
+- Add caching on category name lookup (scoped by store) to fix sloness in indexing.
+- Preserve synonyms on tmp index copy after deprecated from the Magento.
 
 ## 3.10.0
 

Helper/Entity/CategoryHelper.php

@@ -50,6 +50,7 @@ class CategoryHelper
     protected $categoryRepository;
 
     protected $isCategoryVisibleInMenuCache;
+    protected $coreCategories;
     protected $idColumn;
     protected $categoryAttributes;
     protected $rootCategoryId = -1;
@@ -548,7 +549,12 @@ public function isCategoryVisibleInMenu($categoryId, $storeId)
      */
     public function getCoreCategories($filterNotIncludedCategories = true, $storeId = null)
     {
-        $key = $filterNotIncludedCategories ? 'filtered' : 'non_filtered';
+        // Cache category look up by store scope
+        $key = ($filterNotIncludedCategories ? 'filtered' : 'non_filtered') . "-$storeId";
+
+        if (isset($this->coreCategories[$key])) {
+            return $this->coreCategories[$key];
+        }
 
         $collection = $this->categoryCollectionFactory->create()
             ->distinct(true)
@@ -562,14 +568,14 @@ public function getCoreCategories($filterNotIncludedCategories = true, $storeId
             $collection->addAttributeToFilter('include_in_menu', '1');
         }
 
-        $coreCategories[$key] = [];
+        $this->coreCategories[$key] = [];
 
         /** @var \Magento\Catalog\Model\Category $category */
         foreach ($collection as $category) {
-                $coreCategories[$key][$category->getId()] = $category;
+                $this->coreCategories[$key][$category->getId()] = $category;
         }
 
-        return $coreCategories[$key];
+        return $this->coreCategories[$key];
     }
 
     /**

Helper/Entity/ProductHelper.php

@@ -485,8 +485,8 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
             } else {
                 foreach ($sortingIndices as $values) {
                     $replicaName = $values['name'];
-                    array_unshift($customRanking,$values['ranking'][0]); 
-                    $replicaSetting['customRanking'] = $customRanking;   
+                    array_unshift($customRanking,$values['ranking'][0]);
+                    $replicaSetting['customRanking'] = $customRanking;
                     $this->algoliaHelper->setSettings($replicaName, $replicaSetting, false, false);
                     $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
                     $this->logger->log('Settings: ' . json_encode($replicaSetting));
@@ -502,6 +502,15 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
         // $this->deleteUnusedReplicas($indexName, $replicas, $setReplicasTaskId);
 
         if ($saveToTmpIndicesToo === true) {
+            try {
+                $this->algoliaHelper->copySynonyms($indexName, $indexNameTmp);
+                $this->logger->log('
+                    Copying synonyms from production index to TMP one to not to erase them with the index move.
+                ');
+            } catch (AlgoliaException $e) {
+                $this->logger->error('Error encountered while copying synonyms: ' . $e->getMessage());
+            }
+
             try {
                 $this->algoliaHelper->copyQueryRules($indexName, $indexNameTmp);
                 $this->logger->log('

README.md

@@ -1,7 +1,7 @@
 Algolia Search for Magento 2
 ==================
 
-![Latest version](https://img.shields.io/badge/latest-3.10.0-green)
+![Latest version](https://img.shields.io/badge/latest-3.10.1-green)
 ![Magento 2](https://img.shields.io/badge/Magento-2.4.x-orange)
 
 ![PHP](https://img.shields.io/badge/PHP-8.1,7.4-blue)

composer.json

@@ -3,7 +3,7 @@
   "description": "Algolia Search integration for Magento 2",
   "type": "magento2-module",
   "license": ["MIT"],
-  "version": "3.10.0",
+  "version": "3.10.1",
   "require": {
     "magento/framework": "~102.0|~103.0",
     "algolia/algoliasearch-client-php": "3.2",

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Algolia_AlgoliaSearch" setup_version="3.10.0">
+    <module name="Algolia_AlgoliaSearch" setup_version="3.10.1">
         <sequence>
             <module name="Magento_Theme"/>
             <module name="Magento_Backend"/>

view/frontend/web/autocomplete.js

@@ -327,7 +327,7 @@ define(
         }
 
         if (algoliaConfig.autocomplete.nbOfQueriesSuggestions > 0) {
-            algoliaConfig.autocomplete.sections.unshift({ hitsPerPage: algoliaConfig.autocomplete.nbOfQueriesSuggestions, label: '', name: "suggestions"});
+            algoliaConfig.autocomplete.sections.unshift({ hitsPerPage: algoliaConfig.autocomplete.nbOfQueriesSuggestions, label: algoliaConfig.translations.suggestions, name: "suggestions"});
         }
 
         /**

view/frontend/web/internals/template/autocomplete/additional-section.js

@@ -1,7 +1,7 @@
 define([], function () {
     return {
         getNoResultHtml: function ({html}) {
-            return html`<p>No Results</p>`;
+            return html`<p>${algoliaConfig.translations.noResults}</p>`;
         },
 
         getHeaderHtml: function ({section}) {

view/frontend/web/internals/template/autocomplete/categories.js

@@ -1,11 +1,11 @@
 define([], function () {
     return {
         getNoResultHtml: function ({html}) {
-            return html`<p>No Results</p>`;
+            return html`<p>${algoliaConfig.translations.noResults}</p>`;
         },
 
         getHeaderHtml: function ({section}) {
-            return section.name;
+            return section.label;
         },
 
         getItemHtml: function ({item, components, html}) {