@abi-software/flatmapvuer 0.4.1-beta.1 → 0.4.1-beta.3

package/package-lock.json

@@ -1,20 +1,23 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.4.1-beta.0",
+  "version": "0.4.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@abi-software/flatmap-viewer": {
-      "version": "2.2.14-b.1",
-      "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-2.2.14-b.1.tgz",
-      "integrity": "sha512-OZ1VAf8K7DU/EO4UYlzQHAOA0NLnGXHtSl3KZTesAbWW7JiwDf+iVpKFx0yXOrKGwkeHkgLFf8V3QdwLWiY/1Q==",
+      "version": "2.3.2-b.4",
+      "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-2.3.2-b.4.tgz",
+      "integrity": "sha512-2CNV160FBZZ0ERcaBwEJJERG1L4ZsWHnJuSkfeZDYbmX3HgeYBC9NaNwaYCVte2hyxUtlyzBAegRyTUUSZc5sA==",
       "requires": {
         "@babel/runtime": "^7.10.4",
+        "@fortawesome/fontawesome-free": "^6.4.0",
         "@turf/area": "^6.0.1",
         "@turf/bbox": "^6.0.1",
         "@turf/helpers": "^6.1.4",
         "@turf/projection": "^6.5.0",
         "bezier-js": "^6.1.0",
+        "html-es6cape": "^2.0.2",
+        "jspanel4": "^4.16.1",
         "maplibre-gl": ">=2.4.0",
         "minisearch": "^2.2.1",
         "polylabel": "^1.1.0"
@@ -1200,6 +1203,11 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@fortawesome/fontawesome-free": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz",
+      "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ=="
+    },
     "@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
@@ -6710,6 +6718,11 @@
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
+    "html-es6cape": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-es6cape/-/html-es6cape-2.0.2.tgz",
+      "integrity": "sha512-utzhH8rq2VABdW1LsPdv5tmxeMNOtP83If0jKCa79xPBgLWfcMvdf9K+EZoxJ5P7KioCxTs6WBnSDWLQHJ2lWA=="
+    },
     "html-minifier": {
       "version": "3.5.21",
       "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
@@ -7793,6 +7806,11 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "jspanel4": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/jspanel4/-/jspanel4-4.16.1.tgz",
+      "integrity": "sha512-j6Vb565tSK9pOXBN0NgORjhOKKAzsO/1VbGyz1jv7anb9gtdSwUIX6IKXTtyRd/gU9kQv3TFhYRfto5yLvGLbA=="
+    },
     "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.4.1-beta.1",
