From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Thu, 13 Sep 2018 10:08:01 +0000 (+0200)
Subject: merge master
X-Git-Tag: 1.3.0~91^2~9
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/12fbb73269d10424383cdbd712201498cc8d013a

merge master

Feature #14186

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

12fbb73269d10424383cdbd712201498cc8d013a
diff --cc src/views/workbench/workbench.tsx
index e5d26a28,db389572..a24a8c96
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -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: {
@@@ -108,27 -110,15 +111,16 @@@ export const Workbench = withStyles(sty
                                  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} />