Merge branch 'master'

Feature #13601

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

diff --cc src/services/project-service/project-service.ts
Simple merge

diff --cc src/store/project/project-reducer.test.ts
Simple merge

diff --cc src/store/project/project-reducer.ts
Simple merge

diff --cc src/views/workbench/workbench.tsx
index 4f1671cae0516c9aa5bdec3317b15ab59da8ee92,8884f3a8d84ad46df4c189aa9b37774bdfc82815..20e3648e0561151c8d63fd57ef04858206f5d914
--- 1/src/views/workbench/workbench.tsx
--- 2/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>