@abi-software/map-side-bar 1.2.0-beta.5 → 1.2.0-beta.8

package/package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@abi-software/gallery": {
-      "version": "0.3.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@abi-software/gallery/-/gallery-0.3.0-beta.1.tgz",
-      "integrity": "sha512-AY2kIWCkHT/gsqjVB3/JjOx332ap0pywWcYkADSiiy0SBOIb5cO6wTCS/CJBmRsa9ft7eLcUzgmATihyyuTgKg==",
+      "version": "0.3.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@abi-software/gallery/-/gallery-0.3.0-beta.2.tgz",
+      "integrity": "sha512-sYfXNdM3jhRmEJy9gscPfafcyzL9otGqfc349SRRzFxeEsncZlFSEPU0huXgt5y3+FxF+VzKPoYhcENDmSDn9w==",
       "requires": {
         "@babel/code-frame": "^7.12.11",
         "axios": "^0.26.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "1.2.0-beta.5",
+  "version": "1.2.0-beta.8",
   "main": "./dist/map-side-bar.common.js",
   "files": [
     "dist/*",
@@ -17,7 +17,7 @@
     "start": "vue-cli-service serve"
   },
   "dependencies": {
-    "@abi-software/gallery": "^0.3.0-beta.1",
+    "@abi-software/gallery": "^0.3.0-beta.2",
     "@abi-software/svg-sprite": "^0.1.14",
     "algoliasearch": "^4.10.5",
     "element-ui": "^2.13.0",

package/src/components/DatasetCard.vue

@@ -23,6 +23,7 @@
             :thumbnails="entry.thumbnails"
             :label="label"
             :datasetThumbnail="thumbnail"
+            :dataset-biolucida="biolucidaData"
             @card-clicked="galleryClicked"/>
         </span>
         <div class="card-right" >
@@ -167,11 +168,7 @@ export default {
   },
   methods: {
     cardClicked: function(){
-      if(this.entry.scaffolds){
-        this.openScaffold()
-      }else{
-        this.openDataset()
-      }
+      this.openDataset()
     },
     galleryClicked: function(payload) {
       this.propogateCardAction(payload)
@@ -264,7 +261,7 @@ export default {
         const datasetVersion = this.version;
         const prefix = this.envVars.NL_LINK_PREFIX;
         const resource = {
-          share_link: `${prefix}/dataviewer?datasetId=${datasetId}&version=${datasetVersion}&path=${filePath}`
+          share_link: `${prefix}/dataviewer?datasetId=${datasetId}&version=${datasetVersion}&path=files/${filePath}`
         };
         let action = {
           label: capitalise(this.label),

package/src/components/ImageGallery.vue

@@ -197,7 +197,7 @@ export default {
           }
           let action = {
             label: capitalise(this.label),
-            resource: `${this.envVars.API_LOCATION}s3-resource/${this.datasetId}/${this.datasetVersion}/files/${filePath}`,
+            resource: `${this.envVars.API_LOCATION}s3-resource/${this.datasetId}/${this.datasetVersion}/${filePath}`,
             title: "View plot",
             type: "Plot",
             discoverId: this.discoverId,
@@ -266,7 +266,7 @@ export default {
           filePath = filePath.replaceAll(",", "_");
           const prefix = this.envVars.NL_LINK_PREFIX;
           const resource = {
-            share_link: `${prefix}/dataviewer?datasetId=${this.datasetId}&version=${this.datasetVersion}&path=${filePath}`,
+            share_link: `${prefix}/dataviewer?datasetId=${this.datasetId}&version=${this.datasetVersion}&path=files/${filePath}`,
           };
           let action = {
             label: capitalise(this.label),
@@ -376,14 +376,6 @@ export default {
                   id: dataset_image.image_id,
                 }
               );
-              this.getImageInfoFromBiolucida(
-                this.envVars.API_LOCATION,
-                items,
-                {
-                  id: dataset_image.image_id,
-                  fetchAttempts: 0,
-                }
-              );
               const resource = {
                 share_link: dataset_image.share_link,
                 id: dataset_image.image_id,
@@ -399,7 +391,7 @@ export default {
               };
               return {
                 id: dataset_image.image_id,
-                title: null,
+                title: `Biolucida Image`,
                 type: "Image",
                 thumbnail: thumbnailURL,
                 userData: action,