Merge branch 'master' into 14137-new-button

refs #14137

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --combined src/views/workbench/workbench.tsx
index 3f61c5217f3cd7479753ca277ddf3cd3644ead8b,5c4648b6d35810e63520943c7b922fc9205792d1..db389572467c5dbd7d2fddbc4a938d21c57d0e21
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -40,10 -40,11 +40,11 @@@ 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 { 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,10 -52,6 +52,10 @@@
          width: '100vw',
          height: '100vh'
      },
 +    asidePanel: {
 +        maxWidth: '240px',
 +        background: theme.palette.background.default
 +    },
      contentWrapper: {
          background: theme.palette.background.default,
          minWidth: 0,
@@@ -97,11 -94,14 +98,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}
@@@ -109,15 -109,26 +110,15 @@@
                                  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>
                                          <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} />
@@@ -134,24 -145,25 +135,25 @@@
                              </Grid>}
                      </Grid>
                      <ContextMenu />
-                     <Snackbar />
-                     <CreateProjectDialog />
-                     <CreateCollectionDialog />
-                     <RenameFileDialog />
-                     <PartialCopyCollectionDialog />
-                     <FileRemoveDialog />
                      <CopyCollectionDialog />
                      <CopyProcessDialog />
+                     <CreateCollectionDialog />
+                     <CreateProjectDialog />
+                     <CurrentTokenDialog />
+                     <FileRemoveDialog />
                      <FileRemoveDialog />
-                     <MultipleFilesRemoveDialog />
-                     <UpdateCollectionDialog />
-                     <UpdateProcessDialog />
                      <FilesUploadCollectionDialog />
-                     <UpdateProjectDialog />
                      <MoveCollectionDialog />
                      <MoveProcessDialog />
                      <MoveProjectDialog />
-                     <CurrentTokenDialog />
+                     <MultipleFilesRemoveDialog />
+                     <PartialCopyCollectionDialog />
+                     <ProcessCommandDialog />
+                     <RenameFileDialog />
+                     <Snackbar />
+                     <UpdateCollectionDialog />
+                     <UpdateProcessDialog />
+                     <UpdateProjectDialog />
                  </>;
              }