Merge branch 'develop' into feature/#2458-filters-adjustment

Author: patzick

core/compatibility/components/blocks/Category/Sidebar.js

@@ -33,13 +33,15 @@ export default {
       return [...filters].sort((a, b) => { return a.id - b.id })
     },
     resetAllFilters () {
-      this.$bus.$emit('filter-reset')
-      this.$store.dispatch('category/resetFilters')
-      this.$store.dispatch('category/searchProductQuery', {})
-      this.$store.dispatch('category/mergeSearchOptions', {
-        searchProductQuery: buildFilterProductsQuery(this.category, this.activeFilters)
-      })
-      this.$store.dispatch('category/products', this.getCurrentCategoryProductQuery)
+      if (this.hasActiveFilters) {
+        this.$bus.$emit('filter-reset')
+        this.$store.dispatch('category/resetFilters')
+        this.$store.dispatch('category/searchProductQuery', {})
+        this.$store.dispatch('category/mergeSearchOptions', {
+          searchProductQuery: buildFilterProductsQuery(this.category, this.activeFilters)
+        })
+        this.$store.dispatch('category/products', this.getCurrentCategoryProductQuery)
+      }
     }
   }
 }