X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/b0ea85a58cf15903e67c5a7161d7887b03af713e..7cac459611f4e4d089cedbe13120553f97152509:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 1069de53..257c7c4f 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -3,11 +3,12 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core/styles'; +import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; import Drawer from '@material-ui/core/Drawer'; import { connect, DispatchProp } from "react-redux"; -import { Route, Switch } from "react-router"; +import { Route, Switch, RouteComponentProps, withRouter } from "react-router"; import authActions from "../../store/auth/auth-action"; +import dataExplorerActions from "../../store/data-explorer/data-explorer-action"; import { User } from "../../models/user"; import { RootState } from "../../store/store"; import MainAppBar, { @@ -19,20 +20,25 @@ import { push } from 'react-router-redux'; import ProjectTree from '../../views-components/project-tree/project-tree'; import { TreeItem } from "../../components/tree/tree"; import { Project } from "../../models/project"; -import { getTreePath } from '../../store/project/project-reducer'; -import ProjectPanel from '../project-panel/project-panel'; +import { getTreePath, findTreeItem } from '../../store/project/project-reducer'; import sidePanelActions from '../../store/side-panel/side-panel-action'; import SidePanel, { SidePanelItem } from '../../components/side-panel/side-panel'; import { ResourceKind } from "../../models/resource"; import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action"; import projectActions from "../../store/project/project-action"; +import ProjectPanel from "../project-panel/project-panel"; +import { sidePanelData } from '../../store/side-panel/side-panel-reducer'; +import DetailsPanel from '../../views-components/details-panel/details-panel'; +import { ArvadosTheme } from '../../common/custom-theme'; +import ContextMenu from '../../components/context-menu/context-menu'; +import { mockAnchorFromMouseEvent } from '../../components/popover/helpers'; const drawerWidth = 240; -const appBarHeight = 102; +const appBarHeight = 100; type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'contentWrapper' | 'toolbar'; -const styles: StyleRulesCallback = (theme: Theme) => ({ +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { flexGrow: 1, zIndex: 1, @@ -44,7 +50,6 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ }, appBar: { zIndex: theme.zIndex.drawer + 1, - backgroundColor: '#692498', position: "absolute", width: "100%" }, @@ -62,7 +67,7 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ paddingTop: appBarHeight }, content: { - padding: theme.spacing.unit * 3, + padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`, overflowY: "auto", flexGrow: 1 }, @@ -90,6 +95,10 @@ interface NavMenuItem extends MainAppBarMenuItem { } interface WorkbenchState { + contextMenu: { + anchorEl?: HTMLElement; + }; + isCreationDialogOpen: boolean; anchorEl: any; searchText: string; menuItems: { @@ -97,10 +106,15 @@ interface WorkbenchState { helpMenu: NavMenuItem[], anonymousMenu: NavMenuItem[] }; + isDetailsPanelOpened: boolean; } class Workbench extends React.Component { state = { + contextMenu: { + anchorEl: undefined + }, + isCreationDialogOpen: false, anchorEl: null, searchText: "", breadcrumbs: [], @@ -127,20 +141,22 @@ class Workbench extends React.Component { action: () => this.props.dispatch(authActions.LOGIN()) } ] - } + }, + isDetailsPanelOpened: false }; mainAppBarActions: MainAppBarActionProps = { onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => { - this.props.dispatch( - setProjectItem(this.props.projects, itemId, ResourceKind.PROJECT, ItemMode.BOTH) - ); + this.props.dispatch(setProjectItem(itemId, ItemMode.BOTH)); }, onSearch: searchText => { this.setState({ searchText }); this.props.dispatch(push(`/search?q=${searchText}`)); }, - onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action() + onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action(), + onDetailsPanelToggle: () => { + this.setState(prev => ({ isDetailsPanelOpened: !prev.isDetailsPanelOpened })); + } }; toggleSidePanelOpen = (itemId: string) => { @@ -152,9 +168,27 @@ class Workbench extends React.Component { this.props.dispatch(projectActions.RESET_PROJECT_TREE_ACTIVITY(itemId)); } + handleCreationDialogOpen = () => { + this.setState({ isCreationDialogOpen: true }); + } + + handleCreationDialogClose = () => { + this.setState({ isCreationDialogOpen: false }); + } + + openContextMenu = (event: React.MouseEvent, item: any) => { + event.preventDefault(); + this.setState({ contextMenu: { anchorEl: mockAnchorFromMouseEvent(event) } }); + console.log(item); + } + + closeContextMenu = () => { + this.setState({ contextMenu: {} }); + } + render() { - const branch = getTreePath(this.props.projects, this.props.currentProjectId); - const breadcrumbs = branch.map(item => ({ + const path = getTreePath(this.props.projects, this.props.currentProjectId); + const breadcrumbs = path.map(item => ({ label: item.data.name, itemId: item.data.uuid, status: item.status @@ -182,31 +216,71 @@ class Workbench extends React.Component { + sidePanelItems={this.props.sidePanelItems} + onContextMenu={this.openContextMenu}> - this.props.dispatch( - setProjectItem(this.props.projects, itemId, ResourceKind.PROJECT, ItemMode.OPEN) - )} - toggleActive={itemId => - this.props.dispatch( - setProjectItem(this.props.projects, itemId, ResourceKind.PROJECT, ItemMode.ACTIVE) - )} - /> + toggleOpen={itemId => this.props.dispatch(setProjectItem(itemId, ItemMode.OPEN))} + toggleActive={itemId => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} + onContextMenu={this.openContextMenu} /> }
- +
+
+ ); } + + renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} + onItemClick={item => this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE))} + onContextMenu={this.openContextMenu} + handleCreationDialogOpen={this.handleCreationDialogOpen} + handleCreationDialogClose={this.handleCreationDialogClose} + isCreationDialogOpen={this.state.isCreationDialogOpen} + {...props} /> + +} + +const contextMenuActions = [[{ + icon: "fas fa-plus fa-fw", + name: "New project" +}, { + 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) => ({