merge master

Feature #14186

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

diff --combined src/views/workbench/workbench.tsx
index e5d26a281bc88848d6b2cb4bdd17cc5519b82af2,db389572467c5dbd7d2fddbc4a938d21c57d0e21..a24a8c96a300cada422f3f90219381a0ef67fabe
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -32,6 -32,7 +32,7 @@@ import { CreateCollectionDialog } from 
  import { CopyCollectionDialog } from '~/views-components/dialog-forms/copy-collection-dialog';
  import { CopyProcessDialog } from '~/views-components/dialog-forms/copy-process-dialog';
  import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog';
+ import { UpdateProcessDialog } from '~/views-components/dialog-forms/update-process-dialog';
  import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
  import { MoveProcessDialog } from '~/views-components/dialog-forms/move-process-dialog';
  import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
@@@ -39,11 -40,11 +40,12 @@@ import { MoveCollectionDialog } from '~
  import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/files-upload-collection-dialog';
  import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
  import { TrashPanel } from "~/views/trash-panel/trash-panel";
- import { MainContentBar } from '../../views-components/main-content-bar/main-content-bar';
+ import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
  import { Grid } from '@material-ui/core';
 +import { WorkbenchProgress } from '~/views-components/progress/workbench-progress';
+ import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
  
- type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';
+ type CssRules = 'root' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar';
  
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      root: {
@@@ -51,6 -52,10 +53,10 @@@
          width: '100vw',
          height: '100vh'
      },
+     asidePanel: {
+         maxWidth: '240px',
+         background: theme.palette.background.default
+     },
      contentWrapper: {
          background: theme.palette.background.default,
          minWidth: 0,
@@@ -93,14 -98,11 +99,11 @@@ export const Workbench = withStyles(sty
              state = {
                  searchText: "",
              };
- 
              render() {
+                 const { classes } = this.props;
                  return <>
-                     <Grid
-                         container
-                         direction="column"
-                         className={this.props.classes.root}>
-                         <Grid className={this.props.classes.appBar}>
+                     <Grid container direction="column" className={classes.root}>
+                         <Grid className={classes.appBar}>
                              <MainAppBar
                                  searchText={this.state.searchText}
                                  user={this.props.user}
@@@ -108,27 -110,15 +111,16 @@@
                                  buildInfo={this.props.buildInfo} />
                          </Grid>
                          {this.props.user &&
-                             <Grid
-                                 container
-                                 item
-                                 xs
-                                 alignItems="stretch"
-                                 wrap="nowrap">
-                                 <Grid item>
+                             <Grid container item xs alignItems="stretch" wrap="nowrap">
+                                 <Grid container item xs component='aside' direction='column' className={classes.asidePanel}>
                                      <SidePanel />
                                  </Grid>
-                                 <Grid
-                                     container
-                                     item
-                                     xs
-                                     component="main"
-                                     direction="column"
-                                     className={this.props.classes.contentWrapper}>
+                                 <Grid container item xs component="main" direction="column" className={classes.contentWrapper}>
                                      <Grid item>
 +                                        <WorkbenchProgress />
                                          <MainContentBar />
                                      </Grid>
-                                     <Grid item xs className={this.props.classes.content}>
+                                     <Grid item xs className={classes.content}>
                                          <Switch>
                                              <Route path={Routes.PROJECTS} component={ProjectPanel} />
                                              <Route path={Routes.COLLECTIONS} component={CollectionPanel} />
@@@ -145,23 -135,25 +137,25 @@@
                              </Grid>}
                      </Grid>
                      <ContextMenu />
-                     <Snackbar />
-                     <CreateProjectDialog />
-                     <CreateCollectionDialog />
-                     <RenameFileDialog />
-                     <PartialCopyCollectionDialog />
-                     <FileRemoveDialog />
                      <CopyCollectionDialog />
                      <CopyProcessDialog />
+                     <CreateCollectionDialog />
+                     <CreateProjectDialog />
+                     <CurrentTokenDialog />
+                     <FileRemoveDialog />
                      <FileRemoveDialog />
-                     <MultipleFilesRemoveDialog />
-                     <UpdateCollectionDialog />
                      <FilesUploadCollectionDialog />
-                     <UpdateProjectDialog />
                      <MoveCollectionDialog />
                      <MoveProcessDialog />
                      <MoveProjectDialog />
-                     <CurrentTokenDialog />
+                     <MultipleFilesRemoveDialog />
+                     <PartialCopyCollectionDialog />
+                     <ProcessCommandDialog />
+                     <RenameFileDialog />
+                     <Snackbar />
+                     <UpdateCollectionDialog />
+                     <UpdateProcessDialog />
+                     <UpdateProjectDialog />
                  </>;
              }