@abi-software/flatmapvuer 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "Apache-2.0",
   "files": [
     "dist/*",

package/src/components/TreeControls.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="selections-container">
     <el-row>
       <el-col :span="12">
         <div class="title-text">Systems</div>
@@ -119,6 +119,10 @@ export default {
 
 <style lang="scss" scoped>
 
+.selections-container {
+  padding-top: 5px;
+}
+
 .checkbox-container {
   display: flex;
   cursor: pointer;
@@ -163,6 +167,7 @@ export default {
   background: #ffffff;
   margin-top: 6px;
   scrollbar-width: thin;
+  overflow: hidden;
 
   :deep(.el-tree) {
     max-height: 240px;

package/src/services/flatmapQueries.js

@@ -275,11 +275,32 @@ let FlatmapQueries = function () {
     }
   }
 
-  this.createLabelFromNeuralNode = function (node, lookUp, isSingle=true) {
-    if (isSingle) {
-      return lookUp[node]
+  // This function is used to determine if a node is a single node or a node with multiple children
+  //  Returns the id of the node if it is a single node, otherwise returns false
+  this.findIfNodeIsSingle = function (node) {
+    if (node.length === 1) { // If the node is in the form [id]
+      console.error("Server returns a single node", node)
+      return node[0]
+    } else {  
+      if (node.length === 2 && node[1].length === 0) { // If the node is in the form [id, []]
+        return node[0]
+      } else {  
+        return false // If the node is in the form [id, [id1, id2]]
+      }
+    }
+  }
+
+  this.createLabelFromNeuralNode = function (node, lookUp) {
+
+    // Check if the node is a single node or a node with multiple children
+    let nodeIsSingle = this.findIfNodeIsSingle(node)
+   
+    // Case where node is in the form [id]
+    if (nodeIsSingle) {
+      return lookUp[nodeIsSingle]
     }
 
+    // Case where node is in the form [id, [id1 (,id2)]]
     let label = lookUp[node[0]]
     if (node.length === 2 && node[1].length > 0) {
       node[1].forEach((n) => {
@@ -328,12 +349,11 @@ let FlatmapQueries = function () {
         this.destinations = axons.map((a) =>
           this.createLabelFromNeuralNode(a, lookUp)
         )
-
         this.origins = dendrites.map((d) =>
-          this.createLabelFromNeuralNode(d, lookUp, true)
+          this.createLabelFromNeuralNode(d, lookUp)
         )
         this.components = components.map((c) =>
-          this.createLabelFromNeuralNode(c, lookUp, false)
+          this.createLabelFromNeuralNode(c, lookUp)
         )
         this.flattenAndFindDatasets(components, axons, dendrites)
         resolve({