From 4fd01ccbc21a8ffec6667e62a68c36f4649c6002 Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <jaden.diefenbaugh@idiap.ch>
Date: Sun, 14 Oct 2018 09:47:54 -0700
Subject: [PATCH] [js][exp] show/hide dataset settings like other blocks,
closes #128
---
conda/js/src/components/experiment/ExperimentEditor.jsx | 6 +++---
.../js/src/components/experiment/ExperimentEditor.spec.jsx | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/conda/js/src/components/experiment/ExperimentEditor.jsx b/conda/js/src/components/experiment/ExperimentEditor.jsx
index 78f3e502..d6c0a1d9 100644
--- a/conda/js/src/components/experiment/ExperimentEditor.jsx
+++ b/conda/js/src/components/experiment/ExperimentEditor.jsx
@@ -1305,9 +1305,9 @@ export class ExperimentEditor extends React.Component<Props, State> {
{ this.state.disableTypeInference ? 'Enable' : 'Disable' } Type Inference
</Button>
</FormGroup>
- { this.renderBlocks() }
- { this.renderAnalyzers() }
- { this.renderDatasets() }
+ { this.state.activeBlockInfo.set === 'blocks' && this.renderBlocks() }
+ { this.state.activeBlockInfo.set === 'analyzers' && this.renderAnalyzers() }
+ { this.state.activeBlockInfo.set === 'datasets' && this.renderDatasets() }
{ this.renderGlobals() }
</Form>
</div>
diff --git a/conda/js/src/components/experiment/ExperimentEditor.spec.jsx b/conda/js/src/components/experiment/ExperimentEditor.spec.jsx
index 71feeed1..1c236bcc 100644
--- a/conda/js/src/components/experiment/ExperimentEditor.spec.jsx
+++ b/conda/js/src/components/experiment/ExperimentEditor.spec.jsx
@@ -98,6 +98,7 @@ describe('<ExperimentEditor />', () => {
//console.log('finished name change, doing dataset');
+ wrapper.find('svg #block_set').simulate('click');
wrapper.find('div.dataset0 select').simulate('change', { target: { value: 'protocol/set (simple/1)'}});
expect(updateFunc.callCount).to.equal(1);
expect(wrapper.props().data.contents).to.have.deep.property('datasets', {
@@ -237,6 +238,7 @@ describe('<ExperimentEditor />', () => {
//console.log('doing dataset');
+ wrapper.find('svg #block_training_data').simulate('click');
wrapper.find('div.datasets select').at(0).simulate('change', { target: { value: '{"testing_data":{"database":"iris/1","protocol":"Main","set":"training"},"training_data":{"database":"iris/1","protocol":"Main","set":"testing"}}'}});
expect(updateFunc.callCount).to.equal(1);
expect(wrapper.props().data.contents).to.have.deep.property('datasets', {
--
GitLab