[ARVADOS-WORKBENCH2] updated: 1.1.4-88-gfbd2012

[Git user]

Summary of changes:
 package.json                                      |  30 +--
 src/components/project-tree/project-tree.test.tsx |  79 ++++--
 src/components/project-tree/project-tree.tsx      |   8 +-
 src/components/tree/tree.test.tsx                 |  54 +++-
 src/components/tree/tree.tsx                      |  70 ++++--
 src/services/project-service/project-service.ts   |   2 +-
 src/store/project/project-action.ts               |   2 +-
 src/store/project/project-reducer.test.ts         |   6 +-
 src/store/project/project-reducer.ts              |  17 +-
 src/views/workbench/workbench.tsx                 |  41 ++--
 yarn.lock                                         | 284 ++++++++++++----------
 11 files changed, 367 insertions(+), 226 deletions(-)

       via  fbd2012fa56f6de44dfc4008d70e5a21cfcaf459 (commit)
       via  750a9abc14ba1e17784a386399237ebf35fb279b (commit)
       via  c16ef38920e9d011215a519bc58624a614717cd6 (commit)
       via  a78b68335f520c4a7d50362811369bf83a921296 (commit)
       via  250d01c990a4f47bfdaa31ef9d3d7b79e602cb2c (commit)
       via  0c793af552b746f9a9d3fef8005f6e23a3e1803e (commit)
       via  9999a9db9fede0e1971dc792389982b428a1bb19 (commit)
       via  7ba0401cff3906814ba976ea36adab9b3d5c3922 (commit)
       via  7f95b6ead934a15e849c7650a08475633a8bfb09 (commit)
      from  e70279bebea915b5ddbef11357ab7a36201d6d85 (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 fbd2012fa56f6de44dfc4008d70e5a21cfcaf459
Merge: e70279b 750a9ab
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Jun 18 11:55:54 2018 +0200

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

diff --cc src/views/workbench/workbench.tsx
index 4f1671c,8884f3a..20e3648
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -16,10 -27,9 +16,10 @@@ import { Breadcrumb } from '../../compo
  import { push } from 'react-router-redux';
  import projectActions from "../../store/project/project-action";
  import ProjectTree from '../../components/project-tree/project-tree';
- import { TreeItem } from "../../components/tree/tree";
+ import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
  import { Project } from "../../models/project";
  import { projectService } from '../../services/services';
 +import DataExplorer from '../data-explorer/data-explorer';
  
  const drawerWidth = 240;
  
@@@ -133,13 -143,16 +133,19 @@@ class Workbench extends React.Component
          onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action()
      };
  
-     toggleProjectTreeItem = (itemId: string) => {
-         this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => {
-             this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
-             this.props.dispatch(push(`/project/${itemId}`));
-         });
+     toggleProjectTreeItem = (itemId: string, status: TreeItemStatus) => {
+         if (status === TreeItemStatus.Loaded) {
 -            this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
++            this.openProjectItem(itemId);
+         } else {
 -            this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => {
 -                this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
 -            });
++            this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => this.openProjectItem(itemId));
+         }
+     }
+ 
++    openProjectItem = (itemId: string) => {
++        this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
++        this.props.dispatch(push(`/project/${itemId}`));
 +    }
 +
      render() {
          const { classes, user } = this.props;
          return (
@@@ -154,21 -167,20 +160,20 @@@
                      />
                  </div>
                  {user &&
-                 <Drawer
-                     variant="permanent"
-                     classes={{
-                         paper: classes.drawerPaper,
-                     }}>
-                     <div className={classes.toolbar}/>
-                     <ProjectTree
-                         projects={this.props.projects}
-                         toggleProjectTreeItem={this.toggleProjectTreeItem}/>
-                 </Drawer>}
+                     <Drawer
+                         variant="permanent"
+                         classes={{
+                             paper: classes.drawerPaper,
+                         }}>
+                         <div className={classes.toolbar} />
+                         <ProjectTree
+                             projects={this.props.projects}
+                             toggleProjectTreeItem={this.toggleProjectTreeItem} />
+                     </Drawer>}
                  <main className={classes.content}>
                      <div className={classes.toolbar} />
-                     <div className={classes.toolbar} />
                      <Switch>
-                         <Route path="/project/:name" component={DataExplorer}/>
 -                        <Route path="/project/:name" component={ProjectList} />
++                        <Route path="/project/:name" component={DataExplorer} />
                      </Switch>
                  </main>
              </div>

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


hooks/post-receive
--