@abi-software/flatmapvuer 1.9.0-beta.2 → 1.9.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.9.0-beta.2",
+  "version": "1.9.0-beta.4",
   "license": "Apache-2.0",
   "files": [
     "dist/*",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@abi-software/flatmap-viewer": "4.2.0",
-    "@abi-software/map-utilities": "^1.5.0-beta.2",
+    "@abi-software/map-utilities": "^1.5.0-beta.3",
     "@abi-software/sparc-annotation": "0.3.2",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",

package/src/components/FlatmapVuer.vue

@@ -1823,54 +1823,35 @@ export default {
       const featuresToHighlight = [];
       const geojsonHighlights = [];
       const connectivityData = [];
-      const filteredConnectivityData = [];
       const errorData = [];
 
-      if (!data.length) {
-        // Close all tooltips on the current flatmap element
-        this.removeActiveTooltips();
-      } else {
-        data.forEach((item) => {
-          connectivityData.push({
-            id: item.id,
-            label: item.label,
-          });
-        });
-      }
-
       // to keep the highlighted path on map
       if (connectivityInfo && connectivityInfo.featureId) {
         featuresToHighlight.push(...connectivityInfo.featureId);
       }
 
-      // search the features on the map first
       if (this.mapImp) {
-        connectivityData.forEach((connectivity, i) => {
-          const {id, label} = connectivity;
-          const response = this.mapImp.search(id);
+        // search the features on the map first
+        data.forEach((connectivity) => {
+          const response = this.mapImp.search(connectivity.id);
 
           if (response?.results.length) {
             const featureId = response?.results[0].featureId;
-
-            filteredConnectivityData.push({
-              featureId,
-              id,
-              label,
-            });
+            connectivityData.push({ featureId, ...connectivity });
           } else {
             errorData.push(connectivity);
           }
         });
 
-        if (filteredConnectivityData.length) {
-          let geojsonId = filteredConnectivityData[0].featureId;
+        if (connectivityData.length) {
+          let geojsonId = connectivityData[0].featureId;
 
           this.mapImp.annotations.forEach((annotation) => {
             const anatomicalNodes = annotation['anatomical-nodes'];
 
             if (anatomicalNodes) {
               const anatomicalNodesString = anatomicalNodes.join('');
-              const foundItem = filteredConnectivityData.every((item) =>
+              const foundItem = connectivityData.every((item) =>
                 anatomicalNodesString.indexOf(item.id) !== -1
               );
 
@@ -1881,17 +1862,14 @@ export default {
             }
           });
 
-          this.createTooltipForConnectivity(filteredConnectivityData, geojsonId);
+          this.createTooltipForConnectivity(connectivityData, geojsonId);
         } else {
-          errorData.push(...connectivityData);
           // Close all tooltips on the current flatmap element
           this.removeActiveTooltips();
         }
 
-        // Emit error message for connectivity graph
-        if (errorData.length) {
-          this.emitConnectivityGraphError(errorData);
-        }
+        // Emit error message for connectivity
+        this.emitConnectivityError(errorData);
 
         // highlight all available features
         const featureIdsToHighlight = this.mapImp.modelFeatureIdList(featuresToHighlight);
@@ -1919,8 +1897,8 @@ export default {
       }
       return featureIds;
     },
-    emitConnectivityGraphError: function (errorData) {
-      this.$emit('connectivity-graph-error', {
+    emitConnectivityError: function (errorData) {
+      this.$emit('connectivity-error', {
         data: {
           errorData: errorData,
           errorMessage: ERROR_MESSAGE,
@@ -2058,7 +2036,7 @@ export default {
             }
             if (featureId) {
               const feature = this.mapImp.featureProperties(featureId)
-              if (!tooltip.components.includes(feature.label)) {
+              if (feature.label && !tooltip.components.includes(feature.label)) {
                 tooltip.components.push(feature.label)
                 tooltip.componentsWithDatasets.push({ id: feature.models, name: feature.label })
               }
@@ -2067,7 +2045,7 @@ export default {
           featureIds = [...new Set(featureIds)].filter(id => id !== data.feature.featureId)
           featureIds.forEach((id) => {
             const feature = this.mapImp.featureProperties(id)
-            if (!tooltip.destinations.includes(feature.label)) {
+            if (feature.label && !tooltip.destinations.includes(feature.label)) {
               tooltip.destinations.push(feature.label)
               tooltip.destinationsWithDatasets.push({ id: feature.models, name: feature.label })
             }

package/src/components/MultiFlatmapVuer.vue

@@ -68,7 +68,7 @@
       :connectivityInfoSidebar="connectivityInfoSidebar"
       @connectivity-info-open="onConnectivityInfoOpen"
       @connectivity-info-close="onConnectivityInfoClose"
-      @connectivity-graph-error="onConnectivityGraphError"
+      @connectivity-error="onConnectivityError"
       @open-map="$emit('open-map', $event)"
       @pathway-selection-changed="onSelectionsDataChanged"
       :minZoom="minZoom"
@@ -295,8 +295,8 @@ export default {
     onConnectivityInfoOpen: function (entryData) {
       this.$emit('connectivity-info-open', entryData);
     },
-    onConnectivityGraphError: function (errorInfo) {
-      this.$emit('connectivity-graph-error', errorInfo);
+    onConnectivityError: function (errorInfo) {
+      this.$emit('connectivity-error', errorInfo);
     },
     onSelectionsDataChanged: function (data) {
       this.$emit('pathway-selection-changed', data);

package/src/services/flatmapKnowledge.js

@@ -27,9 +27,13 @@ async function getReferenceConnectivitiesByAPI(mapImp, resource, flatmapQueries)
 }
 
 function getKnowledgeSource(mapImp) {
+  return getKnowledgeSourceFromProvenance(mapImp.provenance);
+}
+
+function getKnowledgeSourceFromProvenance(provenance) {
   let mapKnowledgeSource = '';
-  if (mapImp.provenance?.connectivity) {
-    const sckanProvenance = mapImp.provenance.connectivity;
+  if (provenance?.connectivity) {
+    const sckanProvenance = provenance.connectivity;
     if ('knowledge-source' in sckanProvenance) {
       mapKnowledgeSource = sckanProvenance['knowledge-source'];
     } else if ('npo' in sckanProvenance) {
@@ -97,5 +101,6 @@ export {
   getReferenceConnectivitiesByAPI,
   loadAndStoreKnowledge,
   getKnowledgeSource,
+  getKnowledgeSourceFromProvenance,
   refreshFlatmapKnowledgeCache,
 }

package/vite.config.js

@@ -50,12 +50,16 @@ export default defineConfig(({ command, mode }) => {
         fileName: 'flatmapvuer',
       },
       rollupOptions: {
-        external: ["vue", "@abi-software/svg-sprite", "@abi-software/map-utilities"],
+        external: ["vue", "@abi-software/sparc-annotation", "@abi-software/svg-sprite", "@abi-software/map-utilities",
+          "@element-plus/icons-vue", "pinia"],
         output: {
           globals: {
             vue: "Vue",
+            "@abi-software/sparc-annotation": "@abi-software/sparc-annotation",
             "@abi-software/svg-sprite": "@abi-software/svg-sprite",
-            "@abi-software/map-utilities": "@abi-software/map-utilities"
+            "@abi-software/map-utilities": "@abi-software/map-utilities",
+            "@element-plus/icons-vue": "@element-plus/icons-vue",
+            "pinia": "pinia"
           },
         },
       },