Mergeg branch 'master'
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 17 Sep 2018 10:45:49 +0000 (12:45 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 17 Sep 2018 10:45:49 +0000 (12:45 +0200)
Feature #13751

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

1  2 
src/views/workbench/workbench.tsx

index 9f1ab478ffc63f8f042af94eb6c3dd87dddd3978,95f4683414d702159526696dbe4d74fdf131a305..1d7d47d09ee89f8085312cf2b0a1b804f823e07c
@@@ -42,10 -42,10 +42,11 @@@ 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';
+ import SplitterLayout from 'react-splitter-layout';
  
- type CssRules = 'root' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar';
+ type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar';
  
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      root: {
@@@ -112,24 -119,28 +120,29 @@@ export const Workbench = withStyles(sty
                          </Grid>
                          {this.props.user &&
                              <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={classes.contentWrapper}>
-                                     <Grid item>
-                                         <MainContentBar />
-                                     </Grid>
-                                     <Grid item xs className={classes.content}>
-                                         <Switch>
-                                             <Route path={Routes.PROJECTS} component={ProjectPanel} />
-                                             <Route path={Routes.COLLECTIONS} component={CollectionPanel} />
-                                             <Route path={Routes.FAVORITES} component={FavoritePanel} />
-                                             <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 container item className={classes.container}>
+                                 <SplitterLayout customClassName={classes.splitter} percentage={true}
+                                     primaryIndex={0} primaryMinSize={20} secondaryInitialSize={80} secondaryMinSize={40}>
+                                         <Grid container item xs component='aside' direction='column' className={classes.asidePanel}>
+                                             <SidePanel />
+                                         </Grid>
+                                         <Grid container item xs component="main" direction="column" className={classes.contentWrapper}>
+                                             <Grid item>
+                                                 <MainContentBar />
+                                             </Grid>
+                                             <Grid item xs className={classes.content}>
+                                                 <Switch>
+                                                     <Route path={Routes.PROJECTS} component={ProjectPanel} />
+                                                     <Route path={Routes.COLLECTIONS} component={CollectionPanel} />
+                                                     <Route path={Routes.FAVORITES} component={FavoritePanel} />
+                                                     <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>
+                                     </SplitterLayout>
                                  </Grid>
                                  <Grid item>
                                      <DetailsPanel />