Merge pull request #2502 from patzick/bugfix/2435-inverted-filters

Bugfix/2435 inverted filters
vuestorefront · Feb 26, 2019 · 5863faf · 5863faf
2 parents aa30ecc + 9feed8d
commit 5863faf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - add cart count config, allows you to display the item count instead of a sum of the item quantities - @pauluse (#2483)
 - improved product gallery load view, shows correct image on reload - @patzick (#2481, #2482, #2488, #2501)
 - Fix an issue where the index.html template within a theme is ignored - @EnthrallRecords (#2489) 
+- Inconsistent filters behaviour - clear filters on page load - @patzick (#2435)
 - fix price is never below 0 and user can't add 0 or below 0 products to cart @RakowskiPrzemyslaw (#2437)
 
 ### Deprecated / Removed

diff --git a/core/compatibility/components/blocks/Category/Sidebar.js b/core/compatibility/components/blocks/Category/Sidebar.js
@@ -25,6 +25,9 @@ export default {
       return Object.keys(this.activeFilters).length !== 0
     }
   },
+  mounted () {
+    this.resetAllFilters()
+  },
   methods: {
     sortById (filters) {
       return [...filters].sort((a, b) => { return a.id - b.id })

diff --git a/src/themes/default/components/core/blocks/Category/Sidebar.vue b/src/themes/default/components/core/blocks/Category/Sidebar.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="sidebar">
-    <h4>
-      {{ $t('Filter') }}
+    <h4 class="sidebar__header">
+      <span> {{ $t('Filter') }} </span>
+      <button
+        class="no-outline brdr-none py15 px40 bg-cl-mine-shaft :bg-cl-th-secondary ripple h5 cl-white sans-serif"
+        @click="resetAllFilters"
+        v-show="hasActiveFilters"
+      >
+        {{ $t('Clear') }}
+      </button>
     </h4>
-    <button
-      class="no-outline brdr-none py15 px40 bg-cl-mine-shaft :bg-cl-th-secondary ripple h5 cl-white sans-serif"
-      @click="resetAllFilters"
-      v-show="hasActiveFilters"
-    >
-      {{ $t('Clear') }}
-    </button>
     <div
       v-for="(filter, filterIndex) in availableFilters"
       :key="filterIndex"
@@ -99,3 +99,14 @@ export default {
   mixins: [Sidebar]
 }
 </script>
+
+<style lang="scss" scoped>
+.sidebar {
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    min-height: 47px;
+  }
+}
+</style>