From f9fa25f75c14aa96a742afad98758902d712aff0 Mon Sep 17 00:00:00 2001
From: Stephen Cameron <stephen@cubedesigners.com>
Date: Tue, 10 Sep 2019 19:00:33 +0200
Subject: [PATCH] Done #3024 @1.5

---
 app/Models/Product.php                      |  9 +++++++--
 resources/js/components/ProductsFilters.vue | 19 +++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/Models/Product.php b/app/Models/Product.php
index 2ff9657..4e262af 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -400,7 +400,12 @@ class Product extends CubistMagicPageModel
 
         $all_matches = [];
 
-        $filters = Specification::whereIn('id', $specifications)->get();
+        // Ensure that filters are returned in the order they are defined in the backend
+        // Ref: https://stackoverflow.com/a/26704767
+        $spec_IDs_ordered = implode(',', $specifications);
+        $filters = Specification::whereIn('id', $specifications)
+            ->orderByRaw("FIELD(id, $spec_IDs_ordered)")
+            ->get();
         $res['filters'] = [];
         foreach ($filters as $filter) {
 
@@ -513,7 +518,7 @@ class Product extends CubistMagicPageModel
             $f['matching'] = ['count' => count($matching), 'hits' => $matching];
             $all_matches[] = $matching;
 
-            $res['filters'][$data->id] = $f;
+            $res['filters'][] = $f;
         }
 
         if (!count($all_matches)) {
diff --git a/resources/js/components/ProductsFilters.vue b/resources/js/components/ProductsFilters.vue
index 437a161..9663d6f 100644
--- a/resources/js/components/ProductsFilters.vue
+++ b/resources/js/components/ProductsFilters.vue
@@ -7,7 +7,7 @@
 
             <!-- Filters panel -->
             <div class="bg-white p-4">
-                <div class="products-filters" v-for="(filter, key, index) in filterData" :key="key">
+                <div class="products-filters" v-for="(filter, index) in filterData" :key="index">
 
                     <hr class="h-px bg-grey-250 my-4" v-if="index !== 0" />
 
@@ -64,9 +64,9 @@
                         <template v-for="(filter, filterID) in filters">
 
                             <li class="bg-white whitespace-no-wrap py-2 px-4 rounded-full mr-3 mb-3 hover:bg-grey-200"
-                                v-for="filter_option in filter" v-if="filterData[filterID].options">
+                                v-for="filter_option in filter" v-if="getFilter(filterID).options">
 
-                                {{ filterData[filterID].options[filter_option].label }}
+                                {{ getFilter(filterID).options[filter_option].label }}
 
                                 <svg class="svg inline-block ml-3 cursor-pointer" @click="removeFilter(filterID, filter_option)"
                                      xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
@@ -148,10 +148,12 @@
 
                 Object.keys(this.filters).forEach(filterID => {
 
+                    let filter = this.getFilter(filterID);
+
                     // Don't include range values if they're unchanged (at min / max values)
-                    if (this.filterData[filterID].type === 'range'
-                        && this.filterData[filterID].min === this.filters[filterID][0]
-                        && this.filterData[filterID].max === this.filters[filterID][1]) {
+                    if (filter.type === 'range'
+                        && filter.min === this.filters[filterID][0]
+                        && filter.max === this.filters[filterID][1]) {
                         return;
                     }
 
@@ -182,6 +184,11 @@
 
         methods: {
 
+            getFilter(id) {
+                // Find the filter by its ID in the array of filters
+                return this.filterData.find(filter => filter.id === parseInt(id)) || {};
+            },
+
             updateFilters() {
                 let $this = this;
                 let endpoint = `/ajax/filtercatalog/?productType=${this.productType}&${this.filterQuerystring}`;
-- 
2.39.5