X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0dbd184178c1016a19828fa80df9f91dec907993..37ebbbd4f05f811582546823738619f1fbb97686:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 90df260b..eaf3a2ee 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -3,61 +3,44 @@ // 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 } from "react-router"; import authActions from "../../store/auth/auth-action"; import { User } from "../../models/user"; import { RootState } from "../../store/store"; -import MainAppBar, { MainAppBarActionProps, MainAppBarMenuItem } from '../../components/main-app-bar/main-app-bar'; +import MainAppBar, { + MainAppBarActionProps, + MainAppBarMenuItem +} from '../../views-components/main-app-bar/main-app-bar'; import { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs'; import { push } from 'react-router-redux'; +import ProjectTree from '../../views-components/project-tree/project-tree'; +import { TreeItem } from "../../components/tree/tree"; +import { getTreePath } from '../../store/project/project-reducer'; +import sidePanelActions from '../../store/side-panel/side-panel-action'; +import SidePanel, { SidePanelItem } from '../../components/side-panel/side-panel'; +import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action"; import projectActions from "../../store/project/project-action"; -import ProjectTree from '../../components/project-tree/project-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; +import ProjectPanel from "../project-panel/project-panel"; +import DetailsPanel from '../../views-components/details-panel/details-panel'; +import { ArvadosTheme } from '../../common/custom-theme'; +import ContextMenu, { ContextMenuKind } from "../../views-components/context-menu"; +import CreateProjectDialog from "../../views-components/create-project-dialog/create-project-dialog"; +import { authService } from '../../services/services'; -type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'toolbar'; - -const styles: StyleRulesCallback = (theme: Theme) => ({ - root: { - flexGrow: 1, - zIndex: 1, - overflow: 'hidden', - position: 'relative', - display: 'flex', - width: '100vw', - height: '100vh' - }, - appBar: { - zIndex: theme.zIndex.drawer + 1, - backgroundColor: '#692498', - position: "absolute", - width: "100%" - }, - drawerPaper: { - position: 'relative', - width: drawerWidth, - }, - content: { - flexGrow: 1, - backgroundColor: theme.palette.background.default, - padding: theme.spacing.unit * 3, - height: '100%', - minWidth: 0, - }, - toolbar: theme.mixins.toolbar -}); +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'; interface WorkbenchDataProps { - projects: Array>; + projects: Array>; + currentProjectId: string; user?: User; + sidePanelItems: SidePanelItem[]; } interface WorkbenchActionProps { @@ -66,7 +49,7 @@ interface WorkbenchActionProps { type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles; interface NavBreadcrumb extends Breadcrumb { - path: string; + itemId: string; } interface NavMenuItem extends MainAppBarMenuItem { @@ -75,7 +58,6 @@ interface NavMenuItem extends MainAppBarMenuItem { interface WorkbenchState { anchorEl: any; - breadcrumbs: NavBreadcrumb[]; searchText: string; menuItems: { accountMenu: NavMenuItem[], @@ -84,19 +66,13 @@ interface WorkbenchState { }; } + class Workbench extends React.Component { state = { + isCreationDialogOpen: false, anchorEl: null, searchText: "", - breadcrumbs: [ - { - label: "Projects", - path: "/projects" - }, { - label: "Project 1", - path: "/projects/project-1" - } - ], + breadcrumbs: [], menuItems: { accountMenu: [ { @@ -123,41 +99,24 @@ class Workbench extends React.Component { } }; - - mainAppBarActions: MainAppBarActionProps = { - onBreadcrumbClick: (breadcrumb: NavBreadcrumb) => this.props.dispatch(push(breadcrumb.path)), - onSearch: searchText => { - this.setState({ searchText }); - this.props.dispatch(push(`/search?q=${searchText}`)); - }, - onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action() - }; - - toggleProjectTreeItem = (itemId: string, status: TreeItemStatus) => { - if (status === TreeItemStatus.Loaded) { - this.openProjectItem(itemId); - } else { - this.props.dispatch(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 path = getTreePath(this.props.projects, this.props.currentProjectId); + const breadcrumbs = path.map(item => ({ + label: item.data.name, + itemId: item.data.uuid, + status: item.status + })); + const { classes, user } = this.props; return (
+ {...this.mainAppBarActions} />
{user && { paper: classes.drawerPaper, }}>
- + this.openContextMenu(event, authService.getUuid() || "", ContextMenuKind.RootProject)}> + this.props.dispatch(setProjectItem(itemId, ItemMode.OPEN))} + onContextMenu={(event, item) => this.openContextMenu(event, item.data.uuid, ContextMenuKind.Project)} + 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)); + }} /> + } -
-
-
- - - +
+
+ + + +
+ { user && }
+ +
); } + + renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} + onContextMenu={(event, item) => this.openContextMenu(event, item.uuid, ContextMenuKind.Project)} + 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} /> + + mainAppBarActions: MainAppBarActionProps = { + onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => { + this.props.dispatch(setProjectItem(itemId, ItemMode.BOTH)); + this.props.dispatch(loadDetails(itemId, ResourceKind.Project)); + }, + onSearch: searchText => { + this.setState({ searchText }); + this.props.dispatch(push(`/search?q=${searchText}`)); + }, + onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action(), + onDetailsPanelToggle: () => { + this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); + }, + onContextMenu: (event: React.MouseEvent, breadcrumb: NavBreadcrumb) => { + this.openContextMenu(event, breadcrumb.itemId, ContextMenuKind.Project); + } + }; + + toggleSidePanelOpen = (itemId: string) => { + this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_OPEN(itemId)); + } + + toggleSidePanelActive = (itemId: string) => { + this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(itemId)); + this.props.dispatch(projectActions.RESET_PROJECT_TREE_ACTIVITY(itemId)); + this.props.dispatch(push("/")); + } + + handleCreationDialogOpen = (itemUuid: string) => { + this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid })); + } + + openContextMenu = (event: React.MouseEvent, itemUuid: string, kind: ContextMenuKind) => { + event.preventDefault(); + this.props.dispatch( + contextMenuActions.OPEN_CONTEXT_MENU({ + position: { x: event.clientX, y: event.clientY }, + resource: { uuid: itemUuid, kind } + }) + ); + } + + } +const drawerWidth = 240; +const appBarHeight = 100; + +type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'contentWrapper' | 'toolbar'; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + root: { + flexGrow: 1, + zIndex: 1, + overflow: 'hidden', + position: 'relative', + display: 'flex', + width: '100vw', + height: '100vh' + }, + appBar: { + zIndex: theme.zIndex.drawer + 1, + position: "absolute", + width: "100%" + }, + drawerPaper: { + position: 'relative', + width: drawerWidth, + display: 'flex', + flexDirection: 'column', + }, + contentWrapper: { + backgroundColor: theme.palette.background.default, + display: "flex", + flexGrow: 1, + minWidth: 0, + paddingTop: appBarHeight + }, + content: { + padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`, + overflowY: "auto", + flexGrow: 1 + }, + toolbar: theme.mixins.toolbar +}); + export default connect( (state: RootState) => ({ - projects: state.projects, - user: state.auth.user + projects: state.projects.items, + currentProjectId: state.projects.currentItemId, + user: state.auth.user, + sidePanelItems: state.sidePanel }) )( withStyles(styles)(Workbench)