Merge pull request #410 from gibkigonzo/bugfix/update-1.12

Apply changes from vuestorefront/vsf-default#4

Author: Tomasz Kostuch

CHANGELOG.md

@@ -5,14 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.1] - UNRELEASED
+## [1.0.2] - UNRELEASED
 
 ### Added
 ### Changed / Improved
 
 - Update sfui version to 0.7.11
 - Changed the banner links to correct path (#379)
 - Improved the background of MegaMenu (#401)
+- use product/findProducts instead of product/list
+  use category-next/fetchMenuCategories instead of category/list
+  fix problem with changing product color - should be changed product image
+  fix close sidebar when push esc button
+  add cacheTags to pages
+  remove Home page mixin - (#410)
 
 ## [1.0.1] - 2020.06.02
 

components/molecules/m-login.vue

@@ -75,7 +75,7 @@ export default {
     }),
     switchElem (to) {
       this.$v.$reset();
-      this.openModal({name: ModalList.Auth, payload: to})
+      this.openModal({ name: ModalList.Auth, payload: to })
     },
     login () {
       this.$v.$touch();
@@ -103,7 +103,7 @@ export default {
             this.onFailure(result);
           } else {
             this.onSuccess(i18n.t('You are logged in!'));
-            this.closeModal({name: ModalList.Auth});
+            this.closeModal({ name: ModalList.Auth });
           }
         })
         .catch(err => {

components/molecules/m-menu.vue

@@ -66,7 +66,7 @@ export default {
       isWebpSupported: state => state.ui.isWebpSupported
     }),
     ...mapGetters({
-      getCategories: 'category/getCategories',
+      getCategories: 'category-next/getMenuCategories',
       getCurrentCategory: 'category/getCurrentCategory',
       getPromotedOffers: 'promoted/getPromotedOffers'
     }),

components/molecules/m-product-gallery.vue

@@ -53,14 +53,14 @@ export default {
             selectThis = false
           }
         }
-        return selectThis || (image.id && image.id.color === this.configuration.color.id)
+        return selectThis || (image.id && image.id.color && String(image.id.color) === String(this.configuration.color.id))
       })
 
       if (!variantImage) {
         variantImage = this.gallery.find(image => {
           return typeof image.id.color !== 'undefined' &&
             typeof this.configuration.color !== 'undefined' &&
-            image.id.color === this.configuration.color.id
+            String(image.id.color) === String(this.configuration.color.id)
         })
       }
 

components/molecules/m-register.vue

@@ -78,7 +78,7 @@ export default {
     }),
     switchElem (to) {
       this.$v.$reset();
-      this.openModal({name: ModalList.Auth, payload: to})
+      this.openModal({ name: ModalList.Auth, payload: to })
     },
     register () {
       this.$v.$touch();
@@ -111,7 +111,7 @@ export default {
               password: this.password
             });
             this.onSuccess(i18n.t('You are logged in!'));
-            this.closeModal({name: ModalList.Auth});
+            this.closeModal({ name: ModalList.Auth });
           }
         })
         .catch(err => {

components/molecules/m-related-products.vue

@@ -66,16 +66,18 @@ export default {
       }
       let relatedProductsQuery = prepareRelatedQuery(key, sku);
 
-      const response = await this.$store.dispatch('product/list', {
+      const { items } = await this.$store.dispatch('product/findProducts', {
         query: relatedProductsQuery,
         size: 8,
-        prefetchGroupProducts: false,
-        updateState: false
+        options: {
+          populateRequestCacheTags: false,
+          prefetchGroupProducts: false
+        }
       });
-      if (response) {
+      if (items.length) {
         this.$store.dispatch('product/related', {
           key: this.type,
-          items: response.items
+          items
         });
         this.$forceUpdate();
       }

components/molecules/m-reset-password.vue

@@ -57,7 +57,7 @@ export default {
     }),
     switchElem (to) {
       this.$v.$reset();
-      this.openModal({name: ModalList.Auth, payload: to})
+      this.openModal({ name: ModalList.Auth, payload: to })
     },
     resetPassword () {
       this.$v.$touch();

components/organisms/o-bottom-navigation.vue

@@ -49,7 +49,7 @@ export default {
       return (icon) => {
         switch (icon) {
           case 'home': {
-            const isHomepage = this.$route.name === this.localizedRoute({name: 'home', path: '/'}).name
+            const isHomepage = this.$route.name === this.localizedRoute({ name: 'home', path: '/' }).name
             return isHomepage && !this.isMobileMenu && !this.isSearchPanelVisible
           }
           case 'menu': {
@@ -93,7 +93,7 @@ export default {
       if (this.isLoggedIn) {
         this.$router.push(this.localizedRoute('/my-account'))
       } else {
-        this.openModal({name: ModalList.Auth, payload: 'login'})
+        this.openModal({ name: ModalList.Auth, payload: 'login' })
       }
     },
     goToCart () {

components/organisms/o-footer.vue

@@ -108,8 +108,8 @@ export default {
             {
               name: 'My account',
               ...this.isLoggedIn
-                ? {link: '/my-account'}
-                : {clickHandler: () => this.openModal({name: ModalList.Auth, payload: 'login'})}
+                ? { link: '/my-account' }
+                : { clickHandler: () => this.openModal({ name: ModalList.Auth, payload: 'login' }) }
             },
             { name: 'Delivery', link: '/delivery' },
             { name: 'Return policy', link: '/returns' }
@@ -145,7 +145,7 @@ export default {
       openModal: 'openModal'
     }),
     showLanguageSwitcher () {
-      this.openModal({name: ModalList.LanguageSwitcher})
+      this.openModal({ name: ModalList.LanguageSwitcher })
     }
   }
 };

components/organisms/o-header.vue

@@ -98,7 +98,10 @@ export default {
       isSearchPanelVisible: state => state.ui.searchpanel
     }),
     ...mapState('ui', ['isMobileMenu']),
-    ...mapGetters('category', ['getCategories', 'getCurrentCategory']),
+    ...mapGetters('category', ['getCurrentCategory']),
+    ...mapGetters({
+      getCategories: 'category-next/getMenuCategories'
+    }),
     ...mapGetters('user', ['isLoggedIn']),
     activeIcon () {
       return this.isLoggedIn ? 'account' : '';