X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3fdf49aeaf054284ec59e18885e66f798777ada9..17c26d8f0950c485cf160ed28c4bd1872bff868e:/src/views/run-process-panel/run-process-second-step.tsx diff --git a/src/views/run-process-panel/run-process-second-step.tsx b/src/views/run-process-panel/run-process-second-step.tsx index eb3615f1..a2ed9a21 100644 --- a/src/views/run-process-panel/run-process-second-step.tsx +++ b/src/views/run-process-panel/run-process-second-step.tsx @@ -11,10 +11,10 @@ import { connect } from 'react-redux'; import { RootState } from '~/store/store'; import { isValid } from 'redux-form'; import { RUN_PROCESS_INPUTS_FORM } from './run-process-inputs-form'; -import { RunProcessAdvancedForm } from './run-process-advanced-form'; -import { createSelector, createStructuredSelector } from 'reselect'; +import { RunProcessAdvancedForm, RUN_PROCESS_ADVANCED_FORM } from './run-process-advanced-form'; +import { createStructuredSelector } from 'reselect'; import { WorkflowPresetSelect } from '~/views/run-process-panel/workflow-preset-select'; -import { runProcessPanelActions } from '~/store/run-process-panel/run-process-panel-actions'; +import { selectPreset } from '~/store/run-process-panel/run-process-panel-actions'; export interface RunProcessSecondStepFormDataProps { inputs: CommandInputParameter[]; @@ -43,7 +43,7 @@ const inputsSelector = (state: RootState) => state.runProcessPanel.inputs; const validSelector = (state: RootState) => - isValid(RUN_PROCESS_BASIC_FORM)(state) && isValid(RUN_PROCESS_INPUTS_FORM)(state); + isValid(RUN_PROCESS_BASIC_FORM)(state) && isValid(RUN_PROCESS_INPUTS_FORM)(state) && isValid(RUN_PROCESS_ADVANCED_FORM)(state); const mapStateToProps = createStructuredSelector({ inputs: inputsSelector, @@ -54,15 +54,17 @@ const mapStateToProps = createStructuredSelector({ }); export type RunProcessSecondStepFormProps = RunProcessSecondStepFormDataProps & RunProcessSecondStepFormActionProps; -export const RunProcessSecondStepForm = connect(mapStateToProps, { onPresetChange: runProcessPanelActions.SELECT_WORKFLOW_PRESET })( +export const RunProcessSecondStepForm = connect(mapStateToProps, { onPresetChange: selectPreset })( ({ inputs, workflow, selectedPreset, presets, onPresetChange, valid, goBack, runProcess }: RunProcessSecondStepFormProps) => - - {workflow && selectedPreset && presets && - < WorkflowPresetSelect - {...{ workflow, selectedPreset, presets, onChange: onPresetChange }} /> - } + + + {workflow && selectedPreset && presets && + < WorkflowPresetSelect + {...{ workflow, selectedPreset, presets, onChange: onPresetChange }} /> + } +