Merge pull request #734 from VirtualFlyBrain/debug

latest from debug for testing

.travis.yml

@@ -82,7 +82,7 @@ jobs:
         - if [ "$BUILD_TYPE" == "development" ]; then export TAG=$TAG-development; fi;
         - export TAG="$TAG-TEST"
       install:
-        - npm install jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
+        - npm install jest@24.8.0 jest-image-snapshot@4.1.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
       before_script:
         - echo -e "travis_fold:start:Docker_Run" || true
         - docker login -u $DOCKER_USER -p $DOCKER_PASS;
@@ -104,7 +104,7 @@ jobs:
           done;
         - echo -e "travis_fold:end:Startup_Server3" || true
       script:
-        - travis_wait 41 npm test -- --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/batch1/.*js'
+        - travis_wait 41 npm test -- --updateSnapshot --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/batch1/.*js'
       after_failure:
         - docker ps -a
         - docker logs $CONTAINER_NAME
@@ -122,7 +122,7 @@ jobs:
         - if [ "$BUILD_TYPE" == "development" ]; then export TAG=$TAG-development; fi;
         - export TAG="$TAG-TEST"
       install:
-        - npm install jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
+        - npm install jest@24.8.0 jest-image-snapshot@4.1.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
       before_script:
         - echo -e "travis_fold:start:Docker_Run" || true
         - docker login -u $DOCKER_USER -p $DOCKER_PASS;
@@ -144,7 +144,7 @@ jobs:
           done;
         - echo -e "travis_fold:end:Startup_Server3" || true
       script:
-        - travis_wait 41 npm test -- --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/batch2/.*js'
+        - travis_wait 41 npm test -- --updateSnapshot --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/batch2/.*js'
       after_failure:
         - docker ps -a
         - docker logs $CONTAINER_NAME
@@ -162,7 +162,7 @@ jobs:
         - if [ "$BUILD_TYPE" == "development" ]; then export TAG=$TAG-development; fi;
         - export TAG="$TAG-TEST"
       install:
-        - npm install jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
+        - npm install jest@24.8.0 jest-image-snapshot@4.1.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
       before_script:
         - echo -e "travis_fold:start:Docker_Run" || true
         - docker login -u $DOCKER_USER -p $DOCKER_PASS;
@@ -184,7 +184,7 @@ jobs:
           done;
         - echo -e "travis_fold:end:Startup_Server3" || true
       script:
-        - travis_wait 41 npm test -- --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/batch3/.*js'
+        - travis_wait 41 npm test -- --updateSnapshot --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/batch3/.*js'
       after_failure:
         - docker ps -a
         - sudo docker cp $CONTAINER_NAME:/home/developer/virgo/serviceability/logs/log.log /etc
@@ -272,7 +272,7 @@ jobs:
         - if [ "$BUILD_TYPE" == "development" ]; then export TAG=$TAG-development; fi;
         - export TAG="$TAG-TEST"
       install:
-        - npm install jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
+        - npm install jest@24.8.0 jest-image-snapshot@4.1.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
       before_script:
         - echo -e "travis_fold:start:Docker_Run" || true
         - docker login -u $DOCKER_USER -p $DOCKER_PASS;
@@ -294,7 +294,7 @@ jobs:
           done;
         - echo -e "travis_fold:end:Startup_Server3" || true
       script:
-        - travis_wait 41 npm test -- --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/review/.*js'
+        - travis_wait 41 npm test -- --updateSnapshot --verbose --colors --forceExit --testPathPattern='tests/jest/vfb/review/.*js'
       after_failure:
         - docker ps -a
         - docker logs $CONTAINER_NAME

components/VFBMain.js

@@ -1062,12 +1062,12 @@ class VFBMain extends React.Component {
     /**
      * If redux action was to set term info visible, we handle it here, other wise 'shouldComponentUpdate' will prevent update
      */
-    if ( nextProps.generals.termInfoVisible && nextProps.generals.type === VFB_LOAD_TERM_INFO ) {
+    if ( nextProps.generals.ui.termInfo.termInfoVisible && nextProps.generals.type === VFB_LOAD_TERM_INFO ) {
       this.setActiveTab("termInfo");
       this.termInfoReference.setTermInfo(this.instanceOnFocus);
     }
 
-    if ( nextProps.generals.listViewerInfoVisible && nextProps.generals.type === SHOW_LIST_VIEWER ) {
+    if ( nextProps.generals.ui.layers.listViewerInfoVisible && nextProps.generals.type === SHOW_LIST_VIEWER ) {
       if (this.listViewerReference === undefined || this.listViewerReference === null) {
         this.setState({
           UIUpdated: true,

components/configuration/VFBGraph/graphConfiguration.js

@@ -13,7 +13,7 @@ var whatCypherQuery = instance => ({
   "statements": [
     {
       "statement": "MATCH p=(n:Entity {short_form:'" + instance + "'})-[:INSTANCEOF|:SUBCLASSOF*..]->(x) "
-      + "WHERE (('Cell' IN  labels(x)) OR ('synaptic neuropil' IN labels(x))) "
+      + "WHERE ('Anatomy' IN  labels(x)) OR (('Cell' IN  labels(x)) OR ('synaptic neuropil' IN labels(x))) "
       + " OR (('Ganglion' IN  labels(x)) OR ('Neuron_projection_bundle' IN labels(x))) "
       + "RETURN  p, n.short_form as root",
       "resultDataContents": ["graph"]

components/interface/VFBCircuitBrowser/VFBCircuitBrowser.js

@@ -504,7 +504,7 @@ class VFBCircuitBrowser extends Component {
 VFBCircuitBrowser.propTypes = { classes: PropTypes.object.isRequired };
 
 function mapStateToProps (state) {
-  return { circuitQuerySelected : state.generals.circuitQuerySelected }
+  return { circuitQuerySelected : state.generals.ui.circuitBrowser.circuitQuerySelected }
 }
 
 export default connect(mapStateToProps, null, null, { forwardRef : true } )(withStyles(styles)(VFBCircuitBrowser));

components/interface/VFBGraph/VFBGraph.js

@@ -742,7 +742,7 @@ class VFBGraph extends Component {
 
 function mapStateToProps (state) {
   return {
-    graphQueryIndex : state.generals.graphQueryIndex,
+    graphQueryIndex : state.generals.ui.graph.graphQueryIndex,
     instanceOnFocus : state.generals.instanceOnFocus
   }
 }

components/interface/VFBListViewer/ListViewerControlsMenu.js

@@ -87,8 +87,10 @@ class ListViewerControlsMenu extends Component {
         var self = this;
         instance.getType().resolve(function () {
           self.props.instance.setColor(color);
-          GEPPETTO.trigger('experiment:visibility_changed', instance);
-          GEPPETTO.ControlPanel.refresh();
+          if ( instance.getInstancePath !== undefined ) {
+            GEPPETTO.trigger('experiment:visibility_changed', instance);
+            GEPPETTO.ControlPanel.refresh();
+          }
         });
       } else { 
         if (GEPPETTO.SceneController.isInstancePresent(instance)) { 

components/interface/VFBListViewer/VFBListViewer.js

@@ -70,8 +70,8 @@ class VFBListViewer extends Component {
 
 function mapStateToProps (state) {
   return { 
+    instanceDeleted : state.generals.ui.canvas.instanceDeleted,
     instanceOnFocus : state.generals.instanceOnFocus,
-    instanceDeleted : state.generals.instanceDeleted,
     idsMap : state.generals.idsMap,
     idsList : state.generals.idsList
   }