X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7ee704ab48987ee6223528c5b7526ef246709a4c..0e3c4c507b9d3ec37b808b7a38cf111722659403:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 25868c38..11f36948 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -3,101 +3,226 @@ // 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 AppBar from '@material-ui/core/AppBar'; -import Toolbar from '@material-ui/core/Toolbar'; -import Typography from '@material-ui/core/Typography'; -import { connect } from "react-redux"; -import { RootState } from "../../store/root-reducer"; -import ProjectList from "../../components/project-list/project-list"; -import { Route, Switch } from "react-router"; -import { Link } from "react-router-dom"; - -import { actions as projectActions } from "../../store/project-action"; -import ProjectTree from '../../components/project-tree/project-tree'; -import { TreeItem } from '../../components/tree/tree'; -import { Project } from '../../models/project'; +import { connect, DispatchProp } from "react-redux"; +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 '../../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 { Project } from "../../models/project"; +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 ProjectPanel from "../project-panel/project-panel"; +import DetailsPanel from '../../views-components/details-panel/details-panel'; +import { ArvadosTheme } from '../../common/custom-theme'; +import detailsPanelActions, { loadDetails } from "../../store/details-panel/details-panel-action"; +import { ResourceKind } from '../../models/kinds'; const drawerWidth = 240; +const appBarHeight = 100; -type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'toolbar'; +type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'contentWrapper' | 'toolbar'; -const styles: StyleRulesCallback = (theme: Theme) => ({ +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { flexGrow: 1, zIndex: 1, overflow: 'hidden', position: 'relative', display: 'flex', - width: '100%', - height: '100%' + width: '100vw', + height: '100vh' }, appBar: { zIndex: theme.zIndex.drawer + 1, - backgroundColor: '#692498' + position: "absolute", + width: "100%" }, drawerPaper: { position: 'relative', width: drawerWidth, + display: 'flex', + flexDirection: 'column', }, - content: { - flexGrow: 1, + contentWrapper: { backgroundColor: theme.palette.background.default, - padding: theme.spacing.unit * 3, + 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 }); -interface WorkbenchProps { +interface WorkbenchDataProps { projects: Array>; - toggleProjectTreeItem: (id: string) => any; + currentProjectId: string; + user?: User; + sidePanelItems: SidePanelItem[]; +} + +interface WorkbenchActionProps { +} + +type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles; + +interface NavBreadcrumb extends Breadcrumb { + itemId: string; +} + +interface NavMenuItem extends MainAppBarMenuItem { + action: () => void; } -class Workbench extends React.Component> { +interface WorkbenchState { + anchorEl: any; + searchText: string; + menuItems: { + accountMenu: NavMenuItem[], + helpMenu: NavMenuItem[], + anonymousMenu: NavMenuItem[] + }; +} + + +class Workbench extends React.Component { + state = { + anchorEl: null, + searchText: "", + breadcrumbs: [], + menuItems: { + accountMenu: [ + { + label: "Logout", + action: () => this.props.dispatch(authActions.LOGOUT()) + }, + { + label: "My account", + action: () => this.props.dispatch(push("/my-account")) + } + ], + helpMenu: [ + { + label: "Help", + action: () => this.props.dispatch(push("/help")) + } + ], + anonymousMenu: [ + { + label: "Sign in", + action: () => this.props.dispatch(authActions.LOGIN()) + } + ] + } + }; + + mainAppBarActions: MainAppBarActionProps = { + onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => { + this.props.dispatch(setProjectItem(itemId, ItemMode.BOTH)); + }, + 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()); + } + }; + + 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)); + } + render() { - const { classes } = this.props; + 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 (
- - - - Arvados
Workbench 2 -
-
-
- -
- - -
-
- - - Hello new workbench! - - - +
+ +
+ {user && + +
+ + this.props.dispatch(setProjectItem(itemId, ItemMode.OPEN))} + toggleActive={itemId => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} + /> + + } +
+
+ + + +
+
); } + + renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} + onItemClick={item => { + this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE)); + this.props.dispatch(loadDetails(item.uuid, item.kind as ResourceKind)); + }} + {...props} /> + } -export default connect( +export default connect( (state: RootState) => ({ - projects: state.projects - }), { - toggleProjectTreeItem: (id: string) => projectActions.toggleProjectTreeItem(id) - } + projects: state.projects.items, + currentProjectId: state.projects.currentItemId, + user: state.auth.user, + sidePanelItems: state.sidePanel + }) )( withStyles(styles)(Workbench) );