@abi-software/map-side-bar 2.10.2 → 2.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.10.2",
+  "version": "2.10.4",
   "files": [
     "dist/*",
     "src/*",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@abi-software/gallery": "^1.2.0",
-    "@abi-software/map-utilities": "^1.7.0",
+    "@abi-software/map-utilities": "1.7.2",
     "@abi-software/svg-sprite": "^1.0.2",
     "@element-plus/icons-vue": "^2.3.1",
     "algoliasearch": "^4.10.5",

package/src/algolia/algolia.js

@@ -292,33 +292,27 @@ export class AlgoliaClient {
     const anatomyOrganCategoryNames = anatomyOrganCategoryName ? Object.keys(anatomyOrganCategoryName) : []
     const anatomyOrganSubcategoryNames = anatomyOrganSubcategoryName ? Object.keys(anatomyOrganSubcategoryName) : []
     const anatomyOrganSubsubcategoryNames = anatomyOrganSubsubcategoryName ? Object.keys(anatomyOrganSubsubcategoryName) : []
-
-    const filteredOrganNames = [];
+    const filteredOrganNames = []
+  
     anatomyOrganCategoryNames.forEach((_categoryName) => {
       const categoryName = _categoryName.toLowerCase();
       anatomyOrganNames.forEach((_organName) => {
         const organName = _organName.toLowerCase();
+        //This will be incorrect for subsubcategory
         const fullName = `${categoryName}.${organName}`
         const foundNamesInSubsub = []
-
         const found = anatomyOrganSubcategoryNames.some((_subcategoryName) => {
           const subcategoryName = _subcategoryName.toLowerCase();
           if (subcategoryName === fullName) {
-            const foundNameInSubsub = anatomyOrganSubsubcategoryNames.find((name) => name.toLocaleLowerCase().includes(subcategoryName))
-            if (foundNameInSubsub) {
-              const subsubOrganName = foundNameInSubsub.replace(`${subcategoryName}.`, '');
-              if (anatomyOrganNames.map((name) => name.toLowerCase()).includes(subsubOrganName)) {
-                foundNamesInSubsub.push(subsubOrganName)
-              }
-            }
             return true
+          } else {
+            return anatomyOrganSubsubcategoryNames.find((name) => {
+              const fullsubsubname = `${subcategoryName}.${organName}`
+              return (fullsubsubname === name) 
+            })
           }
         });
 
-        if (foundNamesInSubsub.length) {
-          filteredOrganNames.push(...foundNamesInSubsub.map(name => name.toLowerCase()))
-        }
-
         if (found) {
           filteredOrganNames.push(organName);
         }

package/src/components/BadgesGroup.vue

@@ -85,9 +85,10 @@ export default {
       deep: true,
       immediate: true,
       handler: function () {
+        this.addToCategories(this.entry.flatmaps, 'Flatmaps')
+        this.addToCategories(this.entry.plots, 'Plots')
         this.addToCategories(this.entry.scaffolds, 'Scaffolds')
         this.addToCategories(this.entry.segmentation, 'Segmentations')
-        this.addToCategories(this.entry.plots, 'Plots')
         this.addSimulationsToCategories(this.entry.simulation)
         /** disable the following
         this.addToCategories(this.entry.images, 'Images');

package/src/components/DatasetExplorer.vue

@@ -462,7 +462,9 @@ export default {
               ? element['abi-contextual-information']
               : undefined,
           segmentation: element['mbf-segmentation'],
+          //omex format will be the preferred mimetype
           simulation: element['abi-simulation-omex-file'] ? element['abi-simulation-omex-file'] : element['abi-simulation-file'],
+          flatmaps: element['abi-flatmap-file'],
           additionalLinks: element.additionalLinks,
           detailsReady: true,
         })

package/src/components/ImageGallery.vue

@@ -92,6 +92,7 @@ export default {
         //Use the Images instead for Biolucida Images
         //"Biolucida Images": [],
         Dataset: [],
+        Flatmaps:[],
         Images: [],
         Scaffolds: [],
         Segmentations: [],
@@ -123,6 +124,7 @@ export default {
     createSciCurnchItems: function () {
       this.updateS3Bucket(this.entry.s3uri)
       this.createDatasetItem()
+      this.createFlatmapItems()
       this.createScaffoldItems()
       this.createSimulationItems()
       this.createPlotItems()
@@ -147,6 +149,48 @@ export default {
         })
       }
     },
+    createFlatmapItems: function () {
+      if (this.entry.flatmaps) {
+        this.entry.flatmaps.forEach((flatmap) => {
+          if (flatmap.associated_flatmap?.identifier) {
+            const filePath = flatmap.dataset.path
+            const id = flatmap.identifier
+            const thumbnail = this.getThumbnailForPlot(
+              flatmap,
+              this.entry.thumbnails
+            )
+            let thumbnailURL = undefined
+            let mimetype = ''
+            if (thumbnail) {
+              thumbnailURL = this.getImageURL(this.envVars.API_LOCATION, {
+                id,
+                prefix: this.getS3Prefix(),
+                file_path: thumbnail.dataset.path,
+                s3Bucket: this.s3Bucket,
+              })
+              mimetype = thumbnail.mimetype.name
+            }
+            let action = {
+              label: capitalise(this.label),
+              resource: flatmap.associated_flatmap.identifier,
+              title: 'View Flatmap',
+              type: 'Flatmap',
+              discoverId: this.datasetId,
+              version: this.datasetVersion,
+            }
+            this.items['Flatmaps'].push({
+              id,
+              title: baseName(filePath),
+              type: 'Flatmap',
+              thumbnail: thumbnailURL,
+              userData: action,
+              hideType: true,
+              mimetype,
+            })
+          }
+        })
+      }
+    },
     createImageItems: function () {
       if (this.entry.images) {
         this.entry.images.forEach((image) => {
@@ -348,6 +392,8 @@ export default {
           } else {
             const filePath = simulation.dataset.path
             const id = simulation.identifier
+            //Despite of the name, this method can be used to retreive
+            //the thumbnail information for any none scaffold type thumbnail
             const thumbnail = this.getThumbnailForPlot(
               simulation,
               this.entry.thumbnails

package/src/components/index.js

@@ -3,6 +3,3 @@ import SideBar from "./SideBar.vue"
 export {
   SideBar
 };
-
-
-