Fixed #31 - Sorting is taken over by search order…

joonaspaakko · Mar 29, 2021 · 8bac243 · 8bac243
1 parent a69b2f1
commit 8bac243
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/src/output-page/_components/alePages/aleGallery/aleGridView/bookDetails.vue b/src/output-page/_components/alePages/aleGallery/aleGridView/bookDetails.vue
@@ -180,7 +180,6 @@ export default {
       const wrapper = {};
       wrapper.el = gridView;
       wrapper.width = wrapper.el.getBoundingClientRect().width;
-      console.log( target.width, wrapper.width )
       const info = {};
       info.cols = Math.floor(wrapper.width / target.width) || 1;
       

diff --git a/src/output-page/_components/alePages/aleGallery/aleSearch.vue b/src/output-page/_components/alePages/aleGallery/aleSearch.vue
@@ -99,7 +99,7 @@ export default {
     if ( this.$route.query.search ) {
       const searchQuery = decodeURIComponent(this.$route.query.search);
       this.$store.commit("prop", { key: "searchQuery", value: searchQuery });
-      this.fuseOptions.shouldSort = false
+      this.fuseOptions.shouldSort = false;
       this.search();
     }
     
@@ -138,20 +138,27 @@ export default {
     
     scope: function() {
       this.$root.$emit("book-clicked", { book: null });
-      if (this.$store.getters.searchIsActive ) this.search();
+      // No need to shuffle anything when there's no active search
+      if ( this.$store.getters.searchIsActive ) {
+        this.$store.commit("prop", { key: 'mutatingCollection', value: this.sortBooks( this.filterBooks( _.get(this.$store.state, this.collectionSource) ) ) });
+        // this.$nextTick(function() {
+          this.fuseOptions.shouldSort = false;
+          this.search();
+        // });
+      } 
     },
     filter: function() {
       
       this.$root.$emit("book-clicked", { book: null });
-      // scroll({ top: 0 });
+      
+      this.$store.commit("prop", { key: 'mutatingCollection', value: this.sortBooks( this.filterBooks( _.get(this.$store.state, this.collectionSource) ) ) });
       
       if ( this.$store.getters.searchIsActive ) {
-        this.$store.commit("prop", { key: 'mutatingCollection', value: this.filterBooks( _.get(this.$store.state, this.collectionSource) ) });
-        this.search();
+        // this.$nextTick(function() {
+          this.fuseOptions.shouldSort = false;
+          this.search();
+        // });
       } 
-      else {
-        this.$store.commit("prop", { key: 'mutatingCollection', value: this.sortBooks( this.filterBooks( _.get(this.$store.state, this.collectionSource) ) ) });
-      }
       
     },
     sort: function() {

diff --git a/src/output-page/_components/alePages/aleGallery/aleSearch/searchOptions.vue b/src/output-page/_components/alePages/aleGallery/aleSearch/searchOptions.vue
@@ -4,7 +4,7 @@
 
       <div class="search-opts-arrow" :style="css.arrow"></div>
 
-      <ul v-if="listName === 'filter' && $store.getters.filterKeys" class="regular-filters" :style="css.filter">
+      <ul v-if="listName === 'filter' && $store.getters.regularFilters" class="regular-filters" :style="css.filter">
         <li class="search-option" 
         v-for="(item, index) in optionsList" :key="item.key"
         v-if="item.type === 'filter'"

diff --git a/src/output-page/_components/alePages/aleSeries.vue b/src/output-page/_components/alePages/aleSeries.vue
@@ -105,10 +105,6 @@ export default {
           // { active: false, type: 'filterExtras', label: 'Books > 20', key: 'series-20', group: 'radioHead', condition: function( series ) { return series.books.length > 20; }},
           // { active: false, type: 'filterExtras', label: 'Books > 30', key: 'series-30', group: 'radioHead', condition: function( series ) { return series.books.length > 30; }},
           
-          
-          
-          // FIXME: series page not showing up initially.........?? only after you meddle with the filters...
-          
           { active: true, type: 'filterExtras', label: 'Books in series', key: 'inSeries', range: [1, (function() {
             let series = _.get(vue.$store.state, vue.collectionSource);
             let max = _.maxBy( series, function( series ){ 

diff --git a/src/output-page/_components/snippets/sorter.vue b/src/output-page/_components/snippets/sorter.vue
@@ -210,7 +210,7 @@ export default {
       
       if ( this.item.key === "sortValues" ) this.$root.$emit("book-clicked", { book: null });
     
-      if (this.listName === "scope") {
+      if ( this.listName === "scope" ) {
         this.$root.$emit("start-scope");
       }
       else if (
@@ -219,7 +219,7 @@ export default {
       ) {
         this.$store.commit("prop", { 'key': 'searchSort', value: false });
         this.$root.$emit("start-sort");
-      } else if (this.listName === "filter") {
+      } else if ( this.listName === "filter" ) {
         this.$root.$emit("start-filter", range ? value : null);
       } 
         

diff --git a/src/output-page/store.js b/src/output-page/store.js
@@ -109,6 +109,9 @@ export default new Vuex.Store({
     sortBy: function( state ) {
       return _.find( state.listRenderingOpts.sort, 'current').key;
     },
+    regularFilters: function( state ) {
+      return _.filter( state.listRenderingOpts.filter, { type: 'filter' }).length > 0;
+    },
     filterKeys: function( state ) {
       return _.map(_.filter( state.listRenderingOpts.filter, { type: 'filter', active: true }), function( o ) {
         return o.key;