@abi-software/map-side-bar 1.2.0 → 1.2.3

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "1.1.14",
+  "version": "1.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

package/scaffold_context_info.json

@@ -11,6 +11,7 @@
             "id": "Sample 1",
             "path": "",
             "view": "View 1",
+            "color": "#FFFF00",
             "thumbnail": "https://raw.githubusercontent.com/ABI-Software/map-sidebar/main/assets/temp-pics/orange.png"
         },
         {
@@ -21,8 +22,9 @@
             "id": "Sample 2",
             "path": "",
             "view": "View 2",
+            "color": "#FFA500",
             "thumbnail": "https://raw.githubusercontent.com/ABI-Software/map-sidebar/main/assets/temp-pics/teal.png"
         }
     ],
-    "version": "0.1.0",
+    "version": "0.1.0"
 }

package/src/algolia/algolia.js

@@ -75,6 +75,7 @@ export class AlgoliaClient {
   _processResultsForCards(results) {
     let newResults = []
     let newResult = {}
+    let id = 0
     for (let res of results) {
       newResult = {...res}
       newResult = {
@@ -83,7 +84,9 @@ export class AlgoliaClient {
         description: res.item.description,
         updated: res.pennsieve.updatedAt,
         publishDate: res.pennsieve.publishDate,
-      } 
+        id: id
+      }
+      id++
       newResults.push(newResult)
     }
     return newResults

package/src/components/DatasetCard.vue

@@ -290,6 +290,7 @@ export default {
       this.cardOverflow = false
       this.expanded = false
       this.cardOverflow = this.isOverflown(this.$refs.card)
+      this.getBanner()
     }
   },
 };

package/src/components/SidebarContent.vue

@@ -22,12 +22,12 @@
       @loading="filtersLoading"
     ></SearchFilters>
     <div class="content scrollbar" v-loading="loadingCards" ref="content">
-      <div v-if="loadingScicrunch" class="loading-icon" v-loading="loadingScicrunch"></div>
       <div
         class="error-feedback"
         v-if="results.length === 0 && !loadingCards && !sciCrunchError"
       >No results found - Please change your search / filter criteria.</div>
       <div class="error-feedback" v-if="sciCrunchError">{{sciCrunchError}}</div>
+      <div v-if="loadingScicrunch" class="loading-icon" v-loading="loadingScicrunch"></div>
       <div v-for="result in results" :key="result.id" class="step-item">
         <DatasetCard :entry="result" :envVars="envVars" @contextUpdate="contextCardUpdate"></DatasetCard>
       </div>
@@ -249,7 +249,6 @@ export default {
     resultsProcessing: function(data) {
       this.lastSearch = this.searchInput;
 
-      let id = 0;
       if (data.results.length === 0) {
         return;
       }
@@ -276,19 +275,15 @@ export default {
           organs: (element.organs && element.organs.length > 0)
               ? [...new Set(element.organs.map(v => v.name))]
               : undefined,
-          species: element.organisms 
+          species: element.organisms
             ? element.organisms[0].species
               ? [...new Set(element.organisms.map((v) =>v.species ? v.species.name : null))]
               : undefined
             : undefined, // This processing only includes each gender once into 'sexes'
-          id: id,
           scaffolds: element['abi-scaffold-metadata-file'] ? element['abi-scaffold-metadata-file'] : undefined,
           contextualInformation: element['abi-contextual-information'].length > 0 ? element['abi-contextual-information'] : undefined,
-          simulation: element.additionalLinks
-            ? element.additionalLinks[0].description == 'Repository'
-            : false,
+          simulation: element['abi-simulation-file'],
         });
-        id++;
 
         Vue.set(this.results, i, this.results[i])
       });
@@ -384,15 +379,19 @@ export default {
 }
 
 .loading-icon {
-  position: relative;
+  position: absolute;
   display: flex;
   float: right;
-  top: 0;
+  right: 40px;
   z-index: 20;
   width: 40px;
   height: 40px;
 }
 
+.loading-icon >>> .el-loading-mask {
+  background-color: rgba(117, 190, 218, 0.0) !important;
+}
+
 .pagination >>> button {
   background-color: white !important;
 }