diff --git a/conda/js/src/components/experiment/ExperimentEditor.jsx b/conda/js/src/components/experiment/ExperimentEditor.jsx
index 78f3e502588f2e4468686f34b64f534d82757b90..acc55144d1bbae5b3b94671868d37af4f5c9e5f8 100644
--- a/conda/js/src/components/experiment/ExperimentEditor.jsx
+++ b/conda/js/src/components/experiment/ExperimentEditor.jsx
@@ -4,7 +4,7 @@ import {
Container,
Row,
Col,
- Button,
+ Button, ButtonGroup,
Form,
FormGroup,
Label,
@@ -141,14 +141,15 @@ const isValidEntity = (
possibleObj: {inputs: any, outputs: any} = {inputs:{},outputs:{}},
inferredTypes = {}
): boolean => {
- if(!blockTcEntity.hasOwnProperty('inputs') && Object.keys(possibleObj.inputs).length > 0)
+ const hasInputs = Array.isArray(blockTcEntity.inputs);
+ const hasOutputs = Array.isArray(blockTcEntity.outputs);
+ if(!hasInputs && Object.keys(possibleObj.inputs).length > 0)
return false;
- if(!blockTcEntity.hasOwnProperty('outputs') && Object.keys(possibleObj.outputs).length > 0)
+ if(!hasOutputs && Object.keys(possibleObj.outputs).length > 0)
return false;
- if(blockTcEntity.hasOwnProperty('inputs') && blockTcEntity.inputs.length !== Object.keys(possibleObj.inputs).length)
+ if(hasInputs && blockTcEntity.inputs.length !== Object.keys(possibleObj.inputs).length)
return false;
- if(blockTcEntity.hasOwnProperty('inputs') &&
- blockTcEntity.hasOwnProperty('outputs') &&
+ if(hasInputs && hasOutputs &&
blockTcEntity.outputs.length !== Object.keys(possibleObj.outputs).length
)
return false;
@@ -199,6 +200,9 @@ const levMapStrings = (keyArr: string[], valArr: string[]): { [string]: string }
const vals = [...valArr];
const map = {};
+ //console.log(keys);
+ //console.log(vals);
+
while(keys.length > 0){
const scores = {};
const matches = {};
@@ -226,6 +230,7 @@ const levMapStrings = (keyArr: string[], valArr: string[]): { [string]: string }
map[chosenKey] = matches[chosenKey];
keys.splice(keys.indexOf(chosenKey), 1);
vals.splice(vals.indexOf(matches[chosenKey]), 1);
+ //console.log(map);
}
const orderedMap = {};
@@ -233,6 +238,7 @@ const levMapStrings = (keyArr: string[], valArr: string[]): { [string]: string }
orderedMap[k] = map[k];
}
+ //console.log(orderedMap);
return orderedMap;
};
@@ -586,13 +592,14 @@ export class ExperimentEditor extends React.Component<Props, State> {
onChange={e => {
const str = e.target.value;
- //Object.keys(this.props.data.contents.datasets).map(dsName
const newDs = JSON.parse(str);
//console.log(newDs);
this.setContents({...this.props.data.contents, datasets: newDs});
+ /*
for(const dataset in this.props.data.contents.datasets){
this.setLockMap(dataset, true);
}
+ */
}}
>
<option value=''>Protocol...</option>
@@ -625,7 +632,17 @@ export class ExperimentEditor extends React.Component<Props, State> {
const tcDs = tcDss.pop();
let setsIdx = sets.findIndex(set => set.set === tcDs.name && dbSetIsValidForTcDataset(set, tcDs));
if(setsIdx === -1){
- setsIdx = sets.findIndex(set => dbSetIsValidForTcDataset(set, tcDs));
+ const validSets = sets.filter(set => dbSetIsValidForTcDataset(set, tcDs));
+ let bestScore = 10000;
+ let bestMatch = 'notfound';
+ for(const s of validSets){
+ const score = lev.get(tcDs.name, s.set);
+ if(score < bestScore){
+ bestScore = score;
+ bestMatch = s;
+ }
+ }
+ setsIdx = sets.findIndex(set => set == bestMatch);
}
if(setsIdx === -1)
return [dbProtStr, false];
@@ -692,7 +709,7 @@ export class ExperimentEditor extends React.Component<Props, State> {
const newDs = {...this.props.data.contents.datasets, [name]: ds};
this.setContents({...this.props.data.contents, datasets: newDs});
- this.setLockMap(name, true);
+ //this.setLockMap(name, true);
}}
>
<option value=''>Dataset...</option>
@@ -765,6 +782,17 @@ export class ExperimentEditor extends React.Component<Props, State> {
const queue = block.queue || this.props.data.contents.globals.queue;
const envDisabled = !block.hasOwnProperty('environment');
+ const getClearedGlobals = () => {
+ const globals = copyObj(this.props.data.contents.globals);
+ // if the old algorithm had parameters and no other block is using that alg,
+ // delete the global param defaults for the old alg
+ if(globals.hasOwnProperty(block.algorithm) &&
+ [...this.props.toolchain.contents.analyzers, ...this.props.toolchain.contents.blocks]
+ .filter(b => b.algorithm === block.algorithm).length <= 1)
+ delete globals[block.algorithm];
+ return globals;
+ };
+
return (
<FormGroup key={key} className={`block${ key } block_${ blockName }`}>
<h4>
@@ -874,7 +902,8 @@ export class ExperimentEditor extends React.Component<Props, State> {
thisBlock.outputs = levMapStrings(Object.keys(outputs), tcBlock.outputs);
// setup the parameters (erase & create stuff)
- const globals = copyObj(this.props.data.contents.globals);
+ const globals = getClearedGlobals();
+
// if the new alg has parameters, gen the global defaults for the params
if(alg.contents.parameters && Object.keys(alg.contents.parameters).length > 0)
globals[alg.name] = {
@@ -884,15 +913,8 @@ export class ExperimentEditor extends React.Component<Props, State> {
...this.props.data.contents.globals[alg.name],
};
- // if the old algorithm had parameters and no other block is using that alg,
- // delete the global param defaults for the old alg
- if(globals.hasOwnProperty(block.algorithm) &&
- [...this.props.toolchain.contents.analyzers, ...this.props.toolchain.contents.blocks]
- .filter(b => b.algorithm === block.algorithm).length <= 1)
- delete globals[block.algorithm];
-
updateBlock(thisBlock, globals);
- this.setLockMap(blockName, true);
+ //this.setLockMap(blockName, true);
}}
>
<option value=''>Algorithm...</option>
@@ -905,44 +927,66 @@ export class ExperimentEditor extends React.Component<Props, State> {
}
</Input>
</Col>
- { !isAnalyzer &&
- <Col sm='auto'>
- <Button
- color='primary'
- disabled={block.algorithm === ''}
- title={`Copies the algorithm & IO mappings to all unconfigured blocks with the same inputs & outputs`}
- onClick={() => {
- // copy the algorithm and input/output mappings to blocks
- // that are the same except for the block name and dont have an algorithm assigned already
- const targetBlocks = this.props.toolchain.contents.blocks
- // not the block being copied from
- .filter(b => b.name !== blockName)
- // same IO
- .filter(b => JSON.stringify(b.inputs) === JSON.stringify(tcBlock.inputs))
- .filter(b => JSON.stringify(b.outputs) === JSON.stringify(tcBlock.outputs))
- .map(b => b.name)
- ;
- //console.log(targetBlocks);
-
- // because the target blocks have the exact same inputs/outputs as the current block
- // we dont need to re-compute the block object that we will copy!
- // instead, just reuse the current block object and assign it to all
- // the target blocks.
- // also, because all these blocks are the same algorithm as the current block
- // we dont need to mess with the globals.
-
- const newBlocks = copyObj(this.props.data.contents.blocks);
- targetBlocks.forEach(bName => { newBlocks[bName] = copyObj(block); });
- this.setContents({
- ...this.props.data.contents,
- blocks: newBlocks,
- });
- }}
- >
- Copy to similar blocks
- </Button>
- </Col>
- }
+ <Col sm='auto'>
+ { !isAnalyzer &&
+ <React.Fragment>
+ <Button
+ color='primary'
+ disabled={block.algorithm === ''}
+ title={`Copies the algorithm & IO mappings to all unconfigured blocks with the same inputs & outputs`}
+ onClick={() => {
+ // copy the algorithm and input/output mappings to blocks
+ // that are the same except for the block name and dont have an algorithm assigned already
+ const targetBlocks = this.props.toolchain.contents.blocks
+ // not the block being copied from
+ .filter(b => b.name !== blockName)
+ // same IO
+ .filter(b => JSON.stringify(b.inputs) === JSON.stringify(tcBlock.inputs))
+ .filter(b => JSON.stringify(b.outputs) === JSON.stringify(tcBlock.outputs))
+ .map(b => b.name)
+ ;
+ //console.log(targetBlocks);
+
+ // because the target blocks have the exact same inputs/outputs as the current block
+ // we dont need to re-compute the block object that we will copy!
+ // instead, just reuse the current block object and assign it to all
+ // the target blocks.
+ // also, because all these blocks are the same algorithm as the current block
+ // we dont need to mess with the globals.
+
+ const newBlocks = copyObj(this.props.data.contents.blocks);
+ targetBlocks.forEach(bName => { newBlocks[bName] = copyObj(block); });
+ this.setContents({
+ ...this.props.data.contents,
+ blocks: newBlocks,
+ });
+ }}
+ >
+ Copy to similar blocks
+ </Button>
+ {' '}
+ </React.Fragment>
+ }
+ <Button
+ color='secondary'
+ title={`Clears the block data, resetting the selected block.`}
+ onClick={() => {
+ const newBlock = copyObj(block);
+ const newGlobals = getClearedGlobals();
+ newBlock.algorithm = '';
+ if(newBlock.inputs)
+ newBlock.inputs = {};
+ if(newBlock.outputs)
+ newBlock.outputs = {};
+ if(newBlock.parameters)
+ newBlock.parameters = {};
+
+ updateBlock(newBlock, newGlobals);
+ }}
+ >
+ Reset
+ </Button>
+ </Col>
</FormGroup>
</FormGroup>
{ Object.entries(alg.contents.parameters || {}).length > 0 && <h5>Parameters</h5> }
@@ -1305,9 +1349,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 71feeed1c40d5cedff0b0f4211b814eabb2da511..017ee392ddfbcb7caab93b133df3df2c3334fce9 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,18 +238,19 @@ describe('<ExperimentEditor />', () => {
//console.log('doing dataset');
- 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"}}'}});
+ 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":"testing"},"training_data":{"database":"iris/1","protocol":"Main","set":"training"}}'}});
expect(updateFunc.callCount).to.equal(1);
expect(wrapper.props().data.contents).to.have.deep.property('datasets', {
'testing_data': {
'database': 'iris/1',
'protocol': 'Main',
- 'set': 'training'
+ 'set': 'testing'
},
'training_data': {
'database': 'iris/1',
'protocol': 'Main',
- 'set': 'testing'
+ 'set': 'training'
}
});
@@ -490,12 +492,12 @@ describe('<ExperimentEditor />', () => {
'testing_data': {
'database': 'iris/1',
'protocol': 'Main',
- 'set': 'training'
+ 'set': 'testing'
},
'training_data': {
'database': 'iris/1',
'protocol': 'Main',
- 'set': 'testing'
+ 'set': 'training'
}
},
'globals': {
@@ -509,4 +511,184 @@ describe('<ExperimentEditor />', () => {
});
});
});
+
+ describe('Regression Tests', () => {
+ it(`clears the 'echo' & 'analysis' blocks from user/user/single/1/single_add`, () => {
+ const expName = 'user/user/single/1/single_add';
+ const saveFunc = sinon.spy();
+ const _updateFunc = (obj) => {
+ wrapper.setProps && wrapper.setProps({ data: obj });
+ };
+ const updateFunc = sinon.spy(_updateFunc);
+ const exp = testExps.find(exp => expName === exp.name);
+ const tc = testTcs.find(tc => expName.includes(tc.name));
+ wrapper = mount(
+ <C
+ data={getValidObj(exp, tc, [...normalBlocks, ...analyzerBlocks])}
+ experiments={[]}
+ normalBlocks={normalBlocks}
+ analyzerBlocks={analyzerBlocks}
+ datasets={datasets}
+ toolchain={tc}
+ saveFunc={saveFunc}
+ environments={envs}
+ updateFunc={updateFunc}
+ />
+ );
+
+ expect(wrapper.props().data).to.have.property('name', expName);
+ expect(wrapper.props().data.contents).to.have.deep.property('blocks', {
+ 'echo': {
+ 'inputs': {
+ 'in_data': 'in'
+ },
+ 'algorithm': 'user/integers_add/1',
+ 'outputs': {
+ 'out_data': 'out'
+ },
+ parameters: {}
+ }
+ });
+
+ wrapper.find('svg #block_echo').simulate('click');
+ wrapper.update();
+ wrapper.find('.algorithm button.btn-secondary').simulate('click');
+ expect(updateFunc.callCount).to.equal(1);
+ expect(wrapper.props().data.contents).to.have.deep.property('blocks',
+ { echo: {
+ inputs: {},
+ algorithm: '',
+ outputs: {},
+ parameters: {}
+ }}
+ );
+
+ wrapper.find('svg #block_analysis').simulate('click');
+ wrapper.update();
+ wrapper.find('.algorithm button.btn-secondary').simulate('click');
+ expect(updateFunc.callCount).to.equal(2);
+ expect(wrapper.props().data.contents).to.have.deep.property('analyzers',
+ { analysis: {
+ inputs: {},
+ algorithm: '',
+ parameters: {}
+ }}
+ );
+
+ expect(wrapper.props().data).to.be.deep.equal({
+ 'name': 'user/user/single/1/single_add',
+ 'contents': {
+ description: '',
+ 'analyzers': {
+ 'analysis': {
+ inputs: {},
+ algorithm: '',
+ parameters: {}
+ }
+ },
+ 'datasets': {
+ 'set': {
+ 'set': 'set',
+ 'protocol': 'protocol',
+ 'database': 'simple/1'
+ }
+ },
+ 'blocks': {
+ 'echo': {
+ algorithm: '',
+ inputs: {},
+ outputs: {},
+ parameters: {}
+ }
+ },
+ 'globals': {
+ 'queue': 'queue',
+ 'environment': {
+ 'version': '1.2.0',
+ 'name': 'Python 2.7'
+ },
+ }
+ }
+ });
+ });
+
+ it(`doesnt change the lockMap after an algorithm or dataset is assigned`, () => {
+ const expName = 'user/user/single/1/single_add';
+ const saveFunc = sinon.spy();
+ const _updateFunc = (obj) => {
+ wrapper.setProps && wrapper.setProps({ data: obj });
+ };
+ const updateFunc = sinon.spy(_updateFunc);
+ const tc = testTcs.find(tc => expName.includes(tc.name));
+ wrapper = mount(
+ <C
+ data={getValidObj({name: expName, contents: {}}, tc, [...normalBlocks, ...analyzerBlocks])}
+ experiments={[]}
+ normalBlocks={normalBlocks}
+ analyzerBlocks={analyzerBlocks}
+ datasets={datasets}
+ toolchain={tc}
+ saveFunc={saveFunc}
+ environments={envs}
+ updateFunc={updateFunc}
+ />
+ );
+
+ expect(wrapper.props().data).to.have.property('name', expName);
+
+ //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', {
+ 'set': {
+ 'set': 'set',
+ 'protocol': 'protocol',
+ 'database': 'simple/1'
+ }
+ });
+
+ //console.log('finished dataset, doing block');
+
+ wrapper.find('svg #block_echo').simulate('click');
+ expect(wrapper.find({ name: 'echo', set: 'blocks'}).find('.tcBlockBackground').prop('className')).to.include('highlighted');
+ wrapper.find('div.block0 div.algorithm select').at(0).simulate('change', { target: { value: 'user/integers_add/1'}});
+ expect(updateFunc.callCount).to.equal(2);
+ expect(wrapper.props().data.contents).to.have.deep.property('blocks', {
+ 'echo': {
+ 'inputs': {
+ 'in_data': 'in'
+ },
+ 'algorithm': 'user/integers_add/1',
+ 'outputs': {
+ 'out_data': 'out'
+ },
+ parameters: {}
+ }
+ });
+
+ //console.log('finished block, doing analyzer');
+
+ wrapper.find('svg #block_analysis').simulate('click');
+ expect(wrapper.find({ name: 'analysis', set: 'analyzers'}).find('.tcBlockBackground').prop('className')).to.include('highlighted');
+ wrapper.find('div.block0 div.algorithm select').at(0).simulate('change', { target: { value: 'user/integers_echo_analyzer/1'}});
+ expect(updateFunc.callCount).to.equal(3);
+ expect(wrapper.props().data.contents).to.have.deep.property('analyzers', {
+ 'analysis': {
+ 'inputs': {
+ 'in_data': 'in'
+ },
+ 'algorithm': 'user/integers_echo_analyzer/1',
+ parameters: {},
+ }
+ });
+
+ expect(wrapper.state().lockMap).to.deep.equal({
+ set: false,
+ echo: false,
+ analysis: false,
+ });
+ });
+ });
});