refs #13986 Merge branch 'origin/13986-projects-list-and-default-routing'
authorDaniel Kos <daniel.kos@contractors.roche.com>
Sat, 18 Aug 2018 22:03:23 +0000 (00:03 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Sat, 18 Aug 2018 22:03:50 +0000 (00:03 +0200)
Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

1  2 
src/views/workbench/workbench.tsx

index 5cf632faf174b655b91b29e456efaceba68d6849,ac8d61ebb0977eadbe578ef2736f1fd159f79dc7..1efac8e8cd5f10fabcb21e956cda847eec7c972f
@@@ -29,7 -29,6 +29,6 @@@ import { CreateProjectDialog } from "~/
  
  import { detailsPanelActions, loadDetails } from "~/store/details-panel/details-panel-action";
  import { contextMenuActions } from "~/store/context-menu/context-menu-actions";
- import { SidePanelIdentifiers } from '~/store/side-panel/side-panel-reducer';
  import { ProjectResource } from '~/models/project';
  import { ResourceKind } from '~/models/resource';
  import { ContextMenu, ContextMenuKind } from "~/views-components/context-menu/context-menu";
@@@ -222,7 -221,6 +221,6 @@@ export const Workbench = withStyles(sty
                                          toggleActive={itemId => {
                                              this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE));
                                              this.props.dispatch(loadDetails(itemId, ResourceKind.PROJECT));
-                                             this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                                          }} />
                                  </SidePanel>
                              </Drawer>}
  
              renderCollectionPanel = (props: RouteComponentProps<{ id: string }>) => <CollectionPanel
                  onItemRouteChange={(collectionId) => {
 -                    this.props.dispatch<any>(loadCollection(collectionId, ResourceKind.COLLECTION));
 +                    this.props.dispatch<any>(loadCollection(collectionId));
                      this.props.dispatch<any>(loadCollectionTags(collectionId));
                  }}
                  onContextMenu={(event, item) => {
                  onItemDoubleClick={item => {
                      switch (item.kind) {
                          case ResourceKind.COLLECTION:
 -                            this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind));
 +                            this.props.dispatch(loadCollection(item.uuid));
                              this.props.dispatch(push(getCollectionUrl(item.uuid)));
                          default:
                              this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE));
                  onItemDoubleClick={item => {
                      switch (item.kind) {
                          case ResourceKind.COLLECTION:
 -                            this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind));
 +                            this.props.dispatch(loadCollection(item.uuid));
                              this.props.dispatch(push(getCollectionUrl(item.uuid)));
                          default:
                              this.props.dispatch(loadDetails(item.uuid, ResourceKind.PROJECT));
                              this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE));
-                             this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                      }
  
                  }}
              }
  
              toggleSidePanelActive = (itemId: string) => {
-                 this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(itemId));
                  this.props.dispatch(projectActions.RESET_PROJECT_TREE_ACTIVITY(itemId));
  
                  const panelItem = this.props.sidePanelItems.find(it => it.id === itemId);