merge master

Feature #14231

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

diff --combined src/store/workbench/workbench-actions.ts
index 62fca46997ffc68f50fe38dee65764df5cf21103,f2d04188f3b3d93f45f8b60943ad603a9a2b3d18..8d8eb953223cc306a777438bd2f32ec9319cc04c
--- 1/src/store/workbench/workbench-actions.ts
--- 2/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@@ -48,7 -48,6 +48,7 @@@ import { GroupContentsResource } from '
  import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize';
  import { loadRunProcessPanel } from '~/store/run-process-panel/run-process-panel-actions';
  import { loadCollectionFiles } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
 +import { SnackbarKind } from '~/store/snackbar/snackbar-actions';
  
  export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
  
@@@ -263,7 -262,7 +263,7 @@@ export const moveCollection = (data: Mo
              const collection = await dispatch<any>(collectionMoveActions.moveCollection(data));
              dispatch<any>(updateResources([collection]));
              dispatch<any>(reloadProjectMatchingUuid([collection.ownerUuid]));
 -            dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000 }));
 +            dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
          } catch (e) {
              dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 }));
          }
@@@ -358,7 -357,7 +358,7 @@@ export const loadSharedWithMe = handleF
  
  export const loadRunProcess = handleFirstTimeLoad(
      async (dispatch: Dispatch) => {
-         dispatch<any>(loadRunProcessPanel());
+         await dispatch<any>(loadRunProcessPanel());
      }
  );
  

diff --combined 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 --combined src/views/workbench/workbench.tsx
index ec806d5f5bafd40cc109acdc81ea8677ac8c5aaf,fe09564392027bf76feadbaedeab48b9aac3891c..553afa4d09c3751ac5a4a8da871c0fb3eae149fd
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -41,7 -41,6 +41,7 @@@ import { SharedWithMePanel } from '~/vi
  import { RunProcessPanel } from '~/views/run-process-panel/run-process-panel';
  import SplitterLayout from 'react-splitter-layout';
  import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel';
 +import { FileSelectionDialog } from '~/views-components/dialog-forms/file-selection-dialog';
  
  type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
  
@@@ -80,7 -79,7 +80,7 @@@ export const WorkbenchPanel 
          <Grid container item xs className={classes.root}>
              <Grid container item xs className={classes.container}>
                  <SplitterLayout customClassName={classes.splitter} percentage={true}
-                     primaryIndex={0} primaryMinSize={20} secondaryInitialSize={80} secondaryMinSize={40}>
+                     primaryIndex={0} primaryMinSize={15} secondaryInitialSize={85} secondaryMinSize={40}>
                      <Grid container item xs component='aside' direction='column' className={classes.asidePanel}>
                          <SidePanel />
                      </Grid>
@@@ -115,7 -114,6 +115,7 @@@
              <CurrentTokenDialog />
              <FileRemoveDialog />
              <FileRemoveDialog />
 +            <FileSelectionDialog />
              <FilesUploadCollectionDialog />
              <MoveCollectionDialog />
              <MoveProcessDialog />

diff --combined src/views/workflow-panel/workflow-panel-view.tsx
index 094c1e6bf89fa54ce64f13055d0ffb89e1c50311,46b5c9164efe22dfd454774c3cd5efbeaa69629a..ec91f3c7174fdc1ae8d6f754c1c45c4e9842c247
--- 1/src/views/workflow-panel/workflow-panel-view.tsx
--- 2/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@@ -16,7 -16,7 +16,7 @@@ import 
  import { SortDirection } from '~/components/data-table/data-column';
  import { DataColumns } from '~/components/data-table/data-table';
  import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
- import { Grid } from '@material-ui/core';
+ import { Grid, Paper } from '@material-ui/core';
  import { WorkflowDetailsCard } from './workflow-description-card';
  
  export enum WorkflowPanelColumnNames {
@@@ -111,11 -111,12 +111,13 @@@ export const WorkflowPanelView = ({...p
                  onRowClick={props.handleRowClick}
                  onRowDoubleClick={props.handleRowDoubleClick}
                  contextMenuColumn={false}
 +                onContextMenu={e=>e}
                  dataTableDefaultView={<DataTableDefaultView icon={WorkflowIcon} />} />
          </Grid>
          <Grid item xs={6}>
-             <WorkflowDetailsCard />
+             <Paper>
+                 <WorkflowDetailsCard />
+             </Paper>
          </Grid>
      </Grid>;
  };