Merge pull request #450 from VirtualFlyBrain/development

Update to latest from Dev
VirtualFlyBrain · Nov 6, 2019 · 9345b23 · 9345b23
2 parents 5dcf292 + 96e7cc7
commit 9345b23
Show file tree

Hide file tree

Showing 9 changed files with 308 additions and 147 deletions.
diff --git a/GeppettoConfiguration.json b/GeppettoConfiguration.json
@@ -13,6 +13,18 @@
     "type": "website",
     "url": "http://v2.virtualflybrain.org",
     "icon" :"https://v2.virtualflybrain.org/images/vfbbrain_icon.png",
-    "image": "https://v2.virtualflybrain.org/images/vfbbrain_icon.png"
+    "image": "https://v2.virtualflybrain.org/images/vfbbrain_icon.png",
+    "errorDialog": {
+      "message" : "I broke geppetto, ops!",
+      "githubButton": {
+        "enabled" : true,
+        "url" : "https://github.com/VirtualFlyBrain/geppetto-vfb/issues"
+      },
+      "twitterButton": {
+        "enabled" : true,
+        "url" : "https://twitter.com/openworm",
+        "message" : "I broke geppetto, ops!"
+      }
+    }
   }
 }
diff --git a/components/VFBMain.js b/components/VFBMain.js
@@ -47,6 +47,7 @@ export default class VFBMain extends React.Component {
       idSelected: undefined
     };
 
+    this.addVfbId = this.addVfbId.bind(this);
     this.menuHandler = this.menuHandler.bind(this);
     this.setWrapperRef = this.setWrapperRef.bind(this);
     this.htmlToolbarRef = this.htmlToolbarRef.bind(this);
@@ -786,7 +787,8 @@ export default class VFBMain extends React.Component {
           id="treeWidget"
           instance={this.instanceOnFocus}
           size={{ height: _height, width: _width }}
-          ref={ref => this.treeBrowserReference = ref}/>
+          ref={ref => this.treeBrowserReference = ref}
+          selectionHandler={this.addVfbId}/>
       </div>);
     }
   }

diff --git a/components/configuration/treeWidgetConfiguration.js b/components/configuration/treeWidgetConfiguration.js
@@ -0,0 +1,22 @@
+var restPostConfig = {
+  url: "http://pdb.virtualflybrain.org/db/data/transaction/commit",
+  contentType: "application/json"
+};
+
+var treeCypherQuery = instance => ({
+  "statements": [
+    {
+      "statement": "MATCH (root:Class)<-[:INSTANCEOF]-(t:Individual {short_form:'" + instance + "'})"
+      + "<-[:depicts]-(tc:Individual)<-[ie:in_register_with]-(c:Individual)-[:depicts]->(image:"
+      + "Individual)-[r:INSTANCEOF]->(anat:Class) WHERE has(ie.index) WITH root, anat,r,image"
+      + " MATCH p=allShortestPaths((root)<-[:SUBCLASSOF|part_of*..]-(anat:Class)) RETURN p,r,image",
+      "resultDataContents": ["graph"]
+    }
+  ]
+});
+
+
+module.exports = {
+  restPostConfig,
+  treeCypherQuery
+};
diff --git a/components/interface/FocusTerm.js b/components/interface/FocusTerm.js
@@ -1,6 +1,11 @@
 import React, { Component } from 'react';
 import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
 import Menu from 'geppetto-client/js/components/interface/menu/Menu';
+import Tooltip from '@material-ui/core/Tooltip';
+import {
+  createMuiTheme,
+  MuiThemeProvider
+} from "@material-ui/core/styles";
 
 var GEPPETTO = require('geppetto');
 var Rnd = require('react-rnd').default;
