diff options
Diffstat (limited to 'app/client')
| -rw-r--r-- | app/client/dataset/dataset.reducer.js | 1 | ||||
| -rw-r--r-- | app/client/modules/morph/morph.reducer.js | 7 | ||||
| -rw-r--r-- | app/client/modules/morph/views/morph.app.js | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/client/dataset/dataset.reducer.js b/app/client/dataset/dataset.reducer.js index f536960..10b4a94 100644 --- a/app/client/dataset/dataset.reducer.js +++ b/app/client/dataset/dataset.reducer.js @@ -65,6 +65,7 @@ const datasetReducer = (state = datasetInitialState(), action) => { function handleFileCreate(state, action){ console.log(action.data) + if (! state.data || !state.data.datasetLookup) return state let dataset, old_dataset, folder, old_folder let dataset_name if (action.data.dataset) { diff --git a/app/client/modules/morph/morph.reducer.js b/app/client/modules/morph/morph.reducer.js index 99e2001..5c46a4e 100644 --- a/app/client/modules/morph/morph.reducer.js +++ b/app/client/modules/morph/morph.reducer.js @@ -16,16 +16,13 @@ const morphReducer = (state = morphInitialState, action) => { } switch (action.type) { - case types.morph.load_results: - return { - ...state, - results: action.results, - } case types.morph.load: console.log('morph load', action.app) return { ...state, app: action.app, + loading: false, + data: action.data, } case types.file.create: console.log(action) diff --git a/app/client/modules/morph/views/morph.app.js b/app/client/modules/morph/views/morph.app.js index 5848616..1385e98 100644 --- a/app/client/modules/morph/views/morph.app.js +++ b/app/client/modules/morph/views/morph.app.js @@ -102,7 +102,7 @@ class MorphResults extends Component { <Select title={"Mode"} value={this.state.mode} - options={['mix', 'average']} + options={['mix', 'average', 'mix_images']} onChange={key => this.setState({ mode: key })} /> <Slider |