Release 3.2.0

.travis.yml

@@ -24,47 +24,53 @@ jobs:
         - composer run test
         # PHP Stan
         - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:nightly
-        - docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/web/module/tests/php/phpstan/phpstan.neon
+        - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_facetedsearch
+        - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_facetedsearch -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_facetedsearch/tests/php/phpstan/phpstan.neon
     - stage: "PHP"
       name: "PHPStan on PS 1.7.5.2"
       language: php
       php: 7.2
       script:
         - composer install
         - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.5.1
-        - docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/web/module/tests/php/phpstan/phpstan.neon
+        - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_facetedsearch
+        - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_facetedsearch -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_facetedsearch/tests/php/phpstan/phpstan.neon
     - stage: "PHP"
       name: "PHPStan on PS 1.7.4.4"
       language: php
       php: 7.2
       script:
         - composer install
         - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.4.4
-        - docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/web/module/tests/php/phpstan/phpstan.neon
+        - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_facetedsearch
+        - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_facetedsearch -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_facetedsearch/tests/php/phpstan/phpstan.neon
     - stage: "PHP"
       name: "PHPStan on PS 1.7.3.4"
       language: php
       php: 7.2
       script:
         - composer install
         - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.3.4
-        - docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/web/module/tests/php/phpstan/phpstan.neon
+        - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_facetedsearch
+        - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_facetedsearch -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_facetedsearch/tests/php/phpstan/phpstan.neon
     - stage: "PHP"
       name: "PHPStan on PS 1.7.2.5"
       language: php
       php: 7.2
       script:
         - composer install
         - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.2.5
-        - docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/web/module/tests/php/phpstan/phpstan.neon
+        - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_facetedsearch
+        - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_facetedsearch -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_facetedsearch/tests/php/phpstan/phpstan.neon
     - stage: "PHP"
       name: "PHPStan on PS 1.7.1.2"
       language: php
       php: 7.2
       script:
         - composer install
         - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.1.2
-        - docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/web/module/tests/php/phpstan/phpstan.neon
+        - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_facetedsearch
+        - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_facetedsearch -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_facetedsearch/tests/php/phpstan/phpstan.neon
 
 script:
   - npm run lint

_dev/cldr/number-formatter.js

@@ -30,6 +30,8 @@ import NumberSymbol from './number-symbol';
 import PriceSpecification from './specifications/price';
 import NumberSpecification from './specifications/number';
 
+const escapeRE = require('lodash.escaperegexp');
+
 const CURRENCY_SYMBOL_PLACEHOLDER = '¤';
 const DECIMAL_SEPARATOR_PLACEHOLDER = '.';
 const GROUP_SEPARATOR_PLACEHOLDER = ',';
