From 44f4208cc3f74268ebace0e41ab1997fe0b063a1 Mon Sep 17 00:00:00 2001
From: Richard BAYET <richard.bayet@smile.fr>
Date: Thu, 22 Nov 2018 11:44:45 +0100
Subject: [PATCH] Fixes #1192 Homogeneous secondary sort order

of layered navigation filterable attributes
---
 .../Model/Layer/Category/FilterableAttributeList.php           | 1 +
 .../Plugin/Ui/Category/Form/DataProviderPlugin.php             | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/module-elasticsuite-catalog/Model/Layer/Category/FilterableAttributeList.php b/src/module-elasticsuite-catalog/Model/Layer/Category/FilterableAttributeList.php
index 71a4a755c..dbe5155a0 100644
--- a/src/module-elasticsuite-catalog/Model/Layer/Category/FilterableAttributeList.php
+++ b/src/module-elasticsuite-catalog/Model/Layer/Category/FilterableAttributeList.php
@@ -52,6 +52,7 @@ protected function _prepareAttributeCollection($collection)
     {
         $collection->addSetInfo(true);
         $collection->addIsFilterableFilter();
+        $collection->setOrder('attribute_id', 'ASC');
 
         $category = $this->layerResolver->get()->getCurrentCategory();
         if ($category && $category->getId()) {
diff --git a/src/module-elasticsuite-catalog/Plugin/Ui/Category/Form/DataProviderPlugin.php b/src/module-elasticsuite-catalog/Plugin/Ui/Category/Form/DataProviderPlugin.php
index 65b5f5957..93acc7513 100644
--- a/src/module-elasticsuite-catalog/Plugin/Ui/Category/Form/DataProviderPlugin.php
+++ b/src/module-elasticsuite-catalog/Plugin/Ui/Category/Form/DataProviderPlugin.php
@@ -220,7 +220,8 @@ private function getAttributes($category)
             ->setCategory($category)
             ->addIsFilterableFilter()
             ->addStoreLabel($category->getStoreId())
-            ->setOrder('position', 'ASC');
+            ->setOrder('position', 'ASC')
+            ->setOrder('attribute_id', 'ASC');
 
         $storeId = $this->getStoreId($category);