@@ -15,6 +20,7 @@ export default class FocusTerm extends React.Component {
 
     this.focusTermConfiguration = require('../configuration/focusTermConfiguration.js').focusTermConfiguration;
     this.labels = require('../configuration/focusTermConfiguration.js').subMenusGrouping;
+    this.theme = createMuiTheme({ overrides: { MuiTooltip: { tooltip: { fontSize: "12px" } } } });
 
     this.clearAll = this.clearAll.bind(this);
     this.menuHandler = this.menuHandler.bind(this);
@@ -122,7 +128,7 @@ export default class FocusTerm extends React.Component {
               if (allQueries2.length > 0) {
                 focusSubMenu.push(
                   {
-                    label: "Search for",
+                    label: "Query for",
                     icon: "",
                     action: "",
                     position: "left",
@@ -139,7 +145,7 @@ export default class FocusTerm extends React.Component {
         } else {
           focusSubMenu.push(
             {
-              label: "Search for",
+              label: "Query for",
               icon: "",
               action: "",
               position: "left",
@@ -160,7 +166,7 @@ export default class FocusTerm extends React.Component {
               if (allQueries.length > 0) {
                 focusSubMenu.push(
                   {
-                    label: "Search for",
+                    label: "Query for",
                     icon: "",
                     action: "",
                     position: "left",
@@ -178,7 +184,7 @@ export default class FocusTerm extends React.Component {
             if (allQueries.length > 0) {
               focusSubMenu.push(
                 {
-                  label: "Search for",
+                  label: "Query for",
                   icon: "",
                   action: "",
                   position: "left",
@@ -476,55 +482,63 @@ export default class FocusTerm extends React.Component {
 
           <div className="focusTermRight">
             <div className="focusTermDivR">
-              <i className="fa fa-eraser arrowsStyle tooltipLink"
-                onClick={() => {
-                  this.clearAll();
-                }}>
-                <span className="tooltipBox"> Clear all </span>
-              </i>
-              <i className="fa fa-search arrowsStyle tooltipLink"
-                onClick={() => {
-                  this.props.UIUpdateManager("spotlightVisible");
-                }}>
-                <span className="tooltipBox"> Open the spotlight </span>
-              </i>
-              <i className="fa fa-quora arrowsStyle tooltipLink"
-                onClick={() => {
-                  this.props.UIUpdateManager("queryBuilderVisible");
-                }}>
-                <span className="tooltipBox"> Open the query builder </span>
-              </i>
-              <i className="fa fa-list arrowsStyle tooltipLink"
-                onClick={() => {
-                  this.props.UIUpdateManager("controlPanelVisible");
-                }}>
-                <span className="tooltipBox"> Open the control panel </span>
-              </i>
-              { window.history.state !== null && window.history.state.b !== undefined && window.history.state.b !== ""
-                ? <i className="fa fa-chevron-left arrowsStyle tooltipLink"
-                  onClick={() => {
-                    if (window.vfbUpdatingHistory == false) {
-                      window.history.back();
-                    }
-                  }}>
-                  <span className="tooltipBox"> {tooltipPrevious} </span>
-                </i>
-                : <i className="fa fa-chevron-left arrowsStyle isDisabled" /> 
-              }
-              { window.history.state !== null && window.history.state.f !== undefined && window.history.state.f !== "" 
-                ? <i className="fa fa-chevron-right arrowsStyle tooltipLink"
-                  onClick={() => {
-                    if (window.vfbUpdatingHistory == false) {
-                      window.history.forward();
-                    }
-                  }}>
-                  <span className="tooltipBox"> {tooltipNext} </span>
-                </i>
-                : <i className="fa fa-chevron-right arrowsStyle isDisabled" /> 
-              }
-              <Menu
-                configuration={this.focusTermConfiguration}
-                menuHandler={this.menuHandler} />
+              <MuiThemeProvider theme={this.theme}>
+                <Tooltip placement="top-end"
+                  title="Clear all">
+                  <i className="fa fa-eraser arrowsStyle"
+                    onClick={() => {
+                      this.clearAll();
+                    }} />
+                </Tooltip>
+                <Tooltip placement="top-end"
+                  title="Search">
+                  <i className="fa fa-search arrowsStyle"
+                    onClick={() => {
+                      this.props.UIUpdateManager("spotlightVisible");
+                    }} />
+                </Tooltip>
+                <Tooltip placement="top-end"
+                  title="Open query results">
+                  <i className="fa fa-quora arrowsStyle"
+                    onClick={() => {
+                      this.props.UIUpdateManager("queryBuilderVisible");
+                    }} />
+                </Tooltip>
+                <Tooltip placement="top-end"
+                  title="Open the control panel">
+                  <i className="fa fa-list arrowsStyle"
+                    onClick={() => {
+                      this.props.UIUpdateManager("controlPanelVisible");
+                    }} />
+                </Tooltip>
+                { window.history.state !== null && window.history.state.b !== undefined && window.history.state.b !== ""
+                  ? <Tooltip placement="top-end"
+                    title={tooltipPrevious}>
+                    <i className="fa fa-chevron-left arrowsStyle"
+                      onClick={() => {
+                        if (window.vfbUpdatingHistory == false) {
+                          window.history.back();
+                        }
+                      }} />
+                  </Tooltip>
+                  : <i className="fa fa-chevron-left arrowsStyle isDisabled" /> 
+                }
+                { window.history.state !== null && window.history.state.f !== undefined && window.history.state.f !== "" 
+                  ? <Tooltip placement="top-end"
+                    title={tooltipNext}> 
+                    <i className="fa fa-chevron-right arrowsStyle"
+                      onClick={() => {
+                        if (window.vfbUpdatingHistory == false) {
+                          window.history.forward();
+                        }
+                      }} />
+                  </Tooltip>
+                  : <i className="fa fa-chevron-right arrowsStyle isDisabled" /> 
+                }
+                <Menu
+                  configuration={this.focusTermConfiguration}
+                  menuHandler={this.menuHandler} />
+              </MuiThemeProvider>
             </div>
           </div>
         </nav>