+  "version": "0.4.1-beta.3",
   "license": "Apache-2.0",
   "main": "./dist/flatmapvuer.common.js",
   "files": [
@@ -22,7 +22,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@abi-software/flatmap-viewer": "^2.2.14-b.1",
+    "@abi-software/flatmap-viewer": "^2.3.2-b.4",
     "@abi-software/svg-sprite": "^0.1.14",
     "core-js": "^3.3.2",
     "css-element-queries": "^1.2.2",

package/src/App.vue

@@ -96,7 +96,7 @@ export default {
         position: "absolute"
       },
       displayCloseButton: false,
-      initial: "Functional Connectivity",
+      initial: "Rat",
       helpMode: false,
       mapSettings: [],
       //flatmapAPI: "https://mapcore-demo.org/current/flatmap/v2/"

package/src/components/FlatmapVuer.vue

@@ -155,7 +155,7 @@
             v-if="isFC && systems && systems.length > 0"
             title="Systems"
             labelKey="name"
-            identifierKey="name"
+            identifierKey="id"
             :selections="systems"
             colourStyle="background"
             @changed="systemSelected"
@@ -173,6 +173,7 @@
             ref="centrelinesSelection"
             key="centrelinesSelection"
           />
+          <!--
           <selections-group
             v-if="isFC && sckanDisplay && sckanDisplay.length > 0"
             title="SCKAN"
@@ -195,6 +196,7 @@
             ref="layersSelection"
             key="layersSelection"
           />
+          -->
           <selections-group
             v-if="pathways && pathways.length > 0"
             title="Pathways"
@@ -296,7 +298,7 @@ import {
 import lang from "element-ui/lib/locale/lang/en";
 import locale from "element-ui/lib/locale";
 import flatmapMarker from "../icons/flatmap-marker";
-import {FlatmapQueries} from "../services/flatmapQueries";
+import {FlatmapQueries} from "../services/flatmapQueries.js";
 
 locale.use(lang);
 Vue.use(Col);
@@ -491,9 +493,9 @@ export default {
     // checkNeuronClicked shows a neuron path pop up if a path was recently clicked
     checkAndCreatePopups:  async function(data) {
       // Call flatmap database to get the connection data
-      let connections = await this.flatmapQueries.retrieveFlatmapKnowledgeForEvent(data)
-      if(!connections){
-        if(data.feature.hyperlinks){
+      let results = await this.flatmapQueries.retrieveFlatmapKnowledgeForEvent(data)
+      if(!results){
+        if(data.feature.hyperlinks && data.feature.hyperlinks.length > 0){
           this.resourceForTooltip =  data.resource[0];
           this.createTooltipFromNeuronCuration(data);
         }
@@ -773,7 +775,8 @@ export default {
       this.backgroundChangeCallback(this.currentBackground);
       this.pathways = this.mapImp.pathTypes();
       this.mapImp.enableCentrelines(false);
-      this.layers = this.mapImp.getLayers();
+      //Disable layers for now
+      //this.layers = this.mapImp.getLayers();
       this.systems = this.mapImp.getSystems();
       this.addResizeButtonToMinimap();
       this.loading = false;
@@ -929,7 +932,8 @@ export default {
       centreLines: [
         {
           label: "Display Nerves",
-          key: "centrelines"
+          key: "centrelines",
+          enabled: false
         }
       ],
       systems: [],
@@ -979,7 +983,8 @@ export default {
     const flatmap = require("@abi-software/flatmap-viewer");
     this.mapManager = new flatmap.MapManager(this.flatmapAPI);
     if (this.renderAtMounted) this.createFlatmap();
-    this.flatmapQueries = new FlatmapQueries(this.sparcAPI, this.flatmapAPI);
+    this.flatmapQueries = new FlatmapQueries();
+    this.flatmapQueries.initialise(this.sparcAPI, this.flatmapAPI);
   }
 };
 </script>
@@ -1068,6 +1073,8 @@ export default {
   border: 1px solid rgb(220, 223, 230);
   padding-bottom: 16px;
   background: #ffffff;
+  overflow-x: hidden;
+  scrollbar-width: thin;
 
   &::-webkit-scrollbar {
     width: 4px;

package/src/components/SelectionsGroup.vue

@@ -27,7 +27,7 @@
               class="my-checkbox"
               :label="item[identifierKey]"
               @change="visibilityToggle(item[identifierKey], $event)"
-              :checked="!(('enable' in item) && item.enable === false)">
+              :checked="!('enabled' in item) || (item.enabled === true)">
               <el-row class="checkbox-row">
                 <el-col :span="4">
                 <div class="path-visual" :style="getLineStyles(item)"></div>
@@ -76,7 +76,7 @@ export default {
       this.checkAll = true;
       this.checkedItems = [];
       this.selections.forEach(item => {
-        if (!(('enable' in item) && item.enable === false)) {
+        if (!('enabled' in item) || item.enabled === true) {
           this.checkedItems.push(item[this.identifierKey]);
         } else {
           this.checkAll = false;

package/src/services/flatmapQueries.js

@@ -1,28 +1,37 @@
 /* eslint-disable no-alert, no-console */
 // remove duplicates by stringifying the objects
-const removeDuplicates = function (arrayOfAnything) {
-  return [...new Set(arrayOfAnything.map(e => JSON.stringify(e)))].map(e => JSON.parse(e))
+const removeDuplicates = function(arrayOfAnything){
+  return [...new Set(arrayOfAnything.map(e => JSON.stringify(e)))].map(e => JSON.parse(e)) 
 }
 
-const inArray = function (ar1, ar2) {
+const inArray = function(ar1, ar2){
   let as1 = JSON.stringify(ar1)
   let as2 = JSON.stringify(ar2)
   return as1.indexOf(as2) !== -1
 }
 
-exports.FlatmapQueries = function(sparcApi, flatmapApi) {
-  this.sparcApi = sparcApi
-  this.flatmapApi = flatmapApi
-  this.destinations = []
-  this.origins = []
-  this.components = []
-  this.uberons = []
-  this.urls = []
-  this.controller = undefined
-
-  this.createTooltipData = (eventData) => {
+let FlatmapQueries = function(){
+
+  this.initialise  = function(sparcApi, flatmapApi){
+    this.sparcApi = sparcApi
+    this.flatmapApi = flatmapApi
+    this.destinations = []
+    this.origins = []
+    this.components = []
+    this.uberons = []
+    this.urls = []
+    this.controller = undefined
+    this.getOrganCuries().then(uberons=>{
+      this.uberons = uberons
+      this.createLabelLookup(uberons).then(lookUp=>{
+        this.lookUp = lookUp
+      })
+    })
+  }
+
+  this.createTooltipData = function (eventData) {
     let tooltipData = {
-      destinations: this.destinations,
+      destinations: this.destinations, 
       origins: this.origins,
       components: this.components,
       destinationsWithDatasets: this.destinationsWithDatasets,
@@ -30,32 +39,43 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
       componentsWithDatasets: this.componentsWithDatasets,
       title: eventData.label,
       featureId: eventData.resource,
-      hyperlinks: eventData.feature.hyperlinks ? eventData.feature.hyperlinks : this.urls.map(url => ({ url: url, id: "pubmed" })),
+      hyperlinks: eventData.feature.hyperlinks ? eventData.feature.hyperlinks : this.urls.map(url=>({url: url, id: "pubmed"})),
     }
     return tooltipData
   }
 
-  const getOrganCuries = () => {
-    return new Promise(resolve => {
-      fetch(`${this.sparcAPI}get-organ-curies/`)
-        .then(response => response.json())
-        .then(data => {
-          resolve(data.uberon.array)
-        })
+  this.getOrganCuries = function(){
+    return new Promise(resolve=> {
+    fetch(`${this.sparcAPI}get-organ-curies/`)
+      .then(response=>response.json())
+      .then(data=>{
+        resolve(data.uberon.array)
+      })
     })
   }
 
-  const createLabelLookup = (uberons) => {
-    return new Promise(resolve => {
+  this.createComponentsLabelList = function(components, lookUp){
+    let labelList = []
+    components.forEach(n=>{
+      labelList.push(this.createLabelFromNeuralNode(n[0]), lookUp)
+      if (n.length === 2){
+        labelList.push(this.createLabelFromNeuralNode(n[1]), lookUp)
+      }
+    })
+    return labelList
+  }
+
+  this.createLabelLookup = function(uberons) {
+    return new Promise(resolve=> {
       let uberonMap = {}
-      const data = { sql: buildLabelSqlStatement(uberons) }
+      const data = { sql: this.buildLabelSqlStatement(uberons)}
       fetch(`${this.flatmapApi}knowledge/query/`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(data),
-      })
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(data),
+        })
         .then(response => response.json())
         .then(payload => {
           const entity = payload.keys.indexOf("entity");
@@ -65,20 +85,12 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
               uberonMap[pair[entity]] = pair[label];
             });
           }
-          resolve(uberonMap)
+        resolve(uberonMap)
         })
     })
   }
 
-
-  getOrganCuries().then(uberons => {
-    this.uberons = uberons
-    createLabelLookup(uberons).then(lookUp => {
-      this.lookUp = lookUp
-    })
-  })
-
-  const buildConnectivitySqlStatement = (keastIds) =>{
+  this.buildConnectivitySqlStatement = function (keastIds) {
     let sql = 'select knowledge from knowledge where entity in ('
     if (keastIds.length === 1) {
       sql += `'${keastIds[0]}')`
@@ -90,7 +102,7 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     return sql
   }
 
-  const buildLabelSqlStatement = (uberons) => {
+  this.buildLabelSqlStatement = function (uberons) {
     let sql = 'select entity, label from labels where entity in ('
     if (uberons.length === 1) {
       sql += `'${uberons[0]}')`
@@ -102,7 +114,7 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     return sql
   }
 
-  const findAllIdsFromConnectivity = (connectivity) => {
+  this.findAllIdsFromConnectivity = function (connectivity) {
     let dnodes = connectivity.connectivity.flat() // get nodes from edgelist
     let nodes = [...new Set(dnodes)] // remove duplicates
     let found = []
@@ -116,52 +128,89 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     return [... new Set(found.flat())]
   }
 
-  this.retrieveFlatmapKnowledgeForEvent = async (eventData) =>{
-    // check if there is an existing query
-    if (this.controller) this.controller.abort();
+  this.flattenConntectivity = function (connectivity) {
+    let dnodes = connectivity.flat() // get nodes from edgelist
+    let nodes = [...new Set(dnodes)] // remove duplicates
+    let found = []
+    nodes.forEach(n => {
+      if (Array.isArray(n)) {
+        found.push(n.flat())
+      } else {
+        found.push(n)
+      }
+    })
+    return found.flat()
+  }
 
-    // set up the abort controller
-    this.controller = new AbortController();
-    const signal = this.controller.signal;
+  this.findComponents = function (connectivity) {
+    let dnodes = connectivity.connectivity.flat() // get nodes from edgelist
+    let nodes = removeDuplicates(dnodes)
 
-    const keastIds = eventData.resource
-    this.destinations = []
-    this.origins = []
-    this.components = []
-    if (!keastIds || keastIds.length == 0) return
-    const data = { sql: buildConnectivitySqlStatement(keastIds) };
-    let prom1 = new Promise(resolve => {
-      fetch(`${this.flatmapApi}knowledge/query/`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(data),
-        signal: signal
-      })
+    let found = []
+    let terminal = false
+    nodes.forEach(node => {
+      terminal = false
+      // Check if the node is an destination or origin (note that they are labelled dendrite and axon as opposed to origin and destination)
+      if (inArray(connectivity.axons, node)) {
+        terminal = true
+      }
+      if (inArray(connectivity.dendrites, node)) {
+        terminal = true
+      }
+      if (!terminal) {
+        found.push(node)
+      }
+    })
+
+    return found
+  }
+
+  this.retrieveFlatmapKnowledgeForEvent = async function(eventData){
+      // check if there is an existing query
+      if (this.controller) this.controller.abort();
+
+      // set up the abort controller
+      this.controller = new AbortController();
+      const signal = this.controller.signal;
+
+      const keastIds = eventData.resource
+      this.destinations = []
+      this.origins = []
+      this.components = []
+      if (!keastIds || keastIds.length == 0) return
+      const data = { sql: this.buildConnectivitySqlStatement(keastIds)};
+      let prom1 = new Promise(resolve=>{
+        fetch(`${this.flatmapApi}knowledge/query/`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(data),
+          signal: signal
+        })
         .then(response => response.json())
         .then(data => {
-          if (connectivityExists(data)) {
+          if(this.connectivityExists(data)){
             let connectivity = JSON.parse(data.values[0][0])
-            processConnectivity(connectivity).then(() => {
+            this.processConnectivity(connectivity).then(()=>{
               resolve(true)
             })
           } else {
             console.log('No connectivity data found')
-            resolve(true)
+            resolve(false)
           }
         })
         .catch((error) => {
           console.error('Error:', error);
           resolve(false)
         })
-    })
-    let prom2 = pubmedQueryOnIds(eventData)
-    return await Promise.all([prom1, prom2])
-
+      })
+      let prom2 = this.pubmedQueryOnIds(eventData)
+      let results = await Promise.all([prom1, prom2])
+      return results.every(Boolean)
   }
 
-  const connectivityExists = (data) => {
+  this.connectivityExists = function(data){
     if (data.values && data.values.length > 0 && JSON.parse(data.values[0][0]).connectivity && JSON.parse(data.values[0][0]).connectivity.length > 0) {
       return true
     } else {
@@ -169,12 +218,12 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     }
   }
 
-  const createLabelFromNeuralNode = (node, lookUp) => {
+  this.createLabelFromNeuralNode = function(node, lookUp){
     let label = lookUp[node[0]]
-    if (node.length === 2 && node[1].length > 0) {
-      node[1].forEach(n => {
-        if (lookUp[n] == undefined) {
-          label += `, ${n}`
+    if (node.length === 2 && node[1].length > 0){
+      node[1].forEach(n=>{
+        if (lookUp[n] == undefined){
+          label += `, ${n}` 
         } else {
           label += `, ${lookUp[n]}`
         }
@@ -183,12 +232,12 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     return label
   }
 
-  const flattenAndFindDatasets = (components, axons, dendrites) => {
-
+  this.flattenAndFindDatasets = function(components, axons, dendrites){
+      
     // process the nodes for finding datasets (Note this is not critical to the tooltip, only for the 'search on components' button)
-    let componentsFlat = flattenConntectivity(components)
-    let axonsFlat = flattenConntectivity(axons)
-    let dendritesFlat = flattenConntectivity(dendrites)
+    let componentsFlat = this.flattenConntectivity(components)
+    let axonsFlat = this.flattenConntectivity(axons)
+    let dendritesFlat = this.flattenConntectivity(dendrites)
 
     // Filter for the anatomy which is annotated on datasets
     this.destinationsWithDatasets = this.uberons.filter(ub => axonsFlat.indexOf(ub.id) !== -1)
@@ -196,36 +245,36 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     this.componentsWithDatasets = this.uberons.filter(ub => componentsFlat.indexOf(ub.id) !== -1)
   }
 
-  const processConnectivity = (connectivity) => {
-    return new Promise(resolve => {
+  this.processConnectivity = function(connectivity){
+    return new Promise (resolve=>{
 
       // Filter the origin and destinations from components
-      let components = findComponents(connectivity)
+      let components = this.findComponents(connectivity)
 
       // Remove duplicates
       let axons = removeDuplicates(connectivity.axons)
       let dendrites = removeDuplicates(connectivity.dendrites)
 
       // Create list of ids to get labels for
-      let conIds = findAllIdsFromConnectivity(connectivity)
+      let conIds = this.findAllIdsFromConnectivity(connectivity)  
 
       // Create readable labels from the nodes. Setting this to 'this.origins' updates the display
-      createLabelLookup(conIds).then(lookUp => {
-        this.destinations = axons.map(a => createLabelFromNeuralNode(a, lookUp))
-        this.origins = dendrites.map(d => createLabelFromNeuralNode(d, lookUp))
-        this.components = components.map(c => createLabelFromNeuralNode(c, lookUp))
-        flattenAndFindDatasets(components, axons, dendrites)
+      this.createLabelLookup(conIds).then(lookUp=>{
+        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))
+        this.flattenAndFindDatasets(components, axons, dendrites)
         resolve(true)
       })
     })
   }
 
-  const flattenConntectivity = (connectivity) => {
+  this.flattenConntectivity = function(connectivity){
     let dnodes = connectivity.flat() // get nodes from edgelist
     let nodes = [...new Set(dnodes)] // remove duplicates
     let found = []
-    nodes.forEach(n => {
-      if (Array.isArray(n)) {
+    nodes.forEach(n=>{
+      if (Array.isArray(n)){
         found.push(n.flat())
       } else {
         found.push(n)
@@ -234,22 +283,22 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     return found.flat()
   }
 
-  const findComponents = (connectivity) => {
+  this.findComponents = function(connectivity){
     let dnodes = connectivity.connectivity.flat() // get nodes from edgelist
     let nodes = removeDuplicates(dnodes)
 
     let found = []
     let terminal = false
-    nodes.forEach(node => {
+    nodes.forEach(node=>{
       terminal = false
       // Check if the node is an destination or origin (note that they are labelled dendrite and axon as opposed to origin and destination)
-      if (inArray(connectivity.axons, node)) {
+      if(inArray(connectivity.axons,node)){
         terminal = true
       }
-      if (inArray(connectivity.dendrites, node)) {
+      if(inArray(connectivity.dendrites, node)){
         terminal = true
       }
-      if (!terminal) {
+      if (!terminal){
         found.push(node)
       }
     })
@@ -257,11 +306,11 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     return found
   }
 
-  const stripPMIDPrefix = (pubmedId) => {
+  this.stripPMIDPrefix = function (pubmedId){
     return pubmedId.split(':')[1]
   }
 
-  const buildPubmedSqlStatement = (keastIds) => {
+  this.buildPubmedSqlStatement = function(keastIds) {
     let sql = 'select distinct publication from publications where entity in ('
     if (keastIds.length === 1) {
       sql += `'${keastIds[0]}')`
@@ -273,12 +322,12 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
     return sql
   }
 
-  const buildPubmedSqlStatementForModels = (model) => {
+  this.buildPubmedSqlStatementForModels = function(model) {
     return `select distinct publication from publications where entity = '${model}'`
   }
 
-  const flatmapQuery = (sql) => {
-    const data = { sql: sql }
+  this.flatmapQuery = function(sql){
+    const data = { sql: sql}
     return fetch(`${this.flatmapApi}knowledge/query/`, {
       method: 'POST',
       headers: {
@@ -286,43 +335,46 @@ exports.FlatmapQueries = function(sparcApi, flatmapApi) {
       },
       body: JSON.stringify(data),
     })
-      .then(response => response.json())
-      .catch((error) => {
-        console.error('Error:', error)
-      })
+    .then(response => response.json())
+    .catch((error) => {
+      console.error('Error:', error)
+    })
   }
 
-  const pubmedQueryOnIds = (eventData) => {
+  this.pubmedQueryOnIds = function(eventData){
     const keastIds = eventData.resource
     const source = eventData.feature.source
-    if (!keastIds || keastIds.length === 0) return
-    const sql = buildPubmedSqlStatement(keastIds)
-    return flatmapQuery(sql).then(data => {
+    if(!keastIds || keastIds.length === 0) return
+    const sql = this.buildPubmedSqlStatement(keastIds)
+    return this.flatmapQuery(sql).then(data=>{
       // Create pubmed url on paths if we have them
-      if (data.values.length > 0) {
-        this.urls = [pubmedSearchUrl(data.values.map(id => stripPMIDPrefix(id[0])))]
+      if (data.values.length > 0){
+        this.urls = [this.pubmedSearchUrl(data.values.map(id=>this.stripPMIDPrefix(id[0])))]
         return true
       } else { // Create pubmed url on models
-        pubmedQueryOnModels(source).then(() => { return true })
+        this.pubmedQueryOnModels(source).then(()=>{return true})
       }
+      return false
     })
   }
 
-  const pubmedQueryOnModels = (source) => {
-    return flatmapQuery(buildPubmedSqlStatementForModels(source)).then(data => {
-      if (Array.isArray(data.values) && data.values.length > 0) {
-        this.urls = [pubmedSearchUrl(data.values.map(id => stripPMIDPrefix(id[0])))]
+  this.pubmedQueryOnModels = function(source){
+    return this.flatmapQuery(this.buildPubmedSqlStatementForModels(source)).then(data=>{
+      if (Array.isArray(data.values) && data.values.length > 0){
+        this.urls = [this.pubmedSearchUrl(data.values.map(id=>this.stripPMIDPrefix(id[0])))]
       } else {
         this.urls = [] // Clears the pubmed search button 
-      }
+      } 
       return
     })
   }
 
-  const pubmedSearchUrl = (ids) => {
+  this.pubmedSearchUrl = function(ids) {
     let url = 'https://pubmed.ncbi.nlm.nih.gov/?'
     let params = new URLSearchParams()
     params.append('term', ids)
     return url + params.toString()
   }
 }
+
+export {FlatmapQueries}