Merge pull request #346 from VirtualFlyBrain/vfb_geppetto_application

Fix for anat 2 exp query
VirtualFlyBrain · Jul 23, 2019 · 0cae045 · 0cae045
2 parents f4d86d8 + c7ab202
commit 0cae045
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 19 deletions.
diff --git a/components/VFBMain.js b/components/VFBMain.js
@@ -856,6 +856,7 @@ export default class VFBMain extends React.Component {
                   'Examples',
                   'Source',
                   'License',
+                  'Related Individuals',
                   'Relationships',
                   'Query for',
                   'Query For',

diff --git a/components/configuration/queryBuilderConfiguration.js b/components/configuration/queryBuilderConfiguration.js
@@ -17,7 +17,7 @@ var queryResultsColMeta = [
     "locked": false,
     "visible": true,
     "customComponent": QueryLinkComponent,
-    "actions": "window.addVfbId('$entity$');",
+    "actions": "window.addVfbId('$entity$'.split('----')[0]);",
     "displayName": "Name",
     "cssClassName": "query-results-name-column",
   },
@@ -26,6 +26,8 @@ var queryResultsColMeta = [
     "order": 3,
     "locked": false,
     "visible": true,
+    "customComponent": QueryLinkComponent,
+    "actions": "window.addVfbId('$entity$'.split('----')[1]);",
     "displayName": "Expressed_in",
     "cssClassName": "query-results-expressed_in-column"
   },
@@ -42,6 +44,8 @@ var queryResultsColMeta = [
     "order": 5,
     "locked": false,
     "visible": true,
+    "customComponent": QueryLinkComponent,
+    "actions": "window.addVfbId('$entity$'.split('----')[2]);",
     "displayName": "Reference",
     "cssClassName": "query-results-reference-column"
   },

diff --git a/components/interface/ErrorCatcher.js b/components/interface/ErrorCatcher.js
@@ -47,7 +47,7 @@ class ErrorCatcher extends React.Component {
 
     handleClose = () => {
       var customMessage = "Steps to reproduce the problem: \n\nPlease fill the below with the necessary steps to reproduce the problem\n\n\n\nError Information:\n\n"
-      var url = "https://github.com/VirtualFlyBrain/VFB2/issues/new?body=" + customMessage + this.state.error.message + "\n\n" + this.state.error.stack;
+      var url = "https://github.com/VirtualFlyBrain/VFB2/issues/new?body=" + customMessage + this.state.error.message + "\n\n" + escape(this.state.error.stack);
       var win = window.open(encodeURI(url), '_blank');
       win.focus();
     };

diff --git a/components/interface/VFBTermInfo.js b/components/interface/VFBTermInfo.js
@@ -610,6 +610,7 @@ export default class VFBTermInfoWidget extends React.Component {
 
         GEPPETTO.trigger('spin_logo');
         $("body").css("cursor", "progress");
+        $('#query-results-label')[0].innerText = "Pulling Query Results...";
 
         var callback = function () {
           // check if any results with count flag

diff --git a/css/VFBMain.less b/css/VFBMain.less
@@ -218,6 +218,11 @@
     color: #11bffe;
 }
 
+// query results header
+#querybuilder .griddle th{
+	text-align: left !important;	
+}
+
 // query results rows 
 .griddle-body {
 	font-size: 14px !important;