@abi-software/map-utilities 1.1.3-beta.1 → 1.1.3-beta.10

package/package.json

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

package/src/App.vue

@@ -39,6 +39,9 @@ const drawnTypes = [
   { value: "None", label: "None" },
 ];
 const showConnectivityGraph = ref(false);
+const connectivityGraphEntry = "ilxtr:neuron-type-aacar-13";
+// const connectivityGraphEntry = "ilxtr:sparc-nlp/kidney/134";
+const mapServer = "https://mapcore-demo.org/curation/flatmap/";
 
 onMounted(() => {
   console.log("🚀 ~ onMounted ~ appRef:", appRef.value);
@@ -513,8 +516,8 @@ function changeHover(value) {
     />
     <ConnectivityGraph
       v-if="showConnectivityGraph"
-      entry="ilxtr:neuron-type-aacar-13"
-      map-server="https://mapcore-demo.org/curation/flatmap/"
+      :entry="connectivityGraphEntry"
+      :map-server="mapServer"
     />
   </div>
 </template>
@@ -533,6 +536,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,15 +1,113 @@
 <template>
-  <div class="connectivity-graph">
+  <div class="connectivity-graph" v-loading="loading">
+
     <div ref="graphCanvas" class="graph-canvas"></div>
-    <div class="node-key">
-      <div class="key-head">Node type:</div>
-      <div>
-        <div><span>Node:</span><span class="key-box" style="background: #80F0F0"/></div>
-        <div><span>Axon:</span><span class="key-box" style="background: green"/></div>
-        <div><span>Dendrite:</span><span class="key-box" style="background: red"/></div>
-        <div><span>Both:</span><span class="key-box" style="background: gray"/></div>
+
+    <div class="control-panel control-panel-tools">
+      <div class="tools" :class="{'zoom-locked': zoomEnabled}">
+        <el-tooltip
+          :content="resetLabel"
+          placement="bottom"
+          effect="control-tooltip"
+        >
+          <el-button
+            class="control-button"
+            :class="theme"
+            size="small"
+            @click="reset"
+          >
+            <el-icon color="white">
+              <el-icon-aim />
+            </el-icon>
+            <span class="visually-hidden">{{ resetLabel }}</span>
+          </el-button>
+        </el-tooltip>
+
+        <el-tooltip
+          :content="zoomLockLabel"
+          placement="bottom"
+          effect="control-tooltip"
+        >
+          <el-button
+            class="control-button"
+            :class="theme"
+            size="small"
+            @click="toggleZoom"
+          >
+            <el-icon color="white">
+              <template v-if="zoomEnabled">
+                <el-icon-lock />
+              </template>
+              <template v-else>
+                <el-icon-unlock />
+              </template>
+            </el-icon>
+            <span class="visually-hidden">{{ zoomLockLabel }}</span>
+          </el-button>
+        </el-tooltip>
+
+        <el-tooltip
+          :content="zoomInLabel"
+          placement="left"
+          effect="control-tooltip"
+        >
+          <el-button
+            class="control-button"
+            :class="theme"
+            size="small"
+            @click="zoomIn"
+          >
+            <el-icon color="white">
+              <el-icon-zoom-in />
+            </el-icon>
+            <span class="visually-hidden">{{ zoomInLabel }}</span>
+          </el-button>
+        </el-tooltip>
+
+        <el-tooltip
+          :content="zoomOutLabel"
+          placement="left"
+          effect="control-tooltip"
+        >
+          <el-button
+            class="control-button"
+            :class="theme"
+            size="small"
+            @click="zoomOut"
+          >
+            <el-icon color="white">
+              <el-icon-zoom-out />
+            </el-icon>
+            <span class="visually-hidden">{{ zoomOutLabel }}</span>
+          </el-button>
+        </el-tooltip>
+      </div>
+    </div>
+
+    <div class="control-panel control-panel-nodes">
+      <div class="node-key">
+        <!-- <div class="key-head">Node type:</div> -->
+        <div class="key-box-container">
+          <div class="key-box key-box-dendrite">
+            Dendrite
+          </div>
+          <div class="key-box key-box-node">
+            Node
+          </div>
+          <div class="key-box key-box-axon">
+            Axon
+          </div>
+          <div class="key-box key-box-both">
+            Both
+          </div>
+        </div>
       </div>
     </div>
+
+    <div class="connectivity-graph-error" v-if="errorMessage">
+      {{ errorMessage }}
+    </div>
+
   </div>
 </template>
 
@@ -17,6 +115,14 @@
 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';
+const ZOOM_IN_LABEL = 'Zoom in';
+const ZOOM_OUT_LABEL = 'Zoom out';
+const ZOOM_INCREMENT = 0.25;
+const APP_PRIMARY_COLOR = '#8300bf';
 
 export default {
   name: 'ConnectivityGraph',
@@ -35,42 +141,121 @@ export default {
   },
   data: function () {
     return {
-      cy: null,
+      loading: true,
       connectivityGraph: null,
+      selectedSource: '',
+      pathList: [],
+      schemaVersion: '',
       knowledgeByPath: new Map(),
       labelledTerms: new Set(),
       labelCache: new Map(),
+      resetLabel: RESET_LABEL,
+      zoomLockLabel: ZOOM_LOCK_LABEL,
+      zoomInLabel: ZOOM_IN_LABEL,
+      zoomOutLabel: ZOOM_OUT_LABEL,
+      iconColor: APP_PRIMARY_COLOR,
+      zoomEnabled: false,
+      errorMessage: '',
     };
   },
   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
+
+      this.connectivityGraph.on('tap-node', (event) => {
+        const { label } = event.detail;
+        const labels = label ? label.split(`\n`) : [];
+        /**
+         * This event is triggered after a node on the connectivity graph is clicked.
+         */
+        this.$emit('tap-node', labels);
+      });
     },
     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',
@@ -81,9 +266,11 @@ export default {
           },
           body: JSON.stringify(query)
         });
+
         if (!response.ok) {
           throw new Error(`Cannot access ${url}`);
         }
+
         return await response.json();
       } catch {
         return {
@@ -98,38 +285,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 () {
@@ -146,9 +345,11 @@ export default {
             "Content-Type": "application/json"
           }
         });
+
         if (!response.ok) {
           console.error(`Cannot access ${url}`);
         }
+
         return await response.json();
       } catch {
         return null;
@@ -156,14 +357,25 @@ export default {
     },
     getCachedTermLabels: async function () {
       if (this.labelledTerms.size) {
-        const termLabels = await this.query(`
-          select entity, label from labels
-          where entity in (?${', ?'.repeat(this.labelledTerms.size-1)})`,
+        const data = await this.query(
+          `select entity, knowledge from knowledge
+            where entity in (?${', ?'.repeat(this.labelledTerms.size-1)})
+            order by source desc`,
           [...this.labelledTerms.values()]
         );
-        for (const termLabel of termLabels.values) {
-          this.labelCache.set(termLabel[0], termLabel[1]);
+
+        let last_entity = null;
+        for (const [key, jsonKnowledge] of data.values) {
+          if (key !== last_entity) {
+            const knowledge = JSON.parse(jsonKnowledge);
+            this.labelCache.set(key, knowledge['label'] || key);
+            last_entity = key;
+          }
         }
+
+        const labelCacheObj = Object.fromEntries(this.labelCache);
+        sessionStorage.setItem('connectivity-graph-labels', JSON.stringify(labelCacheObj));
+        this.updateCacheExpiry();
       }
     },
     cacheNodeLabels: function (node) {
@@ -178,10 +390,34 @@ export default {
       }
     },
     showSpinner: function () {
-      // show loading spinner
+      this.loading = true;
     },
     hideSpinner: function () {
-      // hide loading spinner
+      this.loading = false;
+    },
+    reset: function () {
+      this.connectivityGraph.reset();
+    },
+    zoomIn: function () {
+      this.connectivityGraph.zoom(ZOOM_INCREMENT);
+    },
+    zoomOut: function () {
+      this.connectivityGraph.zoom(-ZOOM_INCREMENT);
+    },
+    /**
+     * Enable/disable user zoom for scrolling
+     */
+    toggleZoom: function () {
+      this.zoomEnabled = !this.zoomEnabled;
+      this.zoomLockLabel = this.zoomEnabled ? ZOOM_UNLOCK_LABEL : ZOOM_LOCK_LABEL;
+      this.connectivityGraph.enableZoom(!this.zoomEnabled);
+    },
+    showErrorMessage: function (errorMessage) {
+      this.errorMessage = errorMessage;
+      // Show error for 3 seconds
+      setTimeout(() => {
+        this.errorMessage = '';
+      }, 3000);
     },
   },
 };
@@ -201,30 +437,192 @@ export default {
   border: solid 1px #e4e7ed;
 }
 
-.node-key {
+.control-panel {
   position: absolute;
-  top: 1rem;
   right: 1rem;
-  border: 1px solid $app-primary-color;
-  padding: 4px;
-  background-color: rgba(240, 240, 240, 0.8);
 
-  div div {
-    width: 90px;
+  &-tools {
+    top: 1rem;
+  }
+
+  &-nodes {
+    bottom: 1rem;
   }
 }
 
+.node-key {
+  padding: 0.5rem;
+  font-size: 12px;
+  border: 1px solid var(--el-border-color);
+  background-color: rgba(#f7faff, 0.85);
+}
+
 .key-head {
   text-align: center;
   font-weight: bold;
-  border-bottom: 1px solid gray;
+  border-bottom: 1px solid var(--el-border-color);
   padding-bottom: 4px;
-  margin-bottom: 4px;
+  margin-bottom: 0.5rem;
+}
+
+.key-box-container {
+  display: flex;
+  flex-direction: row;
+  gap: 1rem;
 }
 
 .key-box {
-  float: right;
-  width: 12px;
-  height: 12px;
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  position: relative;
+
+  &::before {
+    content: "";
+    display: block;
+    width: 14px;
+    height: 14px;
+  }
+
+  &-node::before,
+  &-both::before {
+    border: 1px solid gray;
+    border-radius: var(--el-border-radius-small);
+  }
+
+  // &-node {
+  //   background: #80F0F0;
+  // }
+
+  // &-both {
+  //   background: gray;
+  // }
+
+  &-axon::before {
+    border: 1px solid gray;
+    border-radius: var(--el-border-radius-small);
+    transform: rotate(45deg);
+    // background: green;
+  }
+
+  &-dendrite::before {
+    border: 1px solid gray;
+    border-radius: 50%;
+    // background: red;
+  }
 }
+
+.tools {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(3, 1fr);
+  gap: 0.5rem;
+
+  :deep(.el-button:nth-child(3)) {
+    grid-column: 2;
+    grid-row: 2;
+  }
+
+  :deep(.el-button:nth-child(4)) {
+    grid-column: 2;
+    grid-row: 3;
+  }
+
+  :deep(.el-button:nth-child(3)),
+  :deep(.el-button:nth-child(4)) {
+    opacity: 0;
+    visibility: hidden;
+    pointer-events: none;
+    transform: translateY(-100%);
+    transition: all 0.25s ease;
+  }
+
+  &.zoom-locked {
+    :deep(.el-button:nth-child(3)),
+    :deep(.el-button:nth-child(4)) {
+      opacity: 1;
+      visibility: visible;
+      pointer-events: initial;
+      transform: translateY(0%);
+    }
+
+    :deep(.el-button:nth-child(4)) {
+      transition-delay: 0.125s;
+    }
+  }
+}
+
+.control-button {
+  width: 24px;
+  height: 24px;
+  margin: 0 !important;
+  padding: 0 !important;
+  font-size: 16px !important;
+  border-color: $app-primary-color !important;
+  border-radius: 50%;
+  background: $app-primary-color !important;
+  transition: all 0.25s ease;
+
+  svg {
+    margin: 0;
+  }
+
+  &,
+  &:focus,
+  &:active {
+    box-shadow: none !important;
+  }
+}
+
+: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;
+}
+
+.connectivity-graph-error {
+  position: absolute;
+  top: 1rem;
+  left: 50%;
+  transform: translateX(-50%);
+  width: fit-content;
+  font-size: 12px;
+  padding: 0.25rem 0.5rem;
+  background-color: var(--el-color-error-light-9);
+  border-radius: var(--el-border-radius-small);
+  border: 1px solid var(--el-color-error);
+}
+
+.visually-hidden {
+  clip: rect(0 0 0 0);
+  clip-path: inset(50%);
+  height: 1px;
+  overflow: hidden;
+  position: absolute;
+  white-space: nowrap;
+  width: 1px;
+}
+</style>
+
+<style lang="scss">
+  .el-popper.is-control-tooltip {
+    padding: 4px 10px;
+    font-family: Asap;
+    background: #f3ecf6 !important;
+    border: 1px solid $app-primary-color;
+
+    & .el-popper__arrow::before {
+      border: 1px solid;
+      border-color: $app-primary-color;
+      background: #f3ecf6;
+    }
+  }
 </style>