merge master

Feature #14231

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --cc src/store/workbench/workbench-actions.ts
Simple merge

diff --cc src/views/run-process-panel/run-process-second-step.tsx
index 0000000000000000000000000000000000000000,6582710c098141e2db700860407b3c31e53d55f3..76ebea3e4317afe3ef5c241d1bbf38380983ac45
mode 000000,100644..100644
--- /dev/null
--- 2/src/views/run-process-panel/run-process-second-step.tsx
+++ b/src/views/run-process-panel/run-process-second-step.tsx
@@@ -1,0 -1,62 +1,62 @@@
 -type RunProcessSecondStepProps = RunProcessSecondStepDataProps 
 -    & RunProcessSecondStepActionProps 
 -    & WithStyles<CssRules> 
+ // Copyright (C) The Arvados Authors. All rights reserved.
+ //
+ // SPDX-License-Identifier: AGPL-3.0
+ 
+ import * as React from 'react';
+ import { withStyles, WithStyles, StyleRulesCallback, Grid, Button } from '@material-ui/core';
+ import { ArvadosTheme } from '~/common/custom-theme';
+ import { Field, reduxForm, InjectedFormProps } from 'redux-form';
+ import { TextField } from '~/components/text-field/text-field';
+ import { RunProcessSecondStepDataFormProps, RUN_PROCESS_SECOND_STEP_FORM_NAME } from '~/store/run-process-panel/run-process-panel-actions';
+ 
+ type CssRules = 'root';
+ 
+ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+     root: {
+ 
+     }
+ });
+ 
+ export interface RunProcessSecondStepDataProps {
+ 
+ }
+ 
+ export interface RunProcessSecondStepActionProps {
+     onSetStep: (step: number) => void;
+     onRunProcess: (data: RunProcessSecondStepDataFormProps) => void;
+ }
+ 
++type RunProcessSecondStepProps = RunProcessSecondStepDataProps
++    & RunProcessSecondStepActionProps
++    & WithStyles<CssRules>
+     & InjectedFormProps<RunProcessSecondStepDataFormProps>;
+ 
+ const RunProcessSecondStep = withStyles(styles)(
+     ({ onSetStep, classes }: RunProcessSecondStepProps) =>
+         <Grid container spacing={16}>
+             <Grid item xs={12}>
+                 <form>
+                     <Field
+                         name='name'
+                         component={TextField}
+                         label="Enter a new name for run process" />
+                     <Field
+                         name='description'
+                         component={TextField}
+                         label="Enter a description for run process" />
+                 </form>
+             </Grid>
+             <Grid item xs={12}>
+                 <Button color="primary" onClick={() => onSetStep(0)}>
+                     Back
+                 </Button>
+                 <Button variant="contained" color="primary">
+                     Run Process
+                 </Button>
+             </Grid>
+         </Grid>
+ );
+ 
+ export const RunProcessSecondStepForm = reduxForm<RunProcessSecondStepDataFormProps>({
+     form: RUN_PROCESS_SECOND_STEP_FORM_NAME
+ })(RunProcessSecondStep);

diff --cc src/views/workbench/workbench.tsx
Simple merge

diff --cc src/views/workflow-panel/workflow-panel-view.tsx
Simple merge