@abi-software/mapintegratedvuer 1.10.1-beta.0 → 1.10.1

package/src/components/viewers/MultiFlatmap.vue

@@ -231,6 +231,12 @@ export default {
         'location': selectionsTitle
       });
     },
+    onSidebarAnnotationClose: function() {
+      if (this.flatmapReady) {
+        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
+        currentFlatmap.annotationEventCallback({}, { type: 'aborted' })
+      }
+    },
     onOpenPubmedUrl: function (url) {
       // GA Tagging
       // Event tracking for open pubmed url from popup
@@ -341,7 +347,7 @@ export default {
         const flatmapImp = flatmap.mapImp;
         this.flatmapMarkerUpdate(flatmapImp);
         this.updateProvCard();
-        this.updateSettings();
+        this.updateViewerSettings();
         this.loadConnectivityExplorerConfig(flatmap);
         EventBus.emit("mapLoaded", flatmap);
       }
@@ -426,25 +432,45 @@ export default {
       const flatmap = this.$refs.multiflatmap.getCurrentFlatmap();
       flatmap.changeViewingMode(modeName);
     },
+    showConnectivity: function (payload) {
+      if (this?.alive && this.flatmapReady && this.$refs.multiflatmap) {
+        const { featureIds, offset } = payload;
+        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
+        if (currentFlatmap) {
+          currentFlatmap.moveMap(featureIds, {
+            offsetX: offset ? -150 : 0,
+            zoom: 4,
+          });
+        }
+      }
+    },
     showConnectivityTooltips: function (payload) {
       if (this?.alive && this.flatmapReady) {
         const flatmap = this.$refs.multiflatmap.getCurrentFlatmap();
         flatmap.showConnectivityTooltips(payload);
       }
     },
+    showConnectivitiesByReference: function (payload) {
+      if (this?.alive && this.flatmapReady && this.$refs.multiflatmap) {
+        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
+        if (currentFlatmap) {
+          currentFlatmap.showConnectivitiesByReference(payload);
+        }
+      }
+    },
     changeConnectivitySource: function (payload) {
       if (this?.alive && this.flatmapReady) {
         const flatmap = this.$refs.multiflatmap.getCurrentFlatmap();
         flatmap.changeConnectivitySource(payload);
       }
     },
-    updateSettings: function () {
+    updateViewerSettings: function () {
       const {
         backgroundDisplay,
         viewingMode,
         flightPathDisplay,
         organsDisplay,
-        outlines,
+        outlinesDisplay,
       } = this.settingsStore.globalSettings;
 
       if (this.flatmapReady) {
@@ -453,7 +479,7 @@ export default {
         currentFlatmap.changeViewingMode(viewingMode);
         currentFlatmap.setFlightPath3D(flightPathDisplay);
         currentFlatmap.setColour(organsDisplay);
-        currentFlatmap.setOutlines(outlines);
+        currentFlatmap.setOutlines(outlinesDisplay);
         currentFlatmap.backgroundChangeCallback(backgroundDisplay);
       }
     },
@@ -481,84 +507,6 @@ export default {
   },
   mounted: function () {
     this.getFeaturedDatasets();
-
-    EventBus.on('annotation-close', () => {
-      if (this?.alive && this.flatmapReady && this.$refs.multiflatmap) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        currentFlatmap.annotationEventCallback({}, { type: 'aborted' })
-      }
-    });
-
-    EventBus.on('show-connectivity', (payload) => {
-      const { featureIds, offset } = payload;
-      if (this?.alive && this.flatmapReady && this.$refs.multiflatmap) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        if (currentFlatmap) {
-          currentFlatmap.moveMap(featureIds, {
-            offsetX: offset ? -150 : 0,
-            zoom: 4,
-          });
-        }
-      }
-    });
-
-    EventBus.on('show-reference-connectivities', (payload) => {
-      if (this?.alive && this.flatmapReady && this.$refs.multiflatmap) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        if (currentFlatmap) {
-          currentFlatmap.showConnectivitiesByReference(payload);
-        }
-      }
-    });
-
-    EventBus.on('connectivity-hovered', (payload) => {
-      this.showConnectivityTooltips(payload);
-    });
-
-    EventBus.on('connectivity-source-change', (payload) => {
-      this.changeConnectivitySource(payload);
-    });
-
-    EventBus.on("markerUpdate", () => {
-      if (this?.alive && this.flatmapReady) {
-        this.flatmapMarkerUpdate(this.$refs.multiflatmap.getCurrentFlatmap().mapImp);
-      }
-    });
-    EventBus.on("hoverUpdate", () => {
-      if (this?.alive && this.flatmapReady) {
-        this.cardHoverHighlight();
-      }
-    });
-    EventBus.on('viewingModeUpdate', (payload) => {
-      if (this?.alive && this.flatmapReady) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        currentFlatmap.changeViewingMode(payload);
-      }
-    });
-    EventBus.on('flightPathUpdate', (payload) => {
-      if (this?.alive && this.flatmapReady) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        currentFlatmap.setFlightPath3D(payload);
-      }
-    });
-    EventBus.on('organsDisplayUpdate', (payload) => {
-      if (this?.alive && this.flatmapReady) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        currentFlatmap.setColour(payload);
-      }
-    });
-    EventBus.on('outlinesDisplayUpdate', (payload) => {
-      if (this?.alive && this.flatmapReady) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        currentFlatmap.setOutlines(payload);
-      }
-    });
-    EventBus.on('backgroundDisplayUpdate', (payload) => {
-      if (this?.alive && this.flatmapReady) {
-        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
-        currentFlatmap.backgroundChangeCallback(payload);
-      }
-    });
   },
 };
 </script>

