X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d8c787ee061c3953628362f5eb6c37123f5ca0f5..63210cc7d29062bcffa7af461e27f56d3b8bac7c:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index e848784591..6ad4d24745 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -27,7 +27,13 @@ import projectActions from "../../store/project/project-action"; import ProjectPanel from "../project-panel/project-panel"; import DetailsPanel from '../../views-components/details-panel/details-panel'; import { ArvadosTheme } from '../../common/custom-theme'; -import detailsPanelActions from "../../store/details-panel/details-panel-action"; +import ContextMenu, { ContextMenuAction } from '../../components/context-menu/context-menu'; +import { mockAnchorFromMouseEvent } from '../../components/popover/helpers'; +import CreateProjectDialog from "../../views-components/create-project-dialog/create-project-dialog"; +import { authService } from '../../services/services'; + +import detailsPanelActions, { loadDetails } from "../../store/details-panel/details-panel-action"; +import { ResourceKind } from '../../models/kinds'; const drawerWidth = 240; const appBarHeight = 100; @@ -91,6 +97,10 @@ interface NavMenuItem extends MainAppBarMenuItem { } interface WorkbenchState { + contextMenu: { + anchorEl?: HTMLElement; + itemUuid?: string; + }; anchorEl: any; searchText: string; menuItems: { @@ -103,6 +113,11 @@ interface WorkbenchState { class Workbench extends React.Component { state = { + contextMenu: { + anchorEl: undefined, + itemUuid: undefined + }, + isCreationDialogOpen: false, anchorEl: null, searchText: "", breadcrumbs: [], @@ -135,6 +150,7 @@ class Workbench extends React.Component { mainAppBarActions: MainAppBarActionProps = { onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => { this.props.dispatch(setProjectItem(itemId, ItemMode.BOTH)); + this.props.dispatch(loadDetails(itemId, ResourceKind.Project)); }, onSearch: searchText => { this.setState({ searchText }); @@ -143,6 +159,9 @@ class Workbench extends React.Component { onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action(), onDetailsPanelToggle: () => { this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); + }, + onContextMenu: (event: React.MouseEvent, breadcrumb: NavBreadcrumb) => { + this.openContextMenu(event, breadcrumb.itemId); } }; @@ -155,6 +174,33 @@ class Workbench extends React.Component { this.props.dispatch(projectActions.RESET_PROJECT_TREE_ACTIVITY(itemId)); } + handleCreationDialogOpen = (itemUuid: string) => { + this.closeContextMenu(); + this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid })); + } + + + openContextMenu = (event: React.MouseEvent, itemUuid: string) => { + event.preventDefault(); + this.setState({ + contextMenu: { + anchorEl: mockAnchorFromMouseEvent(event), + itemUuid + } + }); + } + + closeContextMenu = () => { + this.setState({ contextMenu: {} }); + } + + openCreateDialog = (item: ContextMenuAction) => { + const { itemUuid } = this.state.contextMenu; + if (item.openCreateDialog && itemUuid) { + this.handleCreationDialogOpen(itemUuid); + } + } + render() { const path = getTreePath(this.props.projects, this.props.currentProjectId); const breadcrumbs = path.map(item => ({ @@ -172,8 +218,7 @@ class Workbench extends React.Component { searchText={this.state.searchText} user={this.props.user} menuItems={this.state.menuItems} - {...this.mainAppBarActions} - /> + {...this.mainAppBarActions} /> {user && { + sidePanelItems={this.props.sidePanelItems} + onContextMenu={(event) => this.openContextMenu(event, authService.getUuid() || "")}> this.props.dispatch(setProjectItem(itemId, ItemMode.OPEN))} - toggleActive={itemId => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} - /> + onContextMenu={(event, item) => this.openContextMenu(event, item.data.uuid)} + toggleActive={itemId => { + this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE)); + this.props.dispatch(loadDetails(itemId, ResourceKind.Project)); + }}/> }
@@ -199,18 +248,59 @@ class Workbench extends React.Component { - +
+ + ); } renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} - onItemClick={item => this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE))} + onContextMenu={(event, item) => this.openContextMenu(event, item.uuid)} + onDialogOpen={this.handleCreationDialogOpen} + onItemClick={item => { + this.props.dispatch(loadDetails(item.uuid, item.kind as ResourceKind)); + }} + onItemDoubleClick={item => { + this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE)); + this.props.dispatch(loadDetails(item.uuid, ResourceKind.Project)); + }} {...props} /> +} +const contextMenuActions = [[{ + icon: "fas fa-plus fa-fw", + name: "New project", + openCreateDialog: true +}, { + icon: "fas fa-users fa-fw", + name: "Share" +}, { + icon: "fas fa-sign-out-alt fa-fw", + name: "Move to" +}, { + icon: "fas fa-star fa-fw", + name: "Add to favourite" +}, { + icon: "fas fa-edit fa-fw", + name: "Rename" +}, { + icon: "fas fa-copy fa-fw", + name: "Make a copy" +}, { + icon: "fas fa-download fa-fw", + name: "Download" +}], [{ + icon: "fas fa-trash-alt fa-fw", + name: "Remove" } +]]; export default connect( (state: RootState) => ({