Merge pull request #234 from alan-wu/reduce-get-organ-curies

Call get organ curies once only.
ABI-Software · Jul 19, 2024 · 3dad80c · 3dad80c
2 parents ddc9642 + 5650d61
commit 3dad80c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 34 deletions.
diff --git a/cypress/component/MapContent.cy.js b/cypress/component/MapContent.cy.js
@@ -74,6 +74,9 @@ describe('MapContent', () => {
     //Wait for the curie response before continuing
    // cy.wait('@categoryResponse');
 
+    //Wait for curie response
+    cy.wait('@curieResponse', {timeout: 20000});
+
     //Check if mapcontent is mounted correctly
     cy.get('.mapcontent').invoke('attr', 'style', 'height: 880px').should(
       'have.attr', 'style', 'height: 880px');
@@ -91,9 +94,6 @@ describe('MapContent', () => {
     //Sidebar should not be visbile
     cy.get('.el-drawer.rtl.my-drawer').should('not.be.visible');
 
-    //Wait for curie response
-    cy.wait('@curieResponse', {timeout: 20000});
-
     //Wait for curie response
     cy.wait('@featuredDatasetResponse', {timeout: 20000});
 

diff --git a/src/components/MapContent.vue b/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", () => {

diff --git a/src/components/viewers/Flatmap.vue b/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);
     });

diff --git a/src/components/viewers/MultiFlatmap.vue b/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) {

diff --git a/src/mixins/ContentMixin.js b/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

diff --git a/src/stores/splitFlow.js b/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;
     },