Merge branch '19143-project-list-workflows'

[arvados-workbench2.git] / 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 eb3615f12cb52bb3d1ec0e6893b2232203cde602..2f41dedb8232dcae9184c1d386b78ea97fd26772 100644 (file)
--- a/src/views/run-process-panel/run-process-second-step.tsx
+++ b/src/views/run-process-panel/run-process-second-step.tsx
@@ -2,19 +2,18 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from 'react';
+import React from 'react';
 import { Grid, Button } from '@material-ui/core';
 import { RunProcessBasicForm, RUN_PROCESS_BASIC_FORM } from './run-process-basic-form';
-import { RunProcessInputsForm } from '~/views/run-process-panel/run-process-inputs-form';
-import { CommandInputParameter, WorkflowResource } from '~/models/workflow';
+import { RunProcessInputsForm } from 'views/run-process-panel/run-process-inputs-form';
+import { CommandInputParameter, WorkflowResource } from 'models/workflow';
 import { connect } from 'react-redux';
-import { RootState } from '~/store/store';
+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 { WorkflowPresetSelect } from '~/views/run-process-panel/workflow-preset-select';
-import { runProcessPanelActions } from '~/store/run-process-panel/run-process-panel-actions';
+import { RunProcessAdvancedForm, RUN_PROCESS_ADVANCED_FORM } from './run-process-advanced-form';
+import { createStructuredSelector } from 'reselect';
+import { selectPreset } from 'store/run-process-panel/run-process-panel-actions';
 
 export interface RunProcessSecondStepFormDataProps {
     inputs: CommandInputParameter[];
@@ -43,7 +42,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,16 +53,10 @@ 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) =>
-        <Grid container spacing={16}>
+        <Grid container spacing={16} data-cy="new-process-panel">
             <Grid item xs={12}>
-                <Grid item xs={6}>
-                    {workflow && selectedPreset && presets &&
-                        < WorkflowPresetSelect
-                            {...{ workflow, selectedPreset, presets, onChange: onPresetChange }} />
-                    }
-                </Grid>
                 <RunProcessBasicForm />
                 <RunProcessInputsForm inputs={inputs} />
                 <RunProcessAdvancedForm />
@@ -73,7 +66,7 @@ export const RunProcessSecondStepForm = connect(mapStateToProps, { onPresetChang
                     Back
                 </Button>
                 <Button disabled={!valid} variant="contained" color="primary" onClick={runProcess}>
-                    Run Process
+                    Run workflow
                 </Button>
             </Grid>
         </Grid>);