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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abi-software/mapintegratedvuer",
3
- "version": "1.6.3",
3
+ "version": "1.6.4-beta.0",
4
4
  "license": "Apache-2.0",
5
5
  "scripts": {
6
6
  "serve": "vite --host --force",
@@ -50,9 +50,9 @@
50
50
  "*.js"
51
51
  ],
52
52
  "dependencies": {
53
- "@abi-software/flatmapvuer": "^1.6.1",
54
- "@abi-software/map-side-bar": "^2.5.2",
55
- "@abi-software/map-utilities": "^1.2.1",
53
+ "@abi-software/flatmapvuer": "^1.6.2-beta.2",
54
+ "@abi-software/map-side-bar": "^2.5.3-beta.5",
55
+ "@abi-software/map-utilities": "^1.2.2-beta.1",
56
56
  "@abi-software/plotvuer": "^1.0.3",
57
57
  "@abi-software/scaffoldvuer": "^1.6.2",
58
58
  "@abi-software/simulationvuer": "^1.0.1",
@@ -81,6 +81,7 @@
81
81
  "concurrently": "^8.2.2",
82
82
  "cypress": "^13.13.0",
83
83
  "cypress-multi-reporters": "^1.6.4",
84
+ "cypress-visual-regression": "^5.2.2",
84
85
  "cypress-wait-until": "^1.7.1",
85
86
  "dom-parser": "^0.1.6",
86
87
  "eslint": "^8.56.0",
@@ -3,6 +3,7 @@
3
3
  <FlatmapVuer
4
4
  :state="entry.state"
5
5
  :entry="entry.resource"
6
+ :mapManager="mapManager"
6
7
  @resource-selected="flatmaprResourceSelected(entry.type, $event)"
7
8
  @pan-zoom-callback="flatmapPanZoomCallback"
8
9
  :name="entry.resource"
@@ -32,6 +33,7 @@
32
33
  :sparcAPI="apiLocation"
33
34
  @open-map="openMap"
34
35
  @pathway-selection-changed="onPathwaySelectionChanged"
36
+ @mapmanager-loaded="onMapmanagerLoaded"
35
37
  />
36
38
 
37
39
  <HelpModeDialog
@@ -5,6 +5,7 @@
5
5
  @flatmapChanged="flatmapChanged"
6
6
  @ready="multiFlatmapReady"
7
7
  :state="entry.state"
8
+ :mapManager="mapManager"
8
9
  @resource-selected="flatmaprResourceSelected(entry.type, $event)"
9
10
  style="height: 100%; width: 100%"
10
11
  :initial="entry.resource"
@@ -33,6 +34,7 @@
33
34
  @finish-help-mode="endHelp"
34
35
  @pathway-selection-changed="onPathwaySelectionChanged"
35
36
  @open-pubmed-url="onOpenPubmedUrl"
37
+ @mapmanager-loaded="onMapmanagerLoaded"
36
38
  />
37
39
 
38
40
  <HelpModeDialog
@@ -450,8 +452,9 @@ export default {
450
452
  this.getFeaturedDatasets();
451
453
 
452
454
  EventBus.on('annotation-close', (payload) => {
453
- if (payload?.tabClose && this.$refs.multiflatmap.getCurrentFlatmap()) {
454
- this.$refs.multiflatmap.getCurrentFlatmap().annotationEventCallback({}, { type: 'aborted' })
455
+ if (payload?.tabClose && this.flatmapReady && this.$refs.multiflatmap) {
456
+ const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap();
457
+ currentFlatmap.annotationEventCallback({}, { type: 'aborted' })
455
458
  }
456
459
  });
457
460
 
@@ -77,6 +77,9 @@ export default {
77
77
 
78
78
  this.onConnectivityInfoClose();
79
79
  },
80
+ onMapmanagerLoaded: function (mapManager) {
81
+ this.settingsStore.updateMapManager(mapManager);
82
+ },
80
83
  trackOpenMap: function (category) {
81
84
  // GA Tagging
82
85
  // Open map tracking
@@ -525,6 +528,7 @@ export default {
525
528
  scaffoldLoaded: false,
526
529
  isInHelp: false,
527
530
  hoverDelay: undefined,
531
+ mapManager: undefined,
528
532
  };
529
533
  },
530
534
  created: function () {
@@ -534,6 +538,9 @@ export default {
534
538
  this.flatmapAPI = this.settingsStore.flatmapAPI;
535
539
  if (this.settingsStore.sparcApi)
536
540
  this.apiLocation = this.settingsStore.sparcApi;
541
+ if (this.settingsStore.mapManager) {
542
+ this.mapManager = this.settingsStore.mapManager;
543
+ }
537
544
  },
538
545
  watch: {
539
546
  helpMode: function (newVal) {
@@ -14,6 +14,7 @@ export const useSettingsStore = defineStore('settings', {
14
14
  flatmapAPI: undefined,
15
15
  nlLinkPrefix: undefined,
16
16
  flatmapAPI2: "https://mapcore-demo.org/curation/flatmap/",
17
+ mapManager: undefined,
17
18
  rootUrl: undefined,
18
19
  facets: { species: [], gender: [], organ: [] },
19
20
  numberOfDatasetsForFacets: [],
@@ -67,6 +68,9 @@ export const useSettingsStore = defineStore('settings', {
67
68
  updateFlatmapAPI2(flatmapAPI2) {
68
69
  this.flatmapAPI2 = flatmapAPI2;
69
70
  },
71
+ updateMapManager(mapManager) {
72
+ this.mapManager = mapManager;
73
+ },
70
74
  updateNLLinkPrefix(nlLinkPrefix) {
71
75
  this.nlLinkPrefix = nlLinkPrefix;
72
76
  },