@abi-software/map-side-bar 2.6.4-beta.1 → 2.6.4-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.6.4-beta.1",
+  "version": "2.6.4-beta.3",
   "files": [
     "dist/*",
     "src/*",
@@ -39,11 +39,12 @@
   },
   "dependencies": {
     "@abi-software/gallery": "^1.1.2",
-    "@abi-software/map-utilities": "^1.3.3-beta.0",
+    "@abi-software/map-utilities": "^1.3.3-beta.1",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",
     "algoliasearch": "^4.10.5",
     "element-plus": "2.8.4",
+    "js-base64": "^3.7.7",
     "marked": "^4.1.1",
     "mitt": "^3.0.1",
     "unplugin-vue-components": "^0.26.0",

package/src/components/ConnectivityInfo.vue

@@ -211,6 +211,7 @@
         <connectivity-graph
           :entry="entry.featureId[0]"
           :mapServer="envVars.FLATMAPAPI_LOCATION"
+          :sckanVersion="sckanVersion"
           @tap-node="onTapNode"
           ref="connectivityGraphRef"
         />
@@ -317,6 +318,7 @@ export default {
       timeoutID: undefined,
       graphViewLoaded: false,
       updatedCopyContent: '',
+      sckanVersion: '',
     }
   },
   watch: {
@@ -603,6 +605,7 @@ export default {
     },
   },
   mounted: function () {
+    this.sckanVersion = this.entry['knowledge-source'];
     this.updatedCopyContent = this.getUpdateCopyContent();
     EventBus.on('connectivity-graph-error', (errorInfo) => {
       this.pushConnectivityError(errorInfo);

package/src/components/DatasetCard.vue

@@ -60,6 +60,7 @@
 <script>
 /* eslint-disable no-alert, no-console */
 import { View as ElIconView } from '@element-plus/icons-vue'
+import { Base64  } from 'js-base64';
 import BadgesGroup from './BadgesGroup.vue'
 import {
   ElButton as Button,
@@ -236,7 +237,7 @@ export default {
             this.discoverId = data.id
             this.version = data.version
             this.dataLocation = `https://sparc.science/datasets/${data.id}?type=dataset`
-            this.getBiolucidaInfo(this.discoverId)
+            this.getBiolucidaInfo()
             this.loading = false
             this.updateCopyContent();
           })
@@ -251,15 +252,30 @@ export default {
     lastName: function (fullName) {
       return fullName.split(',')[0]
     },
-    getBiolucidaInfo: function (id) {
-      let apiLocation = this.envVars.API_LOCATION
-      let endpoint = apiLocation + 'image_search/' + id
-      // Add parameters if we are sent them
-      fetch(endpoint)
-        .then((response) => response.json())
-        .then((data) => {
-          if (data.status == 'success') this.biolucidaData = data
-        })
+    getBiolucidaInfo: function () {
+      const dataset_images = [];
+      const biolucida2DItems = 'biolucida-2d' in this.entry ? this.entry['biolucida-2d'] :[];
+      const biolucida3DItems = 'biolucida-3d' in this.entry ? this.entry['biolucida-3d'] :[];
+      // We use information from SciCrunch to create the sharelink
+      biolucida2DItems.concat(biolucida3DItems).forEach((bObject) => {
+        const image_id = bObject.biolucida?.identifier;
+        if (image_id) {
+          const sourcepkg_id = 'identifier' in bObject ? bObject['identifier'] : "";
+          // The encoded string is in the following format -
+          // ${image_id}-col-${collection_id}, collection id can be any valid collection id
+          // and 260 is used for now.
+          const code = encodeURIComponent(Base64.encode(`${image_id}-col-260`));
+          const share_link = `https://sparc.biolucida.net/image?c=${code}`
+          dataset_images.push({
+            share_link,
+            image_id,
+            sourcepkg_id,
+          });
+        }
+      });
+      if (dataset_images.length > 0) {
+        this.biolucidaData = { dataset_images };
+      }
     },
     updateCopyContent: function () {
       const contentArray = [];

package/src/components/ImageGallery.vue

@@ -33,7 +33,7 @@ import GalleryHelper from '@abi-software/gallery/src/mixins/GalleryHelpers.js'
 import Gallery from "@abi-software/gallery";
 import "@abi-software/gallery/dist/style.css";
 //provide the s3Bucket related methods and data.
-import S3Bucket from '../mixins/S3Bucket.vue'
+import S3Bucket from '../mixins/S3Bucket.vue';
 
 export default {
   name: 'ImageGallery',

package/src/components/Tabs.vue

@@ -61,6 +61,8 @@ $tab-height: 30px;
   height: $tab-height;
   display: flex;
   flex-direction: row;
+  position: relative;
+  z-index: 1;
 }
 
 .title {

package/src/exampleConnectivityInput.js

@@ -285,5 +285,6 @@ export default {
         "Homo sapiens",
         "Canis lupus familiaris",
         "Domestic Pig"
-    ]
+    ],
+    "knowledge-source": "sckan-2024-03-26-npo",
 }