#1179 Fixes complicated layout of vfb queries and #1180 fixes

autocomplete results for circuit browser
VirtualFlyBrain · Sep 15, 2021 · e7649ae · e7649ae
1 parent 09fda4c
commit e7649ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/components/configuration/VFBCircuitBrowser/datasources/SOLRclient.tsx b/components/configuration/VFBCircuitBrowser/datasources/SOLRclient.tsx
@@ -197,7 +197,7 @@ function refineResults(e) {
 }
 
 export const datasourceConfiguration = {
-  "url": "https://solr.virtualflybrain.org/solr/ontology/select",
+  "url": "https://solr-dev.virtualflybrain.org/solr/ontology/select",
   "query_settings":
     {
       "q": "$SEARCH_TERM$ OR $SEARCH_TERM$* OR *$SEARCH_TERM$*",

diff --git a/components/interface/VFBCircuitBrowser/Controls.js b/components/interface/VFBCircuitBrowser/Controls.js
@@ -153,20 +153,10 @@ class AutocompleteResults extends Component {
    */
   handleResults (status, data, value){
     let results = {};
-    console.log("Status ", status)
-    console.log("Data ", data)
-    console.log("Value ", value)
     data?.map(result => {
-      // Match results by short_form id
-      if ( result?.short_form?.toLowerCase().includes(value?.toLowerCase()) ){
-        results[result?.label] = result;
-      } else if ( result?.label?.toLowerCase().includes(value?.toLowerCase()) ){
-        results[result?.label] = result;
-      }
+      results[result?.label] = result;
     });
-
-    console.log("Results ", results)
-
+
     this.setState({ filteredResults : results });
   }
 
@@ -176,6 +166,7 @@ class AutocompleteResults extends Component {
 
   render () {
     const label = "Neuron " + (this.props.index + 1) .toString();
+    console.log("Results ", this.state.filteredResults)
 
     return (
       <Autocomplete

diff --git a/components/interface/VFBCircuitBrowser/QueryParser.js b/components/interface/VFBCircuitBrowser/QueryParser.js
@@ -52,7 +52,9 @@ export function queryParser (e) {
       if (allRelationships.get(parseInt(startNode)) === undefined) {
         allRelationships.set(parseInt(startNode), new Array());
       }
-      allRelationships?.get(parseInt(startNode))?.push( { target : parseInt(endNode), label : properties[e.data.params.configuration.resultsMapping.link.label], weight : properties[e.data.params.configuration.resultsMapping.link.weight] });
+      if ( data[0]?.row[3].includes(parseInt(id)) ) {
+        allRelationships?.get(parseInt(startNode))?.push( { target : parseInt(endNode), label : properties[e.data.params.configuration.resultsMapping.link.label], weight : properties[e.data.params.configuration.resultsMapping.link.weight] });
+      }
     });
   });