Merge pull request #1636 from algolia/release/3.13.6

cammonro · web-flow · commit 034d187e69e9 · 2024-10-30T11:19:12.000-04:00
Release/3.13.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGE LOG
 
+## 3.13.6
+
+### Bug Fixes
+- Improve handling of insights params for URLs that already have a query string 
+- Improve query method for alternate root categories - Thank you @igorfigueiredogen
+
 ## 3.13.5
 
 ### Updates
diff --git a/Helper/Entity/CategoryHelper.php b/Helper/Entity/CategoryHelper.php
@@ -180,7 +180,7 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null)
     {
         /** @var \Magento\Store\Model\Store $store */
         $store = $this->storeManager->getStore($storeId);
-        $storeRootCategoryPath = sprintf('%d/%d', $this->getRootCategoryId(), $store->getRootCategoryId());
+        $storeRootCategoryPath = sprintf('%d/%d/', $this->getRootCategoryId(), $store->getRootCategoryId());
 
         $unserializedCategorysAttrs = $this->getAdditionalAttributes($storeId);
         $additionalAttr = array_column($unserializedCategorysAttrs, 'attribute');
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Algolia Search & Discovery extension for Magento 2
 ==================================================
 
-![Latest version](https://img.shields.io/badge/latest-3.13.5-green)
+![Latest version](https://img.shields.io/badge/latest-3.13.6-green)
 ![Magento 2](https://img.shields.io/badge/Magento-2.4.x-orange)
 
 ![PHP](https://img.shields.io/badge/PHP-8.2%2C8.1%2C7.4-blue)
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "Algolia Search & Discovery extension for Magento 2",
   "type": "magento2-module",
   "license": ["MIT"],
-  "version": "3.13.5",
+  "version": "3.13.6",
   "require": {
     "magento/framework": "~102.0|~103.0",
     "algolia/algoliasearch-client-php": "3.3.2",
diff --git a/etc/module.xml b/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.13.5">
+    <module name="Algolia_AlgoliaSearch" setup_version="3.13.6">
         <sequence>
             <module name="Magento_Theme"/>
             <module name="Magento_Backend"/>
diff --git a/view/frontend/web/autocomplete.js b/view/frontend/web/autocomplete.js
@@ -152,7 +152,7 @@ define(
                         indexName: hit.__autocomplete_indexName
                     });
                     if (hit.url.indexOf('?') > -1) {
-                        hit.urlForInsights += insightsDataUrlString
+                        hit.urlForInsights += '&' + insightsDataUrlString;
                     } else {
                         hit.urlForInsights += '?' + insightsDataUrlString;
                     }
diff --git a/view/frontend/web/internals/common.js b/view/frontend/web/internals/common.js
@@ -237,7 +237,7 @@ define(['jquery', 'algoliaBundle'], function ($, algoliaBundle) {
                     indexName: hit.__indexName
                 });
                 if (hit.url.indexOf('?') > -1) {
-                    hit.urlForInsights += insightsDataUrlString
+                    hit.urlForInsights += '&' + insightsDataUrlString;
                 } else {
                     hit.urlForInsights += '?' + insightsDataUrlString;
                 }

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null)`
`180`	`180`	`{`
`181`	`181`	`/** @var \Magento\Store\Model\Store $store */`
`182`	`182`	`$store = $this->storeManager->getStore($storeId);`
`183`		`- $storeRootCategoryPath = sprintf('%d/%d', $this->getRootCategoryId(), $store->getRootCategoryId());`
	`183`	`+ $storeRootCategoryPath = sprintf('%d/%d/', $this->getRootCategoryId(), $store->getRootCategoryId());`
`184`	`184`
`185`	`185`	`$unserializedCategorysAttrs = $this->getAdditionalAttributes($storeId);`
`186`	`186`	`$additionalAttr = array_column($unserializedCategorysAttrs, 'attribute');`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ define(`
`152`	`152`	`indexName: hit.__autocomplete_indexName`
`153`	`153`	`});`
`154`	`154`	`if (hit.url.indexOf('?') > -1) {`
`155`		`- hit.urlForInsights += insightsDataUrlString`
	`155`	`+ hit.urlForInsights += '&' + insightsDataUrlString;`
`156`	`156`	`} else {`
`157`	`157`	`hit.urlForInsights += '?' + insightsDataUrlString;`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ define(['jquery', 'algoliaBundle'], function ($, algoliaBundle) {`
`237`	`237`	`indexName: hit.__indexName`
`238`	`238`	`});`
`239`	`239`	`if (hit.url.indexOf('?') > -1) {`
`240`		`- hit.urlForInsights += insightsDataUrlString`
	`240`	`+ hit.urlForInsights += '&' + insightsDataUrlString;`
`241`	`241`	`} else {`
`242`	`242`	`hit.urlForInsights += '?' + insightsDataUrlString;`
`243`	`243`	`}`