X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3ee31ce16470660d90fb870e048c2de9fcde6e47..7ae86efd9905582df4191910528c3803a68ba81b:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 6c7f85d87f..e25244018c 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -205,8 +205,8 @@ export const Workbench = withStyles(styles)( })} 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)); + this.props.dispatch(loadDetails(itemId, ResourceKind.PROJECT)); + this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS)); }} /> } @@ -232,7 +232,7 @@ export const Workbench = withStyles(styles)( } renderCollectionPanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(loadCollection(collectionId, ResourceKind.Collection))} + onItemRouteChange={(collectionId) => this.props.dispatch(loadCollection(collectionId, ResourceKind.COLLECTION))} onContextMenu={(event, item) => { this.openContextMenu(event, { uuid: item.uuid, @@ -245,7 +245,8 @@ export const Workbench = withStyles(styles)( renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} onContextMenu={(event, item) => { - const kind = item.kind === ResourceKind.Project ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE; + + const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE; this.openContextMenu(event, { uuid: item.uuid, name: item.name, @@ -258,20 +259,21 @@ export const Workbench = withStyles(styles)( }} onItemDoubleClick={item => { switch (item.kind) { - case ResourceKind.Collection: + case ResourceKind.COLLECTION: this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind)); this.props.dispatch(push(getCollectionUrl(item.uuid))); default: this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE)); this.props.dispatch(loadDetails(item.uuid, item.kind as ResourceKind)); } + }} {...props} /> renderFavoritePanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: FAVORITE_PANEL_ID }))} onContextMenu={(event, item) => { - const kind = item.kind === ResourceKind.Project ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE; + const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE; this.openContextMenu(event, { uuid: item.uuid, name: item.name, @@ -284,21 +286,22 @@ export const Workbench = withStyles(styles)( }} onItemDoubleClick={item => { switch (item.kind) { - case ResourceKind.Collection: + case ResourceKind.COLLECTION: this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind)); this.props.dispatch(push(getCollectionUrl(item.uuid))); default: - this.props.dispatch(loadDetails(item.uuid, ResourceKind.Project)); + 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)); + this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS)); } + }} {...props} /> mainAppBarActions: MainAppBarActionProps = { onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => { this.props.dispatch(setProjectItem(itemId, ItemMode.BOTH)); - this.props.dispatch(loadDetails(itemId, ResourceKind.Project)); + this.props.dispatch(loadDetails(itemId, ResourceKind.PROJECT)); }, onSearch: searchText => { this.setState({ searchText });