@abi-software/map-utilities 1.1.3-beta.5 → 1.1.3-beta.7

package/package.json

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

package/src/components/ConnectivityGraph/ConnectivityGraph.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="connectivity-graph" v-loading="loading">
+
     <div ref="graphCanvas" class="graph-canvas"></div>
+
     <div class="control-panel">
       <div class="node-key">
         <div class="key-head">Node type:</div>
@@ -53,6 +55,11 @@
         </el-tooltip>
       </div>
     </div>
+
+    <div class="connectivity-graph-error" v-if="errorMessage">
+      {{ errorMessage }}
+    </div>
+
   </div>
 </template>
 
@@ -95,6 +102,7 @@ export default {
       zoomLockLabel: ZOOM_LOCK_LABEL,
       iconColor: APP_PRIMARY_COLOR,
       zoomEnabled: false,
+      errorMessage: '',
     };
   },
   mounted() {
@@ -184,7 +192,7 @@ export default {
 
       this.connectivityGraph.on('tap-node', (event) => {
         const { label } = event.detail;
-        const labels = label.split(`\n`);
+        const labels = label ? label.split(`\n`) : [];
         /**
          * This event is triggered after a node on the connectivity graph is clicked.
          */
@@ -296,14 +304,20 @@ export default {
     },
     getCachedTermLabels: async function () {
       if (this.labelledTerms.size) {
-        const data = 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 data.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);
@@ -339,6 +353,9 @@ export default {
       this.zoomLockLabel = this.zoomEnabled ? ZOOM_UNLOCK_LABEL : ZOOM_LOCK_LABEL;
       this.connectivityGraph.enableZoom(!this.zoomEnabled);
     },
+    updateErrorMessage: function (message) {
+      this.errorMessage = message;
+    },
   },
 };
 </script>
@@ -433,6 +450,19 @@ export default {
   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%);

package/src/components/ConnectivityGraph/graph.js

@@ -227,6 +227,7 @@ class CytoscapeGraph extends EventTarget
           .on('mouseout', 'node', this.exitNode.bind(this))
           .on('position', 'node', this.moveNode.bind(this))
           .on('tap', 'node', this.tapNode.bind(this))
+          .on('tap', this.tapNode.bind(this))
 
         this.tooltip = document.createElement('div')
         this.tooltip.className = 'cy-graph-tooltip'