X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0af46f7944bde95f634080a1d6b15ae9c585890a..0e3c4c507b9d3ec37b808b7a38cf111722659403:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 4f9843cb..11f36948 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -3,32 +3,39 @@ // 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 '../../views-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 projectActions, { getProjectList } from "../../store/project/project-action"; import ProjectTree from '../../views-components/project-tree/project-tree'; -import { TreeItem, TreeItemStatus } from "../../components/tree/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 sidePanelActions from '../../store/side-panel/side-panel-action'; -import { projectService } from '../../services/services'; 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 = 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, @@ -40,7 +47,6 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ }, appBar: { zIndex: theme.zIndex.drawer + 1, - backgroundColor: '#692498', position: "absolute", width: "100%" }, @@ -58,7 +64,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 }, @@ -67,6 +73,7 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ interface WorkbenchDataProps { projects: Array>; + currentProjectId: string; user?: User; sidePanelItems: SidePanelItem[]; } @@ -78,7 +85,6 @@ type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & interface NavBreadcrumb extends Breadcrumb { itemId: string; - status: TreeItemStatus; } interface NavMenuItem extends MainAppBarMenuItem { @@ -87,7 +93,6 @@ interface NavMenuItem extends MainAppBarMenuItem { interface WorkbenchState { anchorEl: any; - breadcrumbs: NavBreadcrumb[]; searchText: string; menuItems: { accountMenu: NavMenuItem[], @@ -96,6 +101,7 @@ interface WorkbenchState { }; } + class Workbench extends React.Component { state = { anchorEl: null, @@ -127,47 +133,19 @@ class Workbench extends React.Component { } }; - mainAppBarActions: MainAppBarActionProps = { - onBreadcrumbClick: ({ itemId, status }: NavBreadcrumb) => { - this.toggleProjectTreeItemOpen(itemId, status); + 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() - }; - - 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)); - }); + 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)); @@ -178,26 +156,20 @@ class Workbench extends React.Component { 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, projects, sidePanelItems } = 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 (
{ + sidePanelItems={this.props.sidePanelItems}> + projects={this.props.projects} + toggleOpen={itemId => 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( (state: RootState) => ({ - projects: state.projects, + projects: state.projects.items, + currentProjectId: state.projects.currentItemId, user: state.auth.user, - sidePanelItems: state.sidePanel, + sidePanelItems: state.sidePanel }) )( withStyles(styles)(Workbench)