// 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 } from "react-redux";
-import Tree, { TreeItem } from "../../components/tree/tree";
-import { Project } from "../../models/project";
-import { RootState } from "../../store/root-reducer";
-import ProjectList from "../../components/project-list/project-list";
+import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
+import { connect, DispatchProp } from "react-redux";
import { Route, Switch } from "react-router";
-import { Link } from "react-router-dom";
+import { login, logout } 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 { push } from 'react-router-redux';
+import { ProjectPanel } from "~/views/project-panel/project-panel";
+import { DetailsPanel } from '~/views-components/details-panel/details-panel';
+import { ArvadosTheme } from '~/common/custom-theme';
+import { detailsPanelActions } from "~/store/details-panel/details-panel-action";
+import { ContextMenu } from "~/views-components/context-menu/context-menu";
+import { FavoritePanel } from "../favorite-panel/favorite-panel";
+import { CurrentTokenDialog } from '~/views-components/current-token-dialog/current-token-dialog';
+import { Snackbar } from '~/views-components/snackbar/snackbar';
+import { CollectionPanel } from '../collection-panel/collection-panel';
+import { AuthService } from "~/services/auth-service/auth-service";
+import { RenameFileDialog } from '~/views-components/rename-file-dialog/rename-file-dialog';
+import { FileRemoveDialog } from '~/views-components/file-remove-dialog/file-remove-dialog';
+import { MultipleFilesRemoveDialog } from '~/views-components/file-remove-dialog/multiple-files-remove-dialog';
+import { SidePanel } from '~/views-components/side-panel/side-panel';
+import { Routes } from '~/routes/routes';
+import { Breadcrumbs } from '~/views-components/breadcrumbs/breadcrumbs';
+import { CreateProjectDialog } from '~/views-components/dialog-forms/create-project-dialog';
+import { CreateCollectionDialog } from '~/views-components/dialog-forms/create-collection-dialog';
+import { CopyCollectionDialog } from '~/views-components/dialog-forms/copy-collection-dialog';
+import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog';
+import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
+import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
+import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
+import { ProcessPanel } from '~/views/process-panel/process-panel';
+import { UploadCollectionFilesDialog } from '~/views-components/dialog-forms/upload-collection-files-dialog';
+import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
-import { actions as projectActions } from "../../store/project-action";
-import ListItemText from "@material-ui/core/ListItemText/ListItemText";
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-const drawerWidth = 240;
+const APP_BAR_HEIGHT = 100;
-type CssRules = 'root' | 'appBar' | 'active' | 'drawerPaper' | 'content' | 'row' | 'treeContainer' | 'toolbar';
+type CssRules = 'root' | 'appBar' | 'content' | 'contentWrapper';
-const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
+const styles: StyleRulesCallback<CssRules> = (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'
- },
- active: {
- color: '#4285F6',
- },
- drawerPaper: {
- position: 'relative',
- width: drawerWidth,
+ position: "absolute",
+ width: "100%"
},
- content: {
- flexGrow: 1,
+ contentWrapper: {
backgroundColor: theme.palette.background.default,
- padding: theme.spacing.unit * 3,
+ display: "flex",
+ flexGrow: 1,
minWidth: 0,
+ paddingTop: APP_BAR_HEIGHT
},
- row: {
- display: 'flex',
- alignItems: 'center',
- },
- treeContainer: {
- position: 'absolute',
- overflowX: 'visible',
- marginTop: '80px',
- minWidth: drawerWidth,
- whiteSpace: 'nowrap',
+ content: {
+ padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`,
+ overflowY: "auto",
+ flexGrow: 1,
+ position: 'relative'
},
- toolbar: theme.mixins.toolbar
});
-interface WorkbenchProps {
- projects: Array<TreeItem<Project>>;
- toggleProjectTreeItem: (id: string) => any;
+interface WorkbenchDataProps {
+ user?: User;
+ currentToken?: string;
+}
+
+interface WorkbenchGeneralProps {
+ authService: AuthService;
+ buildInfo: string;
+}
+
+interface WorkbenchActionProps {
+}
+
+type WorkbenchProps = WorkbenchDataProps & WorkbenchGeneralProps & WorkbenchActionProps & DispatchProp<any> & WithStyles<CssRules>;
+
+interface NavMenuItem extends MainAppBarMenuItem {
+ action: () => void;
}
interface WorkbenchState {
+ isCurrentTokenDialogOpen: boolean;
+ anchorEl: any;
+ searchText: string;
+ menuItems: {
+ accountMenu: NavMenuItem[],
+ helpMenu: NavMenuItem[],
+ anonymousMenu: NavMenuItem[]
+ };
}
-class Workbench extends React.Component<WorkbenchProps & WithStyles<CssRules>, WorkbenchState> {
- render() {
- const {classes, projects} = this.props;
- return (
- <div className={classes.root}>
- <AppBar position="absolute" className={classes.appBar}>
- <Toolbar>
- <Typography variant="title" color="inherit" noWrap>
- Arvados<br/>Workbench 2
- </Typography>
- </Toolbar>
- </AppBar>
- <Drawer
- variant="permanent"
- classes={{
- paper: classes.drawerPaper,
- }}>
- <div className={classes.toolbar}/>
- <div className={classes.treeContainer}>
- <Tree items={projects}
- toggleItem={this.props.toggleProjectTreeItem}
- render={(project: TreeItem<Project>) => <span className={classes.row}>
- <div><ListItemIcon className={project.active ? classes.active : ''}>{project.data.icon}</ListItemIcon></div>
- <div><ListItemText primary={<Typography className={project.active ? classes.active : ''}>{project.data.name}</Typography>} /></div>
- </span>}
- />
+export const Workbench = withStyles(styles)(
+ connect<WorkbenchDataProps>(
+ (state: RootState) => ({
+ user: state.auth.user,
+ currentToken: state.auth.apiToken,
+ })
+ )(
+ class extends React.Component<WorkbenchProps, WorkbenchState> {
+ state = {
+ isCurrentTokenDialogOpen: false,
+ anchorEl: null,
+ searchText: "",
+ breadcrumbs: [],
+ menuItems: {
+ accountMenu: [
+ {
+ label: 'Current token',
+ action: () => this.toggleCurrentTokenModal()
+ },
+ {
+ label: "Logout",
+ action: () => this.props.dispatch(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(login())
+ }
+ ]
+ }
+ };
+
+ render() {
+ const { classes, user } = this.props;
+ return (
+ <div className={classes.root}>
+ <div className={classes.appBar}>
+ <MainAppBar
+ breadcrumbs={Breadcrumbs}
+ searchText={this.state.searchText}
+ user={this.props.user}
+ menuItems={this.state.menuItems}
+ buildInfo={this.props.buildInfo}
+ {...this.mainAppBarActions} />
+ </div>
+ {user && <SidePanel />}
+ <main className={classes.contentWrapper}>
+ <div className={classes.content}>
+ <Switch>
+ <Route path={Routes.PROJECTS} component={ProjectPanel} />
+ <Route path={Routes.COLLECTIONS} component={CollectionPanel} />
+ <Route path={Routes.FAVORITES} component={FavoritePanel} />
+ <Route path={Routes.PROCESS} component={ProcessPanel} />
+ </Switch>
+ </div>
+ {user && <DetailsPanel />}
+ </main>
+ <ContextMenu />
+ <Snackbar />
+ <CreateProjectDialog />
+ <CreateCollectionDialog />
+ <RenameFileDialog />
+ <PartialCopyCollectionDialog />
+ <FileRemoveDialog />
+ <CopyCollectionDialog />
+ <MultipleFilesRemoveDialog />
+ <UpdateCollectionDialog />
+ <UploadCollectionFilesDialog />
+ <UpdateProjectDialog />
+ <MoveCollectionDialog />
+ <MoveProjectDialog />
+ <CurrentTokenDialog
+ currentToken={this.props.currentToken}
+ open={this.state.isCurrentTokenDialogOpen}
+ handleClose={this.toggleCurrentTokenModal} />
</div>
- </Drawer>
- <main className={classes.content}>
- <div className={classes.toolbar}/>
- <Switch>
- <Route exact path="/">
- <Typography noWrap>Hello new workbench!</Typography>
- </Route>
- <Route path="/project/:name" component={ProjectList}/>
- </Switch>
- </main>
- </div>
- );
- }
-}
+ );
+ }
+
+ mainAppBarActions: MainAppBarActionProps = {
+ 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());
+ },
+ };
-export default connect(
- (state: RootState) => ({
- projects: state.projects
- }), {
- toggleProjectTreeItem: (id: string) => projectActions.toggleProjectTreeItem(id)
- }
-)(
- withStyles(styles)(Workbench)
+ toggleCurrentTokenModal = () => {
+ this.setState({ isCurrentTokenDialogOpen: !this.state.isCurrentTokenDialogOpen });
+ }
+ }
+ )
);
projects / arvados-workbench2.git / blobdiff