Skip to content

Commit

Permalink
Develop to Master (#1100)
Browse files Browse the repository at this point in the history
  • Loading branch information
damcou authored Oct 15, 2020
1 parent 8ac4929 commit 188ec3e
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 32 deletions.
8 changes: 8 additions & 0 deletions Block/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,14 @@ public function getConfiguration()
],
'analytics' => $config->getAnalyticsConfig(),
'now' => $this->getTimestamp(),
'queue' => [
'isEnabled' => $config->isQueueActive($this->getStoreId()),
'nbOfJobsToRun' => $config->getNumberOfJobToRun($this->getStoreId()),
'retryLimit' => $config->getRetryLimit($this->getStoreId()),
'nbOfElementsPerIndexingJob' => $config->getNumberOfElementByPage($this->getStoreId()),
],
'isPreventBackendRenderingEnabled' => $config->preventBackendRendering($this->getStoreId()),
'areOutOfStockOptionsDisplayed' => $config->indexOutOfStockOptions($this->getStoreId()),
'translations' => [
'to' => __('to'),
'or' => __('or'),
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# CHANGE LOG

## 3.0.1

### UPDATES
- Added some configuration to algoliaConfig JS object (#1097)
- Update csp for proxy and update admin bundle (#1098)

### FIXES
- Switch from mt_rand to random_int to meet marketplace expectations (#1095)
- Indexing queue grids fixes (#1096)

## 3.0.0
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.

Expand Down
2 changes: 1 addition & 1 deletion Model/Source/AbstractTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ protected function _prepareArrayRow(DataObject $row)
}

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

$row->setData('option_extra_attrs', $options);
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Algolia Search for Magento 2
==================

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

[![CircleCI](https://circleci.com/gh/algolia/algoliasearch-magento-2/tree/master.svg?style=svg)](https://circleci.com/gh/algolia/algoliasearch-magento-2/tree/master)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Algolia Search integration for Magento 2",
"type": "magento2-module",
"license": ["MIT"],
"version": "3.0.0",
"version": "3.0.1",
"require": {
"magento/framework": "~102.0|~103.0",
"algolia/algoliasearch-client-php": "^2.4",
Expand Down
6 changes: 6 additions & 0 deletions etc/csp_whitelist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,11 @@
<value id="algolia" type="host">*.algolia.net</value>
</values>
</policy>
<policy id="connect-src">
<values>
<value id="algolia-api" type="host">*.algolia.net</value>
<value id="algolia" type="host">*.algolia.com</value>
</values>
</policy>
</policies>
</csp_whitelist>
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -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.0.0">
<module name="Algolia_AlgoliaSearch" setup_version="3.0.1">
<sequence>
<module name="Magento_Theme"/>
<module name="Magento_Backend"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@
</listingToolbar>

<columns name="algolia_algoliasearch_log_columns">
<selectionsColumn name="ids">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="resizeEnabled" xsi:type="boolean">false</item>
<item name="resizeDefaultWidth" xsi:type="string">55</item>
<item name="indexField" xsi:type="string">id</item>
</item>
</argument>
</selectionsColumn>
<column name="id">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
Expand Down Expand Up @@ -114,4 +123,4 @@
</argument>
</column>
</columns>
</listing>
</listing>
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
<argument name="data" xsi:type="array">
<item name="options" xsi:type="object">Algolia\AlgoliaSearch\Model\Source\JobStatuses</item>
<item name="config" xsi:type="array">
<item name="filter" xsi:type="string">select</item>
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
<item name="dataType" xsi:type="string">select</item>
<item name="editor" xsi:type="string">select</item>
Expand Down Expand Up @@ -161,4 +160,4 @@
</argument>
</actionsColumn>
</columns>
</listing>
</listing>
45 changes: 21 additions & 24 deletions view/adminhtml/web/algoliaAdminBundle.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion view/adminhtml/web/algoliaAdminBundle.min.js.map

Large diffs are not rendered by default.

0 comments on commit 188ec3e

Please sign in to comment.