Merge remote-tracking branch 'origin/release/3.13.4' into release/3.14.0-beta

Author: mrahman3177

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGE LOG
 
+## 3.13.4
+
+### Bug Fixes
+- Fixed XSS vulnerability issue in InstantSearch search box
+- Fixed Algolia merchandising product listing issue
+- Fixed lock timeout issue on indexing queue integration test
+- Community fix added - job queue dropping jobs from sandwiched full reindexes - thank you @pikulsky
+
+
 ## 3.13.3
 
 ### Updates

README.md

@@ -1,7 +1,7 @@
 Algolia Search & Discovery extension for Magento 2
 ==================================================
 
-![Latest version](https://img.shields.io/badge/latest-3.13.3-green)
+![Latest version](https://img.shields.io/badge/latest-3.13.4-green)
 ![Magento 2](https://img.shields.io/badge/Magento-2.4.x-orange)
 
 ![PHP](https://img.shields.io/badge/PHP-8.1%2C8.2%2C8.3-blue)

Test/Integration/QueueTest.php

@@ -30,9 +30,9 @@ public function setUp(): void
 
         $this->jobsCollectionFactory = $this->getObjectManager()->create(JobsCollectionFactory::class);
 
-        /** @var ResourceConnection $resouce */
-        $resouce = $this->getObjectManager()->create(ResourceConnection::class);
-        $this->connection = $resouce->getConnection();
+        /** @var ResourceConnection $resource */
+        $resource = $this->getObjectManager()->create(ResourceConnection::class);
+        $this->connection = $resource->getConnection();
 
         $this->queue = $this->getObjectManager()->create(Queue::class);
     }
@@ -135,6 +135,9 @@ public function testExecute()
         $this->assertEquals(0, count($rows)); */
     }
 
+    /**
+     * @magentoDbIsolation disabled
+     */
     public function testSettings()
     {
         $this->markTestIncomplete(self::INCOMPLETE_REASON);
@@ -810,7 +813,7 @@ public function testHugeJob()
     {
         // Default value - maxBatchSize = 1000
         $this->setConfig('algoliasearch_queue/queue/number_of_job_to_run', 10);
-        $this->setConfig('algoliasearch_advanced/advanced/number_of_element_by_page', 100);
+        $this->setConfig('algoliasearch_advanced/queue/number_of_element_by_page', 100);
 
         $productIds = range(1, 5000);
         $jsonProductIds = json_encode($productIds);

etc/adminhtml/system.xml

@@ -1208,7 +1208,7 @@
                     <comment>
                         <![CDATA[
                             Do you want to use <code>partialUpdateObjects</code> instead of <code>addObjects</code>?<br>
-                            You should enable this option if you want to update only some attributes of your records from an external source without avoiding overriding Magento data.
+                            You should enable this option if you want to update only some attributes of your records from an external source without overriding Magento data.
                         ]]>
                     </comment>
                 </field>