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

package/package.json

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

package/src/App.vue

@@ -533,6 +533,10 @@ function changeHover(value) {
   top: calc(50% - 100px);
   left: calc(50% - 200px);
 }
+.toolbar-container {
+  height: 80px;
+  position: relative;
+}
 .connectivity-graph {
   width: 600px;
   height: 600px;

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">
@@ -60,6 +60,7 @@
 import { ConnectivityGraph } from './graph';
 
 const MIN_SCHEMA_VERSION = 1.3;
+const CACHE_LIFETIME = 24 * 60 * 60 * 1000; // One day
 const RESET_LABEL = 'Reset position';
 const ZOOM_LOCK_LABEL = 'Lock zoom (to scroll)';
 const ZOOM_UNLOCK_LABEL = 'Unlock zoom';
@@ -82,8 +83,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,34 +98,94 @@ export default {
     };
   },
   mounted() {
+    this.refreshCache();
+    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;
+      }
+    },
+    removeAllCacheData: function () {
+      const keys = [
+        'connectivity-graph-expiry',
+        'connectivity-graph-source',
+        'connectivity-graph-labels',
+        'connectivity-graph-pathlist',
+        'connectivity-graph-schema-version',
+      ];
+      keys.forEach((key) => {
+        sessionStorage.removeItem(key);
+      });
+    },
+    refreshCache: function () {
+      const expiry = sessionStorage.getItem('connectivity-graph-expiry');
+      const now = new Date();
+
+      if (now.getTime() > expiry) {
+        this.removeAllCacheData();
+      }
+    },
+    updateCacheExpiry: function () {
+      const now = new Date();
+      const expiry = now.getTime() + CACHE_LIFETIME;
+
+      sessionStorage.setItem('connectivity-graph-expiry', expiry);
+    },
     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);
+        this.updateCacheExpiry();
+      }
+      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);
+        this.updateCacheExpiry();
+      }
+      await this.setPathList(this.selectedSource);
       this.hideSpinner();
     },
     showGraph: async function (neuronPath) {
       const graphCanvas = this.$refs.graphCanvas;
+
       this.showSpinner();
+
       this.connectivityGraph = new ConnectivityGraph(this.labelCache, graphCanvas);
       await this.connectivityGraph.addConnectivity(this.knowledgeByPath.get(neuronPath));
+
       this.hideSpinner();
+
       this.connectivityGraph.showConnectivity(graphCanvas);
-      this.currentPath = neuronPath
     },
     query: async function (sql, params) {
       const url = `${this.mapServer}knowledge/query/`;
-      const query = { sql, params }
+      const query = { sql, params };
+
       try {
         const response = await fetch(url, {
           method: 'POST',
@@ -132,9 +196,11 @@ export default {
           },
           body: JSON.stringify(query)
         });
+
         if (!response.ok) {
           throw new Error(`Cannot access ${url}`);
         }
+
         return await response.json();
       } catch {
         return {
@@ -149,38 +215,50 @@ export default {
       // Order with most recent first...
       let firstSource = '';
       const sourceList = [];
+
       for (const source of sources) {
         if (source) {
           sourceList.push(source);
+
           if (firstSource === '') {
             firstSource = source;
           }
         }
       }
+
       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.updateCacheExpiry();
+      }
+
       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 () {
@@ -197,9 +275,11 @@ export default {
             "Content-Type": "application/json"
           }
         });
+
         if (!response.ok) {
           console.error(`Cannot access ${url}`);
         }
+
         return await response.json();
       } catch {
         return null;
@@ -207,14 +287,19 @@ 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));
+        this.updateCacheExpiry();
       }
     },
     cacheNodeLabels: function (node) {
@@ -229,10 +314,10 @@ export default {
       }
     },
     showSpinner: function () {
-      // show loading spinner
+      this.loading = true;
     },
     hideSpinner: function () {
-      // hide loading spinner
+      this.loading = false;
     },
     reset: function () {
       this.connectivityGraph.reset();
@@ -272,7 +357,7 @@ export default {
 .node-key {
   border: 1px solid $app-primary-color;
   padding: 4px;
-  background-color: rgba(240, 240, 240, 0.8);
+  background-color: rgba(#f7faff, 0.85);
 
   div div {
     width: 90px;
@@ -294,7 +379,7 @@ export default {
 }
 
 .tools {
-  margin-top: 1rem;
+  margin-top: 0.5rem;
   display: flex;
   flex-direction: row;
   gap: 0.5rem;
@@ -310,6 +395,10 @@ export default {
   background: $app-primary-color !important;
   transition: all 0.25s ease;
 
+  svg {
+    margin: 0;
+  }
+
   &,
   &:focus,
   &:active {
@@ -321,6 +410,20 @@ export default {
   }
 }
 
+:deep(.cy-graph-tooltip) {
+  padding: 4px 10px;
+  font-family: Asap;
+  font-size: 12px;
+  background: #f3ecf6 !important;
+  border: 1px solid $app-primary-color;
+  border-radius: var(--el-border-radius-base);
+  position: relative;
+  top: 0;
+  left: 0;
+  width: fit-content;
+  z-index: 1;
+}
+
 .visually-hidden {
   clip: rect(0 0 0 0);
   clip-path: inset(50%);

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,
@@ -214,9 +213,9 @@ class CytoscapeGraph
           .on('position', 'node', this.moveNode.bind(this))
 
         this.tooltip = document.createElement('div')
-        this.tooltip.id = 'tooltip'
+        this.tooltip.className = 'cy-graph-tooltip'
         this.tooltip.hidden = true
-        this.graphCanvas?.lastChild?.appendChild(this.tooltip)
+        graphCanvas?.lastChild?.appendChild(this.tooltip)
     }
 
     remove()