Merge branch 'master' into 13751-shared-with-me-view

refs #13751

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --combined src/views/workbench/workbench.tsx
index fee7652b0ae89fbd619037ecfa6fc81855cd75a3,db389572467c5dbd7d2fddbc4a938d21c57d0e21..9f1ab478ffc63f8f042af94eb6c3dd87dddd3978
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -42,10 -42,9 +42,10 @@@ import { PartialCopyCollectionDialog } 
  import { TrashPanel } from "~/views/trash-panel/trash-panel";
  import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
  import { Grid } from '@material-ui/core';
 +import { SharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel';
  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: {
@@@ -53,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,
@@@ -95,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}
@@@ -110,26 -110,15 +111,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} />
@@@ -137,7 -126,6 +127,7 @@@
                                              <Route path={Routes.PROCESSES} component={ProcessPanel} />
                                              <Route path={Routes.TRASH} component={TrashPanel} />
                                              <Route path={Routes.PROCESS_LOGS} component={ProcessLogPanel} />
 +                                            <Route path={Routes.SHARED_WITH_ME} component={SharedWithMePanel} />
                                          </Switch>
                                      </Grid>
                                  </Grid>