X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8bfcbaea5e9f11543bbc4d721817978e621d2ffa..c90e813adcec89899d9db95843295a84fb058c3e:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 15f6fa5e..4f9843cb 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -3,34 +3,30 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; - import { StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core/styles'; import Drawer from '@material-ui/core/Drawer'; -import AppBar from '@material-ui/core/AppBar'; -import Toolbar from '@material-ui/core/Toolbar'; -import Typography from '@material-ui/core/Typography'; import { connect, DispatchProp } from "react-redux"; -import Tree from "../../components/tree/tree"; -import { Project } from "../../models/project"; -import ProjectList from "../../components/project-list/project-list"; import { Route, Switch } from "react-router"; -import { Link } from "react-router-dom"; -import Button from "@material-ui/core/Button/Button"; import authActions from "../../store/auth/auth-action"; -import IconButton from "@material-ui/core/IconButton/IconButton"; -import Menu from "@material-ui/core/Menu/Menu"; -import MenuItem from "@material-ui/core/MenuItem/MenuItem"; -import { AccountCircle } from "@material-ui/icons"; import { User } from "../../models/user"; -import Grid from "@material-ui/core/Grid/Grid"; import { RootState } from "../../store/store"; -import MainAppBar, { MainAppBarActionProps, MainAppBarMenuItems, MainAppBarMenuItem } from '../../components/main-app-bar/main-app-bar'; -import { Breadcrumb } from '../../components/main-app-bar/breadcrumbs/breadcrumbs'; +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 projectActions, { getProjectList } from "../../store/project/project-action"; +import ProjectTree from '../../views-components/project-tree/project-tree'; +import { TreeItem, TreeItemStatus } from "../../components/tree/tree"; +import { Project } from "../../models/project"; +import { getTreePath } from '../../store/project/project-reducer'; +import ProjectPanel from '../project-panel/project-panel'; +import sidePanelActions from '../../store/side-panel/side-panel-action'; +import { projectService } from '../../services/services'; +import SidePanel, { SidePanelItem } from '../../components/side-panel/side-panel'; const drawerWidth = 240; +const appBarHeight = 102; -type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'toolbar'; +type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'contentWrapper' | 'toolbar'; const styles: StyleRulesCallback = (theme: Theme) => ({ root: { @@ -51,20 +47,28 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ drawerPaper: { position: 'relative', width: drawerWidth, + display: 'flex', + flexDirection: 'column', }, - content: { - flexGrow: 1, + contentWrapper: { backgroundColor: theme.palette.background.default, - padding: theme.spacing.unit * 3, - height: '100%', + display: "flex", + flexGrow: 1, minWidth: 0, + paddingTop: appBarHeight + }, + content: { + padding: theme.spacing.unit * 3, + overflowY: "auto", + flexGrow: 1 }, toolbar: theme.mixins.toolbar }); interface WorkbenchDataProps { - projects: Project[]; + projects: Array>; user?: User; + sidePanelItems: SidePanelItem[]; } interface WorkbenchActionProps { @@ -73,17 +77,18 @@ interface WorkbenchActionProps { type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles; interface NavBreadcrumb extends Breadcrumb { - path: string + itemId: string; + status: TreeItemStatus; } interface NavMenuItem extends MainAppBarMenuItem { - action: () => void + action: () => void; } interface WorkbenchState { anchorEl: any; breadcrumbs: NavBreadcrumb[]; - searchQuery: string; + searchText: string; menuItems: { accountMenu: NavMenuItem[], helpMenu: NavMenuItem[], @@ -94,16 +99,8 @@ interface WorkbenchState { class Workbench extends React.Component { state = { anchorEl: null, - searchQuery: "", - breadcrumbs: [ - { - label: "Projects", - path: "/projects" - }, { - label: "Project 1", - path: "/projects/project-1" - } - ], + searchText: "", + breadcrumbs: [], menuItems: { accountMenu: [ { @@ -128,29 +125,83 @@ class Workbench extends React.Component { } ] } - } + }; mainAppBarActions: MainAppBarActionProps = { - actions: { - onBreadcrumbClick: (breadcrumb: NavBreadcrumb) => this.props.dispatch(push(breadcrumb.path)), - onSearchQueryChange: searchQuery => this.setState({ searchQuery }), - onSearchQuerySubmit: () => this.props.dispatch(push(`/search?q=${this.state.searchQuery}`)), - onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action() + onBreadcrumbClick: ({ itemId, status }: NavBreadcrumb) => { + this.toggleProjectTreeItemOpen(itemId, status); + }, + onSearch: searchText => { + this.setState({ searchText }); + this.props.dispatch(push(`/search?q=${searchText}`)); + }, + onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action() + }; + + toggleProjectTreeItemOpen = (itemId: string, status: TreeItemStatus) => { + if (status === TreeItemStatus.Loaded) { + this.openProjectItem(itemId); + this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_OPEN(itemId)); + this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(itemId)); + } else { + this.props.dispatch(getProjectList(itemId)) + .then(() => { + this.openProjectItem(itemId); + this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_OPEN(itemId)); + this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(itemId)); + }); + } + } + + toggleProjectTreeItemActive = (itemId: string, status: TreeItemStatus) => { + if (status === TreeItemStatus.Loaded) { + this.openProjectItem(itemId); + this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(itemId)); + this.props.dispatch(sidePanelActions.RESET_SIDE_PANEL_ACTIVITY(itemId)); + } else { + this.props.dispatch(getProjectList(itemId)) + .then(() => { + this.openProjectItem(itemId); + this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(itemId)); + this.props.dispatch(sidePanelActions.RESET_SIDE_PANEL_ACTIVITY(itemId)); + }); } } + 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)); + } + + openProjectItem = (itemId: string) => { + const branch = getTreePath(this.props.projects, itemId); + this.setState({ + breadcrumbs: branch.map(item => ({ + label: item.data.name, + itemId: item.data.uuid, + status: item.status + })) + }); + this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(itemId)); + this.props.dispatch(push(`/project/${itemId}`)); + } + render() { - const { classes, user } = this.props; + const { classes, user, projects, sidePanelItems } = this.props; return (
{user && @@ -160,17 +211,22 @@ class Workbench extends React.Component { paper: classes.drawerPaper, }}>
-
- - {p.name} - } /> + + + } -
-
-
- - - +
+
+ + + +
); @@ -180,7 +236,8 @@ class Workbench extends React.Component { export default connect( (state: RootState) => ({ projects: state.projects, - user: state.auth.user + user: state.auth.user, + sidePanelItems: state.sidePanel, }) )( withStyles(styles)(Workbench)