@abi-software/mapintegratedvuer 1.3.4-beta.1 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.3.4-beta.1",
+  "version": "1.3.4",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -50,11 +50,11 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "1.3.2-beta.1",
+    "@abi-software/flatmapvuer": "^1.3.2",
     "@abi-software/map-side-bar": "^2.3.1",
     "@abi-software/map-utilities": "^1.0.0",
     "@abi-software/plotvuer": "1.0.0",
-    "@abi-software/scaffoldvuer": "^1.3.2",
+    "@abi-software/scaffoldvuer": "^1.3.3",
     "@abi-software/simulationvuer": "1.0.0",
     "@abi-software/svg-sprite": "1.0.0",
     "@element-plus/icons-vue": "^2.3.1",

package/src/components/MapContent.vue

@@ -308,6 +308,7 @@ export default {
       this.options.rootUrl ? this.settingsStore.updateRootUrl(this.options.rootUrl) : null
     }
     this.splitFlowStore?.reset();
+    this.splitFlowStore?.getAvailableTerms(this.settingsStore.sparcApi);
   },
   mounted: async function() {
     EventBus.on("updateShareLinkRequested", () => {

package/src/components/viewers/Flatmap.vue

@@ -100,7 +100,6 @@ export default {
       let provClone = {id: this.entry.id, prov: this.getFlatmapImp().provenance}; //create clone of provenance and add id
       EventBus.emit("mapImpProv", provClone); // send clone to context card
       this.$emit("flatmap-provenance-ready", provClone);
-      this.getAvailableTerms();
       if (this.entry.resource === "FunctionalConnectivity"){
         this.flatmapReadyForMarkerUpdates(flatmap);
       }
@@ -166,7 +165,6 @@ export default {
     },
   },
   mounted: function() {
-    this.getAvailableTerms();
     EventBus.on("markerUpdate", () => {
       this.flatmapMarkerUpdate(undefined);
     });

package/src/components/viewers/MultiFlatmap.vue

@@ -427,9 +427,7 @@ export default {
     },
   },
   mounted: function () {
-    this.getAvailableTerms();
     this.getFeaturedDatasets();
-
     EventBus.on('show-connectivity', (payload) => {
       const { featureIds, offset } = payload;
       if (this.flatmapReady && this.$refs.multiflatmap) {

package/src/mixins/ContentMixin.js

@@ -1,5 +1,4 @@
 import {
-  getAvailableTermsForSpecies,
   getInteractiveAction,
   getNerveNames,
   getParentsRegion,
@@ -35,6 +34,9 @@ export default {
   },
   computed: {
     ...mapStores(useSettingsStore, useSplitFlowStore),
+    idNamePair() {
+      return this.splitFlowStore.idNamePair;
+    },
     syncMode() {
       return this.splitFlowStore.syncMode;
     },
@@ -397,31 +399,6 @@ export default {
     requestSynchronisedEvent: function () {
       return;
     },
-    getAvailableTerms: function () {
-      //Use the default list of uberons before we get the list from
-      //the api
-      let terms = getAvailableTermsForSpecies();
-      for (let i = 0; i < terms.length; i++) {
-        this.idNamePair[terms[i].id] = terms[i].name;
-      }
-      if (this.apiLocation) {
-        if (this._controller) this._controller.abort();
-        this._controller = new AbortController();
-        let signal = this._controller.signal;
-        fetch(`${this.apiLocation}get-organ-curies`, {
-          signal,
-        })
-          .then(response => response.json())
-          .then(data => {
-            this._controller = undefined;
-            data.uberon.array.forEach(pair => {
-              this.idNamePair[pair.id.toUpperCase()] =
-                pair.name.charAt(0).toUpperCase() + pair.name.slice(1);
-            });
-            return;
-          });
-      }
-    },
     flatmapMarkerUpdate() {
       return;
     },
@@ -536,7 +513,6 @@ export default {
       multiflatmapRef: null,
       flatmapRef: null,
       scaffoldRef: null,
-      idNamePair: {},
       scaffoldLoaded: false,
       isInHelp: false,
       hoverDelay: undefined

package/src/stores/splitFlow.js

@@ -1,4 +1,7 @@
 import { defineStore } from 'pinia';
+import {
+  getAvailableTermsForSpecies,
+} from "../components/SimulatedData.js";
 
 /* eslint-disable no-alert, no-console */
 const presetLayouts = (view) => {
@@ -130,6 +133,7 @@ const findKeyWithId = (layout, id) => {
 const getOriginalState = () => {
   return {
     activeView: "singlepanel",
+    idNamePair: {},
     viewIcons: [
       { icon: "singlepanel", name: "Single view", min: 1 },
       { icon: "2horpanel", name: "Horizontal split", min: 2 },
@@ -195,6 +199,30 @@ export const useSplitFlowStore = defineStore('splitFlow', {
         this.customLayout[sourceKey].id = payload.target;
       }
     },
+    getAvailableTerms(apiLocation) {
+      let terms = getAvailableTermsForSpecies();
+      for (let i = 0; i < terms.length; i++) {
+        this.idNamePair[terms[i].id] = terms[i].name;
+      }
+      if (apiLocation) {
+        if (this._controller) this._controller.abort();
+        this._controller = new AbortController();
+        let signal = this._controller.signal;
+        console.log("getAvailableTerms")
+        fetch(`${apiLocation}get-organ-curies`, {
+          signal,
+        })
+          .then(response => response.json())
+          .then(data => {
+            this._controller = undefined;
+            data.uberon.array.forEach(pair => {
+              this.idNamePair[pair.id.toUpperCase()] =
+                pair.name.charAt(0).toUpperCase() + pair.name.slice(1);
+            });
+            return;
+          });
+      }
+    },
     toggleGlobalCallback(flag) {
       this.globalCallback = flag;
     },