[ARVADOS-WORKBENCH2] updated: 1.2.0-388-g75e65fc

Git user git at public.curoverse.com
Mon Sep 17 06:46:07 EDT 2018


Summary of changes:
 package.json                                       |  1 +
 .../side-panel-button/side-panel-button.tsx        |  4 +-
 src/views/project-panel/project-panel.tsx          | 53 ++++---------
 src/views/workbench/workbench.tsx                  | 58 ++++++++------
 typings/global.d.ts                                |  2 +
 yarn.lock                                          | 92 ++++------------------
 6 files changed, 72 insertions(+), 138 deletions(-)

       via  75e65fcb253a488da1b3032a54c229cdafdbc9a2 (commit)
       via  877ce2a1b858c685eec0e8f47652ebb8a271195e (commit)
       via  5f2fb95b13a393614a570b541eec754a9ae3d7a6 (commit)
       via  fa7af09515176daff7109c7f135eb5d742ed42d8 (commit)
       via  a6540e058f12352e3cde3486f6a613b6a7420172 (commit)
      from  f4ad575d90e25defd2a98a3e52566f00a0322cc8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 75e65fcb253a488da1b3032a54c229cdafdbc9a2
Merge: f4ad575 877ce2a
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Sep 17 12:45:49 2018 +0200

    Mergeg branch 'master'
    
    Feature #13751
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --cc src/views/workbench/workbench.tsx
index 9f1ab47,95f4683..1d7d47d
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -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 />

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list