package/src/components/viewers/Scaffold.vue

@@ -142,8 +142,8 @@ export default {
         if (this.entry.rotation) rotation = this.entry.rotation;
         this.$refs.scaffold.toggleSyncControl(this.splitFlowStore.globalCallback, rotation);
         if (this.splitFlowStore.syncMode) this.$refs.scaffold.fitWindow();
-        this.updateSettings();
       }
+      this.updateViewerSettings();
       EventBus.emit("mapLoaded", this.$refs.scaffold);
     },
     requestSynchronisedEvent: function (flag) {
@@ -195,14 +195,17 @@ export default {
     changeViewingMode: function (modeName) {
       this.$refs.scaffold.changeViewingMode(modeName);
     },
-    updateSettings: function () {
+    updateViewerSettings: function () {
       const {
         backgroundDisplay,
+        organsDisplay,
+        outlinesDisplay,
         viewingMode,
       } = this.settingsStore.globalSettings;
-
       this.$refs.scaffold.backgroundChangeCallback(backgroundDisplay);
       this.$refs.scaffold.changeViewingMode(viewingMode);
+      this.$refs.scaffold.setColour(organsDisplay);
+      this.$refs.scaffold.setOutlines(outlinesDisplay);
     },
   },
   computed: {
@@ -227,24 +230,6 @@ export default {
   mounted: function () {
     this.scaffoldCamera =
       this.$refs.scaffold.$module.scene.getZincCameraControls();
-    EventBus.on("startHelp", () => {
-      this.startHelp();
-    });
-    EventBus.on("hoverUpdate", () => {
-      if (this.scaffoldLoaded && this?.alive) {
-        this.cardHoverHighlight();
-      }
-    });
-    EventBus.on('backgroundDisplayUpdate', (payload) => {
-      if (this?.alive) {
-        this.$refs.scaffold.backgroundChangeCallback(payload);
-      }
-    });
-    EventBus.on('viewingModeUpdate', (payload) => {
-      if (this?.alive) {
-        this.$refs.scaffold.changeViewingMode(payload);
-      }
-    });
   },
 };
 </script>

package/src/mixins/ContentMixin.js

@@ -62,8 +62,6 @@ export default {
     this.alive = false;
   },
   mounted: function () {
-    EventBus.on("startHelp", this.startHelp);
-    EventBus.on('connectivity-item-close', this.onConnectivityItemClose);
     this.multiflatmapRef = this.$refs.multiflatmap;
     this.flatmapRef = this.$refs.flatmap;
     this.scaffoldRef = this.$refs.scaffold;
@@ -228,11 +226,13 @@ export default {
     },
     resourceHasAction: function (resource) {
       return (
-        resource.type === "URL" ||
-        resource.type === "Search" ||
-        resource.type === "Neuron Search" ||
-        resource.type == "Facet" ||
-        resource.type == "Facets"
+        resource && (
+          resource.type === "URL" ||
+          resource.type === "Search" ||
+          resource.type === "Neuron Search" ||
+          resource.type == "Facet" ||
+          resource.type == "Facets"
+        )
       );
     },
     /**
@@ -425,6 +425,9 @@ export default {
     onResize: function () {
       return;
     },
+    updateViewerSettings: function() {
+      return;
+    },
     startHelp: function () {
       if (this?.alive) {
         if (this.isInHelp === false) {
@@ -515,8 +518,11 @@ export default {
       toHighlight = [...new Set(toHighlight)];
       return toHighlight;
     },
-    cardHoverHighlight: function () {
-      if (this.visible) {
+    sidebarHoverHighlight: function (payload) {
+      if (this.visible && (
+        ((this.flatmapRef || this.multiflatmapRef) && this.flatmapReady) ||
+        (this.scaffoldRef && this.scaffoldLoaded))
+      ) {
         const hoverAnatomies = this.settingsStore.hoverAnatomies;
         const hoverOrgans = this.settingsStore.hoverOrgans;
         const hoverDOI = this.settingsStore.hoverDOI;
@@ -533,6 +539,10 @@ export default {
         if (!hoverAnatomies.length && !hoverOrgans.length && !hoverDOI && !hoverConnectivity.length) {
           if ((this.multiflatmapRef || this.flatmapRef) && flatmap) {
             flatmap.mapImp?.clearSearchResults();
+            if (payload.connectivitySearch) {
+              // grey out all connectivity if no search results
+              flatmap.mapImp?.setPaint({ dimmed: true })
+            }
           } else if (this.scaffoldRef && scaffold) {
             scaffold.changeHighlightedByName(hoverOrgans, "", false);
           }
@@ -574,7 +584,7 @@ export default {
       EventBus.emit('annotation-open', payload);
     },
     onAnnotationClose: function () {
-      EventBus.emit('annotation-close');
+      EventBus.emit('sidebar-annotation-close');
     },
     updateOfflineAnnotationEnabled: function (payload) {
       EventBus.emit('update-offline-annotation-enabled', payload);
@@ -588,6 +598,21 @@ export default {
     onConnectivityInfoClose: function () {
       EventBus.emit('connectivity-info-close');
     },
+    onSidebarAnnotationClose: function() {
+      return;
+    },
+    showConnectivity: function(payload) {
+      return;
+    },
+    showConnectivitiesByReference: function(payload) {
+      return;
+    },
+    showConnectivityTooltips: function(payload) {
+      return;
+    },
+    changeConnectivitySource: function(payload) {
+      return;
+    },
     loadConnectivityExplorerConfig: async function (flatmap) {
       const flatmapImp = flatmap.mapImp;
       const sckanVersion = getKnowledgeSource(flatmapImp);

package/src/stores/settings.js

@@ -56,6 +56,13 @@ export const useSettingsStore = defineStore('settings', {
       );
       return state.featuredMarkerDois[index];
     },
+    getGlobalSettings: state => () => {
+      const globalSettings = {};
+      for (const [key, value] of Object.entries(state.globalSettings)) {
+        globalSettings[key] = value;
+      }
+      return globalSettings;
+    },
     getUpdatedGlobalSettingsKey: state => settings => {
       let updatedSettings = [];
       for (const [key, value] of Object.entries(settings)) {