Skip to content

Commit 188ec3e

Browse files
damcoudamcou
authored
Develop to Master (#1100)
1 parent 8ac4929 commit 188ec3e

11 files changed

+61
-32
lines changed

‎Block/Configuration.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,14 @@ public function getConfiguration()
243243
],
244244
'analytics' => $config->getAnalyticsConfig(),
245245
'now' => $this->getTimestamp(),
246+
'queue' => [
247+
'isEnabled' => $config->isQueueActive($this->getStoreId()),
248+
'nbOfJobsToRun' => $config->getNumberOfJobToRun($this->getStoreId()),
249+
'retryLimit' => $config->getRetryLimit($this->getStoreId()),
250+
'nbOfElementsPerIndexingJob' => $config->getNumberOfElementByPage($this->getStoreId()),
251+
],
252+
'isPreventBackendRenderingEnabled' => $config->preventBackendRendering($this->getStoreId()),
253+
'areOutOfStockOptionsDisplayed' => $config->indexOutOfStockOptions($this->getStoreId()),
246254
'translations' => [
247255
'to' => __('to'),
248256
'or' => __('or'),

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# CHANGE LOG
22

3+
## 3.0.1
4+
5+
### UPDATES
6+
- Added some configuration to algoliaConfig JS object (#1097)
7+
- Update csp for proxy and update admin bundle (#1098)
8+
9+
### FIXES
10+
- Switch from mt_rand to random_int to meet marketplace expectations (#1095)
11+
- Indexing queue grids fixes (#1096)
12+
313
## 3.0.0
414
This update will **break compatibility** if you're using the backend facets feature. Please read the [Magento 2.4 section](https://www.algolia.com/doc/integration/magento-2/getting-started/quick-start/#magento-24-compatibility) of our documentation to get more information about it.
515

‎Model/Source/AbstractTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected function _prepareArrayRow(DataObject $row)
106106
}
107107

108108
if ($row['_id'] === null || is_int($row['_id'])) {
109-
$row->setData('_id', '_' . mt_rand() . '_' . mt_rand(0, 999));
109+
$row->setData('_id', '_' . random_int(1000000000, 9999999999) . '_' . random_int(0, 999));
110110
}
111111

112112
$row->setData('option_extra_attrs', $options);

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Algolia Search for Magento 2
22
==================
33

4-
![Latest version](https://img.shields.io/badge/latest-3.0.0-green.svg)
4+
![Latest version](https://img.shields.io/badge/latest-3.0.1-green.svg)
55
![Magento 2](https://img.shields.io/badge/Magento-%32.3,%202.4-blue.svg)
66

77
[![CircleCI](https://circleci.com/gh/algolia/algoliasearch-magento-2/tree/master.svg?style=svg)](https://circleci.com/gh/algolia/algoliasearch-magento-2/tree/master)

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Algolia Search integration for Magento 2",
44
"type": "magento2-module",
55
"license": ["MIT"],
6-
"version": "3.0.0",
6+
"version": "3.0.1",
77
"require": {
88
"magento/framework": "~102.0|~103.0",
99
"algolia/algoliasearch-client-php": "^2.4",

‎etc/csp_whitelist.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
<value id="algolia" type="host">*.algolia.net</value>
1313
</values>
1414
</policy>
15+
<policy id="connect-src">
16+
<values>
17+
<value id="algolia-api" type="host">*.algolia.net</value>
18+
<value id="algolia" type="host">*.algolia.com</value>
19+
</values>
20+
</policy>
1521
</policies>
1622
</csp_whitelist>

‎etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
3-
<module name="Algolia_AlgoliaSearch" setup_version="3.0.0">
3+
<module name="Algolia_AlgoliaSearch" setup_version="3.0.1">
44
<sequence>
55
<module name="Magento_Theme"/>
66
<module name="Magento_Backend"/>

‎view/adminhtml/ui_component/algolia_algoliasearch_indexing_log_listing.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,15 @@
6161
</listingToolbar>
6262

6363
<columns name="algolia_algoliasearch_log_columns">
64+
<selectionsColumn name="ids">
65+
<argument name="data" xsi:type="array">
66+
<item name="config" xsi:type="array">
67+
<item name="resizeEnabled" xsi:type="boolean">false</item>
68+
<item name="resizeDefaultWidth" xsi:type="string">55</item>
69+
<item name="indexField" xsi:type="string">id</item>
70+
</item>
71+
</argument>
72+
</selectionsColumn>
6473
<column name="id">
6574
<argument name="data" xsi:type="array">
6675
<item name="config" xsi:type="array">
@@ -114,4 +123,4 @@
114123
</argument>
115124
</column>
116125
</columns>
117-
</listing>
126+
</listing>

‎view/adminhtml/ui_component/algolia_algoliasearch_indexing_queue_listing.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
<argument name="data" xsi:type="array">
100100
<item name="options" xsi:type="object">Algolia\AlgoliaSearch\Model\Source\JobStatuses</item>
101101
<item name="config" xsi:type="array">
102-
<item name="filter" xsi:type="string">select</item>
103102
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
104103
<item name="dataType" xsi:type="string">select</item>
105104
<item name="editor" xsi:type="string">select</item>
@@ -161,4 +160,4 @@
161160
</argument>
162161
</actionsColumn>
163162
</columns>
164-
</listing>
163+
</listing>

‎view/adminhtml/web/algoliaAdminBundle.min.js

Lines changed: 21 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)