@abi-software/map-side-bar 1.3.8 → 1.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "1.3.8",
+  "version": "1.3.11",
   "main": "./dist/map-side-bar.common.js",
   "files": [
     "dist/*",

package/src/components/SearchFilters.vue

@@ -122,6 +122,7 @@ export default {
       showFilters: true,
       showFiltersText: true,
       cascadeSelected: [],
+      cascadeSelectedWithBoolean: [], 
       numberShown: 10,
       filters: [],
       facets: ["Species", "Gender", "Organ", "Datasets"],
@@ -341,6 +342,15 @@ export default {
       //Do not set the value unless it is ready
       if (this.cascaderIsReady && filterFacets && filterFacets.length != 0) {
         this.cascadeSelected = filterFacets.map(e => {
+          return [
+            e.facetPropPath,
+            this.createCascaderItemValue(capitalise(e.term), e.facet),
+          ]
+        });
+
+        // Unforttunately the cascader is very particular about it's v-model
+        //   to get around this we create a clone of it and use this clone for adding our boolean information
+        this.cascadeSelectedWithBoolean= filterFacets.map(e => {
           return [
             e.facetPropPath,
             this.createCascaderItemValue(capitalise(e.term), e.facet),
@@ -355,11 +365,15 @@ export default {
       if (this.cascaderIsReady && filter) {
         this.cascadeSelected.filter(f=>f.term != filter.term)
         this.cascadeSelected.push([filter.facetPropPath, this.createCascaderItemValue(filter.term, filter.facet), filter.AND])
+
+        this.cascadeSelectedWithBoolean.push([filter.facetPropPath, this.createCascaderItemValue(filter.term, filter.facet), filter.AND])
         // The 'AND' her is to set the boolean value when we search on the filters. It can be undefined without breaking anything
+
+
       }
     },
     initiateSearch: function() {
-      this.cascadeEvent(this.cascadeSelected)
+      this.cascadeEvent(this.cascadeSelectedWithBoolean)
     },
     // checkShowAllBoxes: Checks each 'Show all' cascade option by using the setCascader function
     checkShowAllBoxes: function(){

package/src/components/SideBar.vue

@@ -120,6 +120,8 @@ export default {
     },
     addFilter: function(filter){
       this.drawerOpen = true;
+      filter.AND = true // When we add a filter external, it is currently only with an AND boolean
+
       // Because refs are in v-for, nextTick is needed here
       Vue.nextTick(()=>{this.$refs[this.activeId][0].addFilter(filter)})
     },