fix(composables): category default query params (#309)

* fix: proper filters, pagination and sorting reset on route chage * fix: proper filters, pagination and sorting reset on route chage
vuestorefront · Jan 21, 2020 · e59d96a · e59d96a · github-actions · Jan 21, 2020
1 parent f2b42c2
commit e59d96a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/packages/composables/src/hooks/useProductListing.ts b/packages/composables/src/hooks/useProductListing.ts
@@ -67,18 +67,14 @@ export const useProductListing = (
   sharedListing.products = initialProducts;
   selectedCriteria.sorting = activeSorting.value;
 
-  const resetFilters = async () => {
+  const resetFilters = () => {
     selectedCriteria.filters = {};
   };
 
-  const resetSorting = async () => {
+  const resetSorting = () => {
     selectedCriteria.sorting = activeSorting.value;
   };
 
-  const resetPagination = async () => {
-    selectedCriteria.pagination = {};
-  };
-
   const toggleFilter = (
     filter: EqualsFilter | EqualsAnyFilter | ContainsFilter, // TODO: handle range filter case as well
     forceSave: boolean = false
@@ -165,14 +161,14 @@ export const useProductListing = (
     await search();
   };
 
-  if (sharedListing.products.length) {
+  // if reloaded on route change
+  if (initialProducts.length) {
     resetFilters();
     resetSorting();
-    resetPagination();
-    search();
+    changePagination(1);
   }
 
-  const pagination: any = computed(() => sharedPagination);
+  const pagination: any = computed(() => localPagination);
   const products = computed(() => localListing.products);
   const productsTotal = computed(() => localPagination.total);
   const selectedFilters = computed(() => localCriteria.filters);

diff --git a/packages/default-theme/components/cms/elements/SwCategorySidebarFilter.vue b/packages/default-theme/components/cms/elements/SwCategorySidebarFilter.vue
@@ -138,8 +138,11 @@ export default {
     }
   },
   watch: {
-    sortBy(value){
-      this.changeSorting(value)
+    sortBy(newSorting, oldOne){
+      // prevent reloading on default sorting
+      if (oldOne.name !== newSorting.name) {
+        this.changeSorting(newSorting)
+      }
     }
   },
   computed: {