@abi-software/map-side-bar 1.3.19 → 1.3.23

package/package.json

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

package/src/App.vue

@@ -114,7 +114,7 @@ export default {
       this.$refs.sideBar.addFilter({facet: 'Heart', term:'Anatomical structure', facetPropPath: 'anatomy.organ.name', AND: true})
     },
     addStomach: function(){
-      this.$refs.sideBar.addFilter({facet: 'Stomach', term:'Anatomical structure', facetPropPath: 'anatomy.organ.name', AND: true})
+      this.$refs.sideBar.addFilter({facet: 'Stomach', term:'Anatomical structure', facetPropPath: 'anatomy.organ.name', AND: false})
     },
     addInvalidTerm: function(){
       this.$refs.sideBar.addFilter({facet: 'Invalid', term:'Anatomical structure', facetPropPath: 'anatomy.organ.name', AND: true})

package/src/components/ContextCard.vue

@@ -34,7 +34,7 @@
                   </div>
                 </span>
                 <div v-bind:key="i+'_4'" v-if="sampleDetails[i]" v-html="sample.description"/>
-                <a v-bind:key="i+'_5'" v-if="sampleDetails[i]" :href="generateFileLink(sample.path)" target="_blank">View Source</a>
+                <a v-bind:key="i+'_5'" v-if="sampleDetails[i] && sample.path" :href="generateFileLink(sample)" target="_blank">View Source</a>
                 <div v-bind:key="i+'_2'" class="padding"/>
             </template>
           </template>
@@ -48,7 +48,7 @@
                 <div class="view-description">{{view.description}}<i class="el-icon-warning-outline info"></i> </div>
               </span>
               <div v-if="sampleDetails[i]" v-html="samplesMatching(view.id).description" :key="i+'_2'"/>
-              <a v-bind:key="i+'_5'" v-if="sampleDetails[i]" :href="generateFileLink(samplesMatching(view.id))" target="_blank">View Source</a>
+              <a v-bind:key="i+'_5'" v-if="sampleDetails[i] && samplesMatching(view.id).path" :href="generateFileLink(samplesMatching(view.id))" target="_blank">View Source</a>
               <div :key="i" class="padding"/>
 
               <!-- Extra padding if sample details is open -->
@@ -242,7 +242,7 @@ export default {
       return url.split('https://doi.org/').pop()
     },
     generateFileLink(sample){
-      return `https://sparc.science/file/${sample.discoverId}/${sample.version}?path=${this.processPathForUrl(sample.path)}`
+      return `${this.envVars.ROOT_URL}/file/${sample.discoverId}/${sample.version}?path=${this.processPathForUrl(sample.path)}`
 
     },
     openViewFile: function(view){

package/src/components/ImageGallery.vue

@@ -216,7 +216,7 @@ export default {
     createScaffoldItems: function () {
       if (this.entry.scaffolds) {
         let index = 0;
-        this.entry.scaffolds.forEach((scaffold) => {
+        this.entry.scaffolds.forEach((scaffold, i) => {
           const filePath = scaffold.dataset.path;
           const id = scaffold.identifier;
           const thumbnail = this.getThumbnailForScaffold(
@@ -236,6 +236,8 @@ export default {
             });
             mimetype = thumbnail.mimetype.name;
           }
+          // The line below checks if there is a context file for each scaffold. If there is not, we use the first context card for each scaffold.
+          let contextIndex = this.entry.contextualInformation.length == this.entry.scaffolds.length ? i : 0
           let action = {
             label: capitalise(this.label),
             resource: `${this.envVars.API_LOCATION}s3-resource/${this.datasetId}/${this.datasetVersion}/files/${filePath}`,
@@ -245,7 +247,7 @@ export default {
             apiLocation: this.envVars.API_LOCATION,
             version: this.datasetVersion,
             banner: this.datasetThumbnail,
-            contextCardUrl: this.entry.contextualInformation ? `${this.envVars.API_LOCATION}s3-resource/${this.datasetId}/${this.datasetVersion}/files/${this.entry.contextualInformation}` : undefined,
+            contextCardUrl: this.entry.contextualInformation[contextIndex] ? `${this.envVars.API_LOCATION}s3-resource/${this.datasetId}/${this.datasetVersion}/files/${this.entry.contextualInformation[contextIndex]}` : undefined,
           };
           this.items['Scaffolds'].push({
             id,

package/src/components/SearchFilters.vue

@@ -447,6 +447,7 @@ export default {
       this.checkShowAllBoxes();
       this.setCascader(this.entry.filterFacets);
       this.makeCascadeLabelsClickable();
+      this.$emit("cascaderReady");
     });
   },
 };

package/src/components/SidebarContent.vue

@@ -20,6 +20,7 @@
       @filterResults="filterUpdate"
       @numberPerPage="numberPerPageUpdate"
       @loading="filtersLoading"
+      @cascaderReady="cascaderReady"
     ></SearchFilters>
     <div class="content scrollbar" v-loading="loadingCards" ref="content">
       <div
@@ -125,10 +126,6 @@ export default {
       type: Object,
       default: () => {}
     },
-    firstSearch: {
-      type: String,
-      default: ""
-    }
   },
   data: function() {
     return {
@@ -137,7 +134,8 @@ export default {
         flex: "1 1 auto",
         "flex-flow": "column",
         display: "flex"
-      }
+      },
+      cascaderIsReady: false,
     };
   },
   computed: {
@@ -163,26 +161,48 @@ export default {
     openSearch: function(filter, search='') {
       this.searchInput = search;
       this.resetPageNavigation();
-      this.filter = this.$refs.filtersRef.getValidatedFilters(filter);
-      //Facets provided but cannot find at least one valid
-      //facet. Tell the users the search is invalid and reset
-      //facets check boxes.
-      if ((filter && filter.length > 0) && 
-        (this.filter && this.filter.length === 0)) {
-        this.$refs.filtersRef.checkShowAllBoxes();
-        this.resetSearch();
-      } else if (this.filter) {
-        this.searchAlgolia(this.filter, search);
-        this.$refs.filtersRef.setCascader(this.filter);
+      //Proceed normally if cascader is ready
+      if (this.cascaderIsReady) {
+        this.filter = this.$refs.filtersRef.getValidatedFilters(filter);
+        //Facets provided but cannot find at least one valid
+        //facet. Tell the users the search is invalid and reset
+        //facets check boxes.
+        if ((filter && filter.length > 0) && 
+          (this.filter && this.filter.length === 0)) {
+          this.$refs.filtersRef.checkShowAllBoxes();
+          this.resetSearch();
+        } else if (this.filter) {
+          this.searchAlgolia(this.filter, search);
+          this.$refs.filtersRef.setCascader(this.filter);
+        }
+      } else {
+        //cascader is not ready, perform search if no filter is set,
+        //otherwise waith for cascader to be ready
+        this.filter = filter;
+        if (!filter || filter.length == 0) {
+          this.searchAlgolia(this.filter, search);
+        }
       }
     },
     addFilter: function(filter) {
-      this.resetPageNavigation();
-      if (filter) {
-        if (this.$refs.filtersRef.addFilter(filter))
-          this.$refs.filtersRef.initiateSearch();
+      if (this.cascaderIsReady) {
+        this.resetPageNavigation();
+        if (filter) {
+          if (this.$refs.filtersRef.addFilter(filter))
+            this.$refs.filtersRef.initiateSearch();
+        }
+      } else {
+        if (Array.isArray(this.filter)) {
+          this.filter.push(filter);
+        } else {
+          this.filter = [filter];
+        }
       }
     },
+    cascaderReady: function() {
+      this.cascaderIsReady = true;
+      this.openSearch(this.filter, this.searchInput);
+    },
     clearSearchClicked: function() {
       this.searchInput = "";
       this.resetPageNavigation();
@@ -360,13 +380,7 @@ export default {
     // initialise algolia
     this.algoliaClient = new AlgoliaClient(this.envVars.ALGOLIA_ID, this.envVars.ALGOLIA_KEY, this.envVars.PENNSIEVE_API_LOCATION);
     this.algoliaClient.initIndex(this.envVars.ALGOLIA_INDEX);
-
-    // temporarily disable flatmap search since there are no datasets
-    if (this.firstSearch === "Flatmap" || this.firstSearch === "flatmap") {
-      this.openSearch(undefined, '')
-    } else {
-      this.openSearch(undefined, '');
-    }
+    this.openSearch(undefined, '');
   },
   created: function() {
     //Create non-reactive local variables