@abi-software/map-side-bar 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "files": [
     "dist/*",
     "src/*",
@@ -37,7 +37,7 @@
     "./src/*": "./src/*"
   },
   "dependencies": {
-    "@abi-software/gallery": "^1.0.0",
+    "@abi-software/gallery": "^1.1.0",
     "@abi-software/svg-sprite": "^1.0.0",
     "@element-plus/icons-vue": "^2.3.1",
     "algoliasearch": "^4.10.5",

package/src/App.vue

@@ -205,7 +205,10 @@ export default {
     console.log('mounted app')
     EventBus.on('contextUpdate', (payLoad) => {
       console.log('contextUpdate', payLoad)
-    })
+    });
+    EventBus.on('datalink-clicked', (payLoad) => {
+      console.log('datalink-clicked', payLoad)
+    });
   },
 }
 </script>

package/src/components/DatasetCard.vue

@@ -15,6 +15,7 @@
             :dataset-biolucida="biolucidaData"
             :category="currentCategory"
             @card-clicked="galleryClicked"
+            @datalink-clicked="galleryDatalinkClicked"
           />
         </span>
         <div class="card-right">
@@ -163,6 +164,9 @@ export default {
     galleryClicked: function (payload) {
       this.propogateCardAction(payload)
     },
+    galleryDatalinkClicked: function (payload) {
+      EventBus.emit('datalink-clicked', payload); // Pass to mapintegratedvuer
+    },
     openDataset: function () {
       window.open(this.dataLocation, '_blank')
     },

package/src/components/ImageGallery.vue

@@ -13,6 +13,7 @@
         :body-style="bodyStyle"
         :shadow="shadow"
         @card-clicked="cardClicked"
+        @datalink-clicked="datalinkClicked"
         ref="gallery"
       />
   </div>
@@ -116,6 +117,9 @@ export default {
     cardClicked: function (payload) {
       this.$emit('card-clicked', payload)
     },
+    datalinkClicked: function (payload) {
+      this.$emit('datalink-clicked', payload);
+    },
     createSciCurnchItems: function () {
       this.updateS3Bucket(this.entry.s3uri)
       this.createDatasetItem()
@@ -171,7 +175,7 @@ export default {
           let thumbnailURL = undefined
           let mimetype = ''
           if (thumbnail) {
-            
+
             thumbnailURL = this.getImageURL(this.envVars.API_LOCATION, {
               id,
               prefix: this.getS3Prefix(),

package/src/components/SearchFilters.vue

@@ -403,9 +403,11 @@ export default {
       return event
     },
     // cascadeEvent: initiate searches based off cascader changes
-    cascadeEvent: function (event) {
+    cascadeEvent: function (eventIn) {
+      let event = [...eventIn]
       if (event) {
         // Check for show all in selected cascade options
+
         event = this.showAllEventModifier(event)
 
         event = this.showAllEventModifierForAutoCheckAll(event)
@@ -422,7 +424,6 @@ export default {
           const rest = event.filter((e) => e[position] !== this.__expandItem__[position]);
           event = [...current, ...rest]
         }
-
         // Create results for the filter update
         let filterKeys = event
           .filter((selection) => selection !== undefined)
@@ -465,9 +466,8 @@ export default {
               facetSubPropPath: facetSubPropPath, // will be used for filters if we are at the third level of the cascader
             }
           })
-
+        
         this.$emit('loading', true) // let sidebarcontent wait for the requests
-
         this.$emit('filterResults', filters) // emit filters for apps above sidebar
         this.setCascader(filterKeys) //update our cascader v-model if we modified the event
         this.cssMods() // update css for the cascader
@@ -478,10 +478,12 @@ export default {
     findHierarachyStringAndBooleanString(cascadeEventItem) {
       let hString, bString
       if (cascadeEventItem.length >= 3) {
-        if (cascadeEventItem[2] && cascadeEventItem[2].split('>').length > 2) {
+        if (cascadeEventItem[2] &&
+          (typeof cascadeEventItem[2] === 'string' ||
+          cascadeEventItem[2] instanceof String) &&
+          cascadeEventItem[2].split('>').length > 2) {
           hString = cascadeEventItem[2]
-          bString =
-            cascadeEventItem.length == 4 ? cascadeEventItem[3] : undefined
+          bString = cascadeEventItem.length == 4 ? cascadeEventItem[3] : undefined
         } else {
           hString = cascadeEventItem[1]
           bString = cascadeEventItem[2]
@@ -603,13 +605,14 @@ export default {
     setCascader: function (filterFacets) {
       //Do not set the value unless it is ready
       if (this.cascaderIsReady && filterFacets && filterFacets.length != 0) {
-        this.cascadeSelected = filterFacets.map((e) => {
+        //An inner function only used by this function
+        const createFilter = (e) => {
           let filters = [
             e.facetPropPath,
             this.createCascaderItemValue(capitalise(e.term), e.facet),
           ]
           // Add the third level of the cascader if it exists
-          if (e.facet2)
+          if (e.facet2) {
             filters.push(
               this.createCascaderItemValue(
                 capitalise(e.term),
@@ -617,21 +620,24 @@ export default {
                 e.facet2
               )
             )
+          }
+          return filters;
+        }
+
+        this.cascadeSelected = filterFacets.map((e) => {
+          let filters = createFilter(e)
           return filters
         })
-
+        
         // 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),
-            e.AND,
-          ]
+          let filters = createFilter(e)
+          filters.push(e.AND)
+          return filters
         })
         this.updatePreviousShowAllChecked(this.cascadeSelected)
       }
-
       this.tagsChangedCallback(filterFacets);
     },
     addFilter: function (filterToAdd) {

package/src/components/SideBar.vue

@@ -211,6 +211,15 @@ export default {
        */
       this.$emit('contextUpdate', payLoad)
     })
+    EventBus.on('datalink-clicked', (payLoad) => {
+      /**
+       * This event is emitted
+       * when the dataset button or dataset image thumbnail
+       * from the gallery component is clicked.
+       * @arg payload
+       */
+      this.$emit('datalink-clicked', payLoad);
+    })
   },
 }
 </script>