@abi-software/mapintegratedvuer 1.3.4-beta.2 → 1.3.4-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.3.4-beta.2",
+  "version": "1.3.4-beta.3",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",

package/src/App.vue

@@ -23,9 +23,6 @@
                 <el-button @click="setFlatmap()" size="small">Set Flatmap</el-button>
                 <el-button @click="setSearch()" size="small">Set Search</el-button>
               </el-row>
-              <el-row class="row" :gutter="20">
-                <el-button @click="changeViewingMode('Annotation')" size="small">Switch to Annotation View</el-button>
-              </el-row>
             </div>
             <template #reference>
 
@@ -172,6 +169,7 @@ export default {
     },
     mapIsReady: function() {
       console.log("map is ready")
+      // this.changeViewingMode('Annotation')
     },
     parseQuery: function () {
       this.$router.isReady().then(() => {

package/src/components/ContentVuer.vue

@@ -138,9 +138,6 @@ export default {
     onResize: function () {
       this.$refs.viewer?.onResize();
     },
-    changeViewingMode: function(modeName) {
-      this.$refs.viewer?.changeViewingMode(modeName);
-    },
   },
   data: function () {
     return {

package/src/components/MapContent.vue

@@ -266,11 +266,6 @@ export default {
      */
     flowMounted: function () {
       this._flowMounted = true;
-      /**
-       * This event emit when the component is mounted.
-       */
-      this.$emit("isReady");
-
       // GA Tagging
       // Page view tracking for maps' buttons click on portal
       // category: AC | FC | WholeBody
@@ -281,7 +276,7 @@ export default {
       });
     },
     changeViewingMode: function(modeName) {
-      this.$refs.flow.changeViewingMode(modeName);
+      EventBus.emit("changeViewingMode", modeName);
     },
   },
   computed: {
@@ -329,6 +324,12 @@ export default {
     if (!this.state) {
       this.initialState = await initialState(this.startingMap, this.options.sparcApi);
     }
+    EventBus.on('mapReady', () => {
+      /**
+       * This event emit when the component is mounted and map is ready.
+       */
+      if (this._flowMounted) this.$emit("isReady");
+    });
     this.isReady = true;
     this.settingsStore.updateUseHelpModeDialog(this.useHelpModeDialog);
     this.settingsStore.updateConnectivityInfoSidebar(this.connectivityInfoSidebar);

package/src/components/SplitFlow.vue

@@ -502,11 +502,6 @@ export default {
         activeCanvas.click();
       }
     },
-    changeViewingMode: function(modeName) {
-      let splitdialog = this.$refs.splitdialog;
-      const activeContents = splitdialog.getActiveContents();
-      activeContents.forEach(content => content.changeViewingMode(modeName));
-    },
   },
   created: function () {
     this._facets = [];

package/src/components/viewers/Flatmap.vue

@@ -103,6 +103,7 @@ export default {
       if (this.entry.resource === "FunctionalConnectivity"){
         this.flatmapReadyForMarkerUpdates(flatmap);
       }
+      EventBus.emit("mapReady", flatmap);
     },
     onPathwaySelectionChanged: function (data) {
       const { label, property, checked, selectionsTitle } = data;
@@ -159,8 +160,7 @@ export default {
       }
     },
     changeViewingMode: function (modeName) {
-      const flatmap = this.$refs.flatmap.mapImp;
-      flatmap.changeViewingMode(modeName);
+      this.$refs.flatmap.changeViewingMode(modeName);
     },
   },
   computed: {
@@ -185,6 +185,9 @@ export default {
         });
       }
     });
+    EventBus.on("changeViewingMode", (modeName) => {
+      this.changeViewingMode(modeName);
+    });
   },
 };
 </script>

package/src/components/viewers/MultiFlatmap.vue

@@ -329,6 +329,7 @@ export default {
         const flatmapImp = flatmap.mapImp;
         this.flatmapMarkerUpdate(flatmapImp);
         this.updateProvCard();
+        EventBus.emit("mapReady", flatmap);
       }
     },
     getFlatmapImp: function () {
@@ -458,6 +459,11 @@ export default {
         this.mapHoverHighlight(this.$refs.multiflatmap.getCurrentFlatmap().mapImp);
       }
     });
+    EventBus.on("changeViewingMode", (modeName) => {
+      if (this.flatmapReady) {
+        this.changeViewingMode(modeName);
+      }
+    });
   },
 };
 </script>

package/src/components/viewers/Scaffold.vue

@@ -139,6 +139,7 @@ export default {
         this.$refs.scaffold.toggleSyncControl(this.splitFlowStore.globalCallback, rotation);
         if (this.splitFlowStore.syncMode) this.$refs.scaffold.fitWindow();
       }
+      EventBus.emit("mapReady", this.$refs.scaffold);
     },
     requestSynchronisedEvent: function (flag) {
       if (this.scaffoldLoaded) {
@@ -220,6 +221,11 @@ export default {
         this.mapHoverHighlight(this.$refs.scaffold);
       }
     });
+    EventBus.on("changeViewingMode", (modeName) => {
+      if (this.scaffoldLoaded) {
+        this.changeViewingMode(modeName);
+      }
+    });
   },
 };
 </script>

package/src/stores/index.js

@@ -8,7 +8,7 @@ import { defineStore } from 'pinia'
 export const useMainStore = defineStore('main', {
   state: () => ({
     userProfile: {
-      token: ''
+      token: 'eyJraWQiOiJ1UUMzRDl1RGpTTlhoNzZJRW1ldExcL05uOGRMazFyaU1LWSt5T2ZTUytHaz0iLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJjNDhmZDkyOS0wYjIwLTQxNjEtOTEyZi03NTBmMGZiY2VkNWQiLCJ0b2tlbl91c2UiOiJhY2Nlc3MiLCJzY29wZSI6Im9wZW5pZCIsImF1dGhfdGltZSI6MTcyMzA3ODgyOCwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfRlZMaEo3Q1FBIiwiZXhwIjoxNzIzMDgyNDI4LCJpYXQiOjE3MjMwNzg4MjgsInZlcnNpb24iOjIsImp0aSI6ImZiZDZiYmU5LWQwNjgtNGI1Ni05ZTcwLTJkZTJhMmFhNTdjYSIsImNsaWVudF9pZCI6IjcwM2xtNWQ4b2RjY3UyMXBhZ2NmamtlYWVhIiwidXNlcm5hbWUiOiJjNDhmZDkyOS0wYjIwLTQxNjEtOTEyZi03NTBmMGZiY2VkNWQifQ.QbLut-N287n6cPFl8KLytSsyv6OREwS30Xy_ydc-g5tOKItmAKry40MWQTDJNTXj8qetxn-dDsnvlwPm9Bf-L6cgKQcBRdKfTQ551PGLhkoSbCJYPFD7O1HRcf3WAdOU1uqmlSoQ-qlvX0r3GfYGgqctWghK4SmZyI6IsIe2-c6yl_A0mJDUwOL0Hfv7TKb0i_bGX-cxnDnGP0GJC8Szp4497PXb9iugbPosj-VWHmS_gKNt4SaByiUx0jmtfzCODMMjCjVNuZinc65xd1obPxiIuFPozLw2Ju6st7ShPz8iBG_r_uj9pfxiHSBEZDMvA4fMT9J_3CspVqs5iI5YYw'
     },
   }),
   getters: {