@abi-software/map-utilities 1.1.3-beta.2 → 1.1.3-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-utilities",
-  "version": "1.1.3-beta.2",
+  "version": "1.1.3-beta.3",
   "files": [
     "dist/*",
     "src/*",

package/src/components/ConnectivityGraph/ConnectivityGraph.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="connectivity-graph">
+  <div class="connectivity-graph" v-loading="loading">
     <div ref="graphCanvas" class="graph-canvas"></div>
     <div class="control-panel">
       <div class="node-key">
@@ -82,8 +82,11 @@ export default {
   },
   data: function () {
     return {
-      cy: null,
+      loading: true,
       connectivityGraph: null,
+      selectedSource: '',
+      pathList: [],
+      schemaVersion: '',
       knowledgeByPath: new Map(),
       labelledTerms: new Set(),
       labelCache: new Map(),
@@ -94,20 +97,47 @@ export default {
     };
   },
   mounted() {
+    this.loadCacheData();
     this.run().then((res) => {
       this.showGraph(this.entry);
     });
   },
   methods: {
+    loadCacheData: function () {
+      const selectedSource = sessionStorage.getItem('connectivity-graph-source');
+      const labelCache = sessionStorage.getItem('connectivity-graph-labels');
+      const pathList = sessionStorage.getItem('connectivity-graph-pathlist');
+      const schemaVersion = sessionStorage.getItem('connectivity-graph-schema-version');
+
+      if (selectedSource) {
+        this.selectedSource = selectedSource;
+      }
+      if (pathList) {
+        this.pathList = JSON.parse(pathList);
+      }
+      if (labelCache) {
+        const labelCacheObj = JSON.parse(labelCache);
+        this.labelCache = new Map(Object.entries(labelCacheObj));
+      }
+      if (schemaVersion) {
+        this.schemaVersion = schemaVersion;
+      }
+    },
     run: async function () {
-      const schemaVersion = await this.getSchemaVersion();
-      if (schemaVersion < MIN_SCHEMA_VERSION) {
+      if (!this.schemaVersion) {
+        this.schemaVersion = await this.getSchemaVersion();
+        sessionStorage.setItem('connectivity-graph-schema-version', this.schemaVersion);
+      }
+      if (this.schemaVersion < MIN_SCHEMA_VERSION) {
         console.warn('No Server!');
         return;
       }
       this.showSpinner();
-      const selectedSource = await this.setSourceList();
-      await this.setPathList(selectedSource)
+      if (!this.selectedSource) {
+        this.selectedSource = await this.setSourceList();
+        sessionStorage.setItem('connectivity-graph-source', this.selectedSource);
+      }
+      await this.setPathList(this.selectedSource)
       this.hideSpinner();
     },
     showGraph: async function (neuronPath) {
@@ -159,28 +189,33 @@ export default {
       }
       return firstSource;
     },
-    setPathList: async function (source) {
+    loadPathData: async function (source) {
       const data = await this.query(
         `select entity, knowledge from knowledge
           where entity like 'ilxtr:%' and source=?
           order by entity`,
         [source]);
-      const pathList = [];
+      const pathList = data ? data.values : [];
+      return pathList;
+    },
+    setPathList: async function (source) {
+      if (!this.pathList.length) {
+        this.pathList = await this.loadPathData(source);
+        sessionStorage.setItem('connectivity-graph-pathlist', JSON.stringify(this.pathList));
+      }
       this.knowledgeByPath.clear();
       this.labelledTerms = new Set();
-      for (const [key, jsonKnowledge] of data.values) {
+      for (const [key, jsonKnowledge] of this.pathList) {
         const knowledge = JSON.parse(jsonKnowledge);
         if ('connectivity' in knowledge) {
-          const label = knowledge.label || key;
-          const shortLabel = (label === key.slice(6).replace('-prime', "'").replaceAll('-', ' '))
-                              ? ''
-                              : (label.length < 50) ? label : `${label.slice(0, 50)}...`;
-          pathList.push(key);
           this.knowledgeByPath.set(key, knowledge);
           this.cacheLabels(knowledge);
         }
       }
-      await this.getCachedTermLabels();
+
+      if (!this.labelCache.size) {
+        await this.getCachedTermLabels();
+      }
       return '';
     },
     getSchemaVersion: async function () {
@@ -207,14 +242,16 @@ export default {
     },
     getCachedTermLabels: async function () {
       if (this.labelledTerms.size) {
-        const termLabels = await this.query(`
+        const data = await this.query(`
           select entity, label from labels
           where entity in (?${', ?'.repeat(this.labelledTerms.size-1)})`,
           [...this.labelledTerms.values()]
         );
-        for (const termLabel of termLabels.values) {
+        for (const termLabel of data.values) {
           this.labelCache.set(termLabel[0], termLabel[1]);
         }
+        const labelCacheObj = Object.fromEntries(this.labelCache);
+        sessionStorage.setItem('connectivity-graph-labels', JSON.stringify(labelCacheObj));
       }
     },
     cacheNodeLabels: function (node) {
@@ -229,10 +266,10 @@ export default {
       }
     },
     showSpinner: function () {
-      // show loading spinner
+      this.loading = true;
     },
     hideSpinner: function () {
-      // hide loading spinner
+      this.loading = false;
     },
     reset: function () {
       this.connectivityGraph.reset();
@@ -294,7 +331,7 @@ export default {
 }
 
 .tools {
-  margin-top: 1rem;
+  margin-top: 0.5rem;
   display: flex;
   flex-direction: row;
   gap: 0.5rem;
@@ -310,6 +347,10 @@ export default {
   background: $app-primary-color !important;
   transition: all 0.25s ease;
 
+  svg {
+    margin: 0;
+  }
+
   &,
   &:focus,
   &:active {

package/src/components/ConnectivityGraph/graph.js

@@ -27,7 +27,7 @@ import cytoscape from 'cytoscape'
 
 export class ConnectivityGraph
 {
-    cy = null
+    cyg = null
     nodes = []
     edges = []
     axons = []
@@ -69,31 +69,31 @@ export class ConnectivityGraph
     showConnectivity(graphCanvas)
     //================
     {
-        this.cy = new CytoscapeGraph(this, graphCanvas)
+        this.cyg = new CytoscapeGraph(this, graphCanvas)
     }
 
     clearConnectivity()
     //=================
     {
-        if (this.cy) {
-            this.cy.remove()
-            this.cy = null
+        if (this.cyg?.cy) {
+            this.cyg.cy.remove()
+            this.cyg.cy = null
         }
     }
 
     reset()
     //=================
     {
-        if (this.cy?.cy) {
-            this.cy.cy.reset()
+        if (this.cyg?.cy) {
+            this.cyg.cy.reset()
         }
     }
 
     enableZoom(option)
     //=================
     {
-        if (this.cy?.cy) {
-            this.cy.cy.userZoomingEnabled(option)
+        if (this.cyg?.cy) {
+            this.cyg.cy.userZoomingEnabled(option)
         }
     }
 
@@ -195,7 +195,6 @@ class CytoscapeGraph
 
     constructor(connectivityGraph, graphCanvas)
     {
-        // const graphCanvas = document.getElementById('graph-canvas')
         this.cy = cytoscape({
             container: graphCanvas,
             elements: connectivityGraph.elements,