@abi-software/flatmapvuer 0.5.7-alpha → 0.5.7-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.5.7-alpha",
+  "version": "0.5.7-alpha.2",
   "license": "Apache-2.0",
   "main": "./dist/flatmapvuer.common.js",
   "files": [

package/src/components/Tooltip.vue

@@ -139,11 +139,6 @@ export default {
       pubmedSearchUrl: '',
       loading: false,
       showToolip: false,
-      destinations: [],
-      origins: [],
-      components: [],
-      destinationsWithDatasets: [],
-      originsWithDatasets: [],
       originDescriptions: {
         'motor': 'is the location of the initial cell body of the circuit',
         'sensory': 'is the location of the initial cell body in the PNS circuit'
@@ -191,13 +186,13 @@ export default {
       window.open(url, '_blank')
     },
     openAll: function(){
-      EventBus.$emit('onActionClick', {type:'Facets', labels: this.componentsWithDatasets.map(a=>a.name)})
+      EventBus.$emit('onActionClick', {type:'Facets', labels: this.entry.componentsWithDatasets.map(a=>a.name)})
     },
     openAxons: function(){
-      EventBus.$emit('onActionClick', {type:'Facets', labels: this.destinationsWithDatasets.map(a=>a.name)})
+      EventBus.$emit('onActionClick', {type:'Facets', labels: this.entry.destinationsWithDatasets.map(a=>a.name)})
     },
     openDendrites: function(){
-      EventBus.$emit('onActionClick', {type:'Facets', labels: this.originsWithDatasets.map(a=>a.name)})
+      EventBus.$emit('onActionClick', {type:'Facets', labels: this.entry.originsWithDatasets.map(a=>a.name)})
     },
     pubmedSearchUrlUpdate: function (val){
       this.pubmedSearchUrl = val

package/src/services/flatmapQueries.js

@@ -45,7 +45,6 @@ let FlatmapQueries = function(){
     this.destinations = []
     this.origins = []
     this.components = []
-    this.uberons = []
     this.urls = []
     this.controller = undefined
     this.uberons = []
@@ -97,6 +96,7 @@ let FlatmapQueries = function(){
   this.createLabelLookup = function(uberons) {
     return new Promise(resolve=> {
       let uberonMap = {}
+      this.uberons = []
       const data = { sql: this.buildLabelSqlStatement(uberons)}
       fetch(`${this.flatmapApi}knowledge/query/`, {
           method: 'POST',
@@ -112,6 +112,10 @@ let FlatmapQueries = function(){
           if (entity > -1 && label > -1) {
             payload.values.forEach(pair => {
               uberonMap[pair[entity]] = pair[label];
+              this.uberons.push({
+                id: pair[entity],
+                name: pair[label]
+              })
             });
           }
         resolve(uberonMap)
@@ -154,8 +158,7 @@ let FlatmapQueries = function(){
         found.push(n)
       }
     })
-    this.uberons = [... new Set(found.flat())]
-    return this.uberons
+    return [... new Set(found.flat())]
   }
 
   this.flattenConntectivity = function (connectivity) {
@@ -268,20 +271,14 @@ let FlatmapQueries = function(){
     let axonsFlat = this.flattenConntectivity(axons)
     let dendritesFlat = this.flattenConntectivity(dendrites)
 
-    console.log("uber in flattehn find datasets", this.uberons)
-
-    window.uberons = this.uberons
-    window.componentsFlat = componentsFlat
-
     // Filter for the anatomy which is annotated on datasets
-    this.destinationsWithDatasets = this.uberons.filter(ub => axonsFlat.indexOf(ub) !== -1)
-    this.originsWithDatasets = this.uberons.filter(ub => dendritesFlat.indexOf(ub) !== -1)
-    this.componentsWithDatasets = this.uberons.filter(ub => componentsFlat.indexOf(ub) !== -1)
+    this.destinationsWithDatasets = this.uberons.filter(ub => axonsFlat.indexOf(ub.id) !== -1)
+    this.originsWithDatasets = this.uberons.filter(ub => dendritesFlat.indexOf(ub.id) !== -1)
+    this.componentsWithDatasets = this.uberons.filter(ub => componentsFlat.indexOf(ub.id) !== -1)
   }
 
   this.processConnectivity = function(connectivity){
     return new Promise (resolve=>{
-      console.log(connectivity)
       // Filter the origin and destinations from components
       let components = this.findComponents(connectivity)
 
@@ -291,11 +288,9 @@ let FlatmapQueries = function(){
 
       // Create list of ids to get labels for
       let conIds = this.findAllIdsFromConnectivity(connectivity)  
-      console.log(conIds)
 
       // Create readable labels from the nodes. Setting this to 'this.origins' updates the display
       this.createLabelLookup(conIds).then(lookUp=>{
-        console.log("after label lookup", this.uberons)
         this.destinations = axons.map(a=>this.createLabelFromNeuralNode(a,lookUp))
         this.origins = dendrites.map(d=>this.createLabelFromNeuralNode(d,lookUp))
         this.components = components.map(c=>this.createLabelFromNeuralNode(c, lookUp))