@abi-software/mapintegratedvuer 1.6.3 → 1.6.4-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.6.3",
+  "version": "1.6.4-beta.1",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -50,9 +50,9 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^1.6.1",
-    "@abi-software/map-side-bar": "^2.5.2",
-    "@abi-software/map-utilities": "^1.2.1",
+    "@abi-software/flatmapvuer": "^1.6.2-beta.2",
+    "@abi-software/map-side-bar": "^2.5.3-beta.5",
+    "@abi-software/map-utilities": "^1.2.2-beta.1",
     "@abi-software/plotvuer": "^1.0.3",
     "@abi-software/scaffoldvuer": "^1.6.2",
     "@abi-software/simulationvuer": "^1.0.1",
@@ -81,6 +81,7 @@
     "concurrently": "^8.2.2",
     "cypress": "^13.13.0",
     "cypress-multi-reporters": "^1.6.4",
+    "cypress-visual-regression": "^5.2.2",
     "cypress-wait-until": "^1.7.1",
     "dom-parser": "^0.1.6",
     "eslint": "^8.56.0",

package/src/components/viewers/Flatmap.vue

@@ -3,6 +3,7 @@
     <FlatmapVuer
       :state="entry.state"
       :entry="entry.resource"
+      :mapManager="mapManager"
       @resource-selected="flatmaprResourceSelected(entry.type, $event)"
       @pan-zoom-callback="flatmapPanZoomCallback"
       :name="entry.resource"
@@ -32,6 +33,7 @@
       :sparcAPI="apiLocation"
       @open-map="openMap"
       @pathway-selection-changed="onPathwaySelectionChanged"
+      @mapmanager-loaded="onMapmanagerLoaded"
     />
 
     <HelpModeDialog

package/src/components/viewers/MultiFlatmap.vue

@@ -5,6 +5,7 @@
       @flatmapChanged="flatmapChanged"
       @ready="multiFlatmapReady"
       :state="entry.state"
+      :mapManager="mapManager"
       @resource-selected="flatmaprResourceSelected(entry.type, $event)"
       style="height: 100%; width: 100%"
       :initial="entry.resource"
@@ -33,6 +34,7 @@
       @finish-help-mode="endHelp"
       @pathway-selection-changed="onPathwaySelectionChanged"
       @open-pubmed-url="onOpenPubmedUrl"
+      @mapmanager-loaded="onMapmanagerLoaded"
     />
 
     <HelpModeDialog
@@ -450,8 +452,9 @@ export default {
     this.getFeaturedDatasets();
 
     EventBus.on('annotation-close', (payload) => {
-      if (payload?.tabClose && this.$refs.multiflatmap.getCurrentFlatmap()) {
-        this.$refs.multiflatmap.getCurrentFlatmap().annotationEventCallback({}, { type: 'aborted' })
+      if (payload?.tabClose && this.flatmapReady && this.$refs.multiflatmap) {
+        const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
+        currentFlatmap.annotationEventCallback({}, { type: 'aborted' })
       }
     });
 

package/src/mixins/ContentMixin.js

@@ -77,6 +77,9 @@ export default {
 
       this.onConnectivityInfoClose();
     },
+    onMapmanagerLoaded: function (mapManager) {
+      this.settingsStore.updateMapManager(mapManager);
+    },
     trackOpenMap: function (category) {
       // GA Tagging
       // Open map tracking
@@ -525,6 +528,7 @@ export default {
       scaffoldLoaded: false,
       isInHelp: false,
       hoverDelay: undefined,
+      mapManager: undefined,
     };
   },
   created: function () {
@@ -534,6 +538,9 @@ export default {
       this.flatmapAPI = this.settingsStore.flatmapAPI;
     if (this.settingsStore.sparcApi)
       this.apiLocation = this.settingsStore.sparcApi;
+    if (this.settingsStore.mapManager) {
+      this.mapManager = this.settingsStore.mapManager;
+    }
   },
   watch: {
     helpMode: function (newVal) {

package/src/stores/settings.js

@@ -14,6 +14,7 @@ export const useSettingsStore = defineStore('settings', {
       flatmapAPI: undefined,
       nlLinkPrefix: undefined,
       flatmapAPI2: "https://mapcore-demo.org/curation/flatmap/",
+      mapManager: undefined,
       rootUrl: undefined,
       facets: { species: [], gender: [], organ: [] },
       numberOfDatasetsForFacets: [],
@@ -67,6 +68,9 @@ export const useSettingsStore = defineStore('settings', {
     updateFlatmapAPI2(flatmapAPI2) {
       this.flatmapAPI2 = flatmapAPI2;
     },
+    updateMapManager(mapManager) {
+      this.mapManager = mapManager;
+    },
     updateNLLinkPrefix(nlLinkPrefix) {
       this.nlLinkPrefix = nlLinkPrefix;
     },

package/vite.bundle-build.js

@@ -12,11 +12,13 @@ export default defineConfig((configEnv) => {
       fileName: "mapintegratedvuer",
     },
     rollupOptions: {
-      external: ["vue", "pinia"],
+      external: ["vue", "pinia", "@abi-software/plotvuer", "@abi-software/simulationvuer"],
       output: {
         globals: {
           vue: "Vue",
           pinia: "pinia",
+          "@abi-software/simulationvuer": "simulationvuer",
+          "@abi-software/plotvuer": "plotvuer",
         },
       },
     },