Merge branch 'develop' into bugfix/#2409-check-for-multiple-order-pla…

…cing
vuestorefront · Feb 26, 2019 · f47057a · f47057a
2 parents 6aac8c6 + 5863faf
commit f47057a
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added clear filters button on desktop also and only show if filters are applied - @DaanKouters (#2342)
 - Improved docs at contributing.md and configuration.md (spelling etc.) - @ruthgeridema (#2421, #2422, #2423, #2425, #2426)
 - Fixed design issue of Country label on Edge 17 & Firefox - @ananth-iyer (#2390,#2399)
+- Wishlist and compare items are loaded from local cache only once, instead of every time when module component is rendered - @patzick (#2431)
 - Country field is filled by first counry from the list in cart in paymen section - @RakowskiPrzemyslaw (#2428)
 - Added video support in Product Gallery component. - @rain2o (#2433)
 - Improved product quantity change component in product and cart - @patzick (#2398, #2437)
@@ -29,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)
 - Check for placing single order in case of error in any payment module - @patzick (#2409)
 

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/core/modules/compare/store/actions.ts b/core/modules/compare/store/actions.ts
@@ -9,8 +9,9 @@ import CompareState from '../types/CompareState'
 import { cacheStorage } from '../'
 import { Logger } from '@vue-storefront/core/lib/logger'
 const actions: ActionTree<CompareState, RootState> = {
-  load (context) {
-    const commit = context.commit
+  load ({ commit, getters }, force: boolean = false) {
+    if (!force && getters.isCompareLoaded) return
+    commit(types.SET_COMPARE_LOADED)
     cacheStorage.getItem('current-compare', (err, storedItems) => {
       if (err) throw new Error(err)
       commit(types.COMPARE_LOAD_COMPARE, storedItems)

diff --git a/core/modules/compare/store/getters.ts b/core/modules/compare/store/getters.ts
@@ -4,7 +4,8 @@ import CompareState from '../types/CompareState'
 
 const getters: GetterTree<CompareState, RootState> = {
   isEmpty: (state) => state.items.length === 0,
-  isOnCompare: (state) => (product) => state.items.find(p => p.sku === product.sku)
+  isOnCompare: (state) => (product) => state.items.find(p => p.sku === product.sku),
+  isCompareLoaded: state => state.loaded
 }
 
 export default getters
diff --git a/core/modules/compare/store/index.ts b/core/modules/compare/store/index.ts
@@ -8,6 +8,7 @@ import CompareState from '../types/CompareState'
 export const module: Module<CompareState, RootState> = {
   namespaced: true,
   state: {
+    loaded: false,
     items: []
   },
   getters,

diff --git a/core/modules/compare/store/mutation-types.ts b/core/modules/compare/store/mutation-types.ts
@@ -2,3 +2,4 @@ export const SN_COMPARE = 'compare'
 export const COMPARE_ADD_ITEM = SN_COMPARE + '/ADD'
 export const COMPARE_DEL_ITEM = SN_COMPARE + '/DEL'
 export const COMPARE_LOAD_COMPARE = SN_COMPARE + '/LOAD'
+export const SET_COMPARE_LOADED = `${SN_COMPARE}/SET_COMPARE_LOADED`
diff --git a/core/modules/compare/store/mutations.ts b/core/modules/compare/store/mutations.ts
@@ -20,6 +20,9 @@ const mutations: MutationTree<CompareState> = {
   },
   [types.COMPARE_LOAD_COMPARE] (state, storedItems) {
     state.items = storedItems || []
+  },
+  [types.SET_COMPARE_LOADED] (state, isLoaded: boolean = true) {
+    state.loaded = isLoaded
   }
 }
 

diff --git a/core/modules/compare/types/CompareState.ts b/core/modules/compare/types/CompareState.ts
@@ -1,3 +1,7 @@
 export default interface CompareState {
+  /**
+   * Informs if items to compare are already loaded from local cache.
+   */
+  loaded: boolean,
   items: any[]
 }
diff --git a/core/modules/wishlist/store/actions.ts b/core/modules/wishlist/store/actions.ts
@@ -13,8 +13,9 @@ const actions: ActionTree<WishlistState, RootState> = {
   clear (context) {
     context.commit(types.WISH_LOAD_WISH, [])
   },
-  load (context) {
-    const commit = context.commit
+  load ({ commit, getters }, force: boolean = false) {
+    if (!force && getters.isWishlistLoaded) return
+    commit(types.SET_WISHLIST_LOADED)
     cacheStorage.getItem('current-wishlist', (err, storedItems) => {
       if (err) throw new Error(err)
       commit(types.WISH_LOAD_WISH, storedItems)

diff --git a/core/modules/wishlist/store/index.ts b/core/modules/wishlist/store/index.ts
@@ -7,9 +7,13 @@ import WishlistState from '../types/WishlistState'
 export const module:Module<WishlistState, RootState> = {
   namespaced: true,
   state: {
+    loaded: false,
     items: []
   },
   actions,
-  mutations
+  mutations,
+  getters: {
+    isWishlistLoaded: state => state.loaded
+  }
 }
 
diff --git a/core/modules/wishlist/store/mutation-types.ts b/core/modules/wishlist/store/mutation-types.ts
@@ -1,4 +1,5 @@
 export const SN_WISHLIST = 'wishlist'
 export const WISH_ADD_ITEM = SN_WISHLIST + '/ADD'
 export const WISH_DEL_ITEM = SN_WISHLIST + '/DEL'
-export const WISH_LOAD_WISH = SN_WISHLIST + '/LOAD'
+export const WISH_LOAD_WISH = SN_WISHLIST + '/LOAD'
+export const SET_WISHLIST_LOADED = `${SN_WISHLIST}/SET_WISHLIST_LOADED`
diff --git a/core/modules/wishlist/store/mutations.ts b/core/modules/wishlist/store/mutations.ts
@@ -21,6 +21,9 @@ const mutations: MutationTree<WishlistState> = {
   },
   [types.WISH_LOAD_WISH] (state, storedItems) {
     state.items = storedItems || []
+  },
+  [types.SET_WISHLIST_LOADED] (state, isLoaded: boolean = true) {
+    state.loaded = isLoaded
   }
 }
 

diff --git a/core/modules/wishlist/types/WishlistState.ts b/core/modules/wishlist/types/WishlistState.ts
@@ -1,3 +1,7 @@
 export default interface WishlistState {
+  /**
+   * Informs if wishlist is already loaded from local cache.
+   */
+  loaded: boolean,
   items: any[]
 }
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>