@@ -199,16 +201,29 @@ class NumberFormatter {
    */
   replaceSymbols(number) {
     const symbols = this.numberSpecification.getSymbol();
-    let num = number;
-    num = num.split(DECIMAL_SEPARATOR_PLACEHOLDER).join(symbols.getDecimal());
-    num = num.split(GROUP_SEPARATOR_PLACEHOLDER).join(symbols.getGroup());
-    num = num.split(MINUS_SIGN_PLACEHOLDER).join(symbols.getMinusSign());
-    num = num.split(PERCENT_SYMBOL_PLACEHOLDER).join(symbols.getPercentSign());
-    num = num.split(PLUS_SIGN_PLACEHOLDER).join(symbols.getPlusSign());
-
-    return num;
+
+    const map = {};
+    map[DECIMAL_SEPARATOR_PLACEHOLDER] = symbols.getDecimal();
+    map[GROUP_SEPARATOR_PLACEHOLDER] = symbols.getGroup();
+    map[MINUS_SIGN_PLACEHOLDER] = symbols.getMinusSign();
+    map[PERCENT_SYMBOL_PLACEHOLDER] = symbols.getPercentSign();
+    map[PLUS_SIGN_PLACEHOLDER] = symbols.getPlusSign();
+
+    return this.strtr(number, map);
+  }
+
+  /**
+   * strtr() for JavaScript
+   * Translate characters or replace substrings
+   */
+  strtr(str, pairs) {
+    const substrs = Object.keys(pairs).map(escapeRE);
+    return str.split(RegExp(`(${substrs.join('|')})`))
+      .map(part => pairs[part] || part)
+      .join('');
   }
 
+
   /**
    * Add missing placeholders to the number using the passed CLDR pattern.
    *

_dev/front/facet.scss

@@ -31,6 +31,13 @@
 
 #search_filters {
   .facet {
+    .title {
+      display: flex;
+      .collapse-icons {
+        margin-left: auto;
+      }
+    }
+
     .facet-title {
       @include text-ellipsis();
     }

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_facetedsearch</name>
     <displayName><![CDATA[Faceted search]]></displayName>
-    <version><![CDATA[3.1.0]]></version>
+    <version><![CDATA[3.2.0]]></version>
     <description><![CDATA[Displays a block allowing multiple filters.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

package.json

@@ -52,6 +52,7 @@
     "webpack-cli": "^3.2.3"
   },
   "dependencies": {
-    "jquery-ui-touch-punch": "^0.2.3"
+    "jquery-ui-touch-punch": "^0.2.3",
+    "lodash.escaperegexp": "^4.1.2"
   }
 }

ps_facetedsearch.php

@@ -90,7 +90,7 @@ public function __construct()
     {
         $this->name = 'ps_facetedsearch';
         $this->tab = 'front_office_features';
-        $this->version = '3.1.0';
+        $this->version = '3.2.0';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
         $this->bootstrap = true;
@@ -1404,9 +1404,7 @@ private function indexPrices($cursor = 0, $full = false, $ajax = false, $smart =
                     ? Tools::getShopDomainSsl(true)
                     : Tools::getShopDomain(true);
 
-            if (!Tools::file_get_contents($domain . __PS_BASE_URI__ . 'modules/ps_facetedsearch/ps_facetedsearch-price-indexer.php?token=' . $token . '&cursor=' . (int) $cursor . '&full=' . (int) $full)) {
-                $this->indexPrices((int) $cursor, (int) $full);
-            }
+            $this->indexPrices((int) $cursor, (int) $full);
 
             return $cursor;
         }

src/Adapter/AbstractAdapter.php

@@ -72,6 +72,7 @@ public function __construct()
     public function __clone()
     {
         $this->filters = clone $this->filters;
+        $this->operationsFilters = clone $this->operationsFilters;
     }
 
     /**
@@ -97,10 +98,27 @@ public function resetFilter($filterName)
     /**
      * {@inheritdoc}
      */
-    public function resetOperationsFilter($filterName)
+    public function resetOperationsFilter($filterName, $value = null)
     {
-        if ($this->operationsFilters->offsetExists($filterName)) {
+        if (!$this->operationsFilters->offsetExists($filterName)) {
+            return $this;
+        }
+
+        if ($value === null) {
             $this->operationsFilters->offsetUnset($filterName);
+
+            return $this;
+        }
+
+        $operations = $this->operationsFilters->offsetGet($filterName);
+        if (isset($operations[$value])) {
+            unset($operations[$value]);
+        }
+
+        if (empty($operations)) {
+            $this->resetOperationsFilter($filterName);
+        } else {
+            $this->addOperationsFilter($filterName, $operations);
         }
 
         return $this;

src/Adapter/InterfaceAdapter.php

@@ -201,12 +201,14 @@ public function resetOperationsFilters();
 
     /**
      * Reset the operations filter for the given filterName
+     * or reset the operations filter with a specific value
      *
      * @param string $filterName
+     * @param string|int $value
      *
      * @return self
      */
-    public function resetOperationsFilter($filterName);
+    public function resetOperationsFilter($filterName, $value = null);
 
     /**
      * Reset the filter for the given filterName

src/Adapter/MySQL.php

@@ -420,7 +420,9 @@ private function computeWhereConditions(array $filterToTableMapping)
                 $operationsConditions[] = '(' . implode(' AND ', $conditions) . ')';
             }
 
-            $whereConditions[] = '(' . implode(' OR ', $operationsConditions) . ')';
+            if (!empty($operationsConditions)) {
+                $whereConditions[] = '(' . implode(' OR ', $operationsConditions) . ')';
+            }
         }
 
         foreach ($this->getFilters() as $filterName => $filterContent) {