X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/b0de143e088973715681f7eb6c41f2dccb648c2b..10ce16c28de952f6533ca3cc9df909269e3d2a53:/src/views/workbench/workbench.tsx

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index b2bdac80..b1e7cd78 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -7,34 +7,31 @@ import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/st
 import Drawer from '@material-ui/core/Drawer';
 import { connect, DispatchProp } from "react-redux";
 import { Route, Switch, RouteComponentProps } from "react-router";
-import authActions from "../../store/auth/auth-action";
+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 ProjectTree from '../../views-components/project-tree/project-tree';
+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 { 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 { 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 ContextMenu, { ContextMenuAction } from '../../components/context-menu/context-menu';
-import { mockAnchorFromMouseEvent } from '../../components/popover/helpers';
-import DialogProjectCreate from "../../views-components/create-project-dialog/create-project-dialog";
+import { CreateProjectDialog } from "../../views-components/create-project-dialog/create-project-dialog";
 import { authService } from '../../services/services';
 
-import detailsPanelActions, { loadDetails } from "../../store/details-panel/details-panel-action";
+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';
+import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
 
 const drawerWidth = 240;
 const appBarHeight = 100;
@@ -98,10 +95,6 @@ interface NavMenuItem extends MainAppBarMenuItem {
 }
 
 interface WorkbenchState {
-    contextMenu: {
-        anchorEl?: HTMLElement;
-        itemUuid?: string;
-    };
     anchorEl: any;
     searchText: string;
     menuItems: {
@@ -111,207 +104,157 @@ interface WorkbenchState {
     };
 }
 
-
-class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
-    state = {
-        contextMenu: {
-            anchorEl: undefined,
-            itemUuid: undefined
-        },
-        isCreationDialogOpen: false,
-        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"))
+export const Workbench = withStyles(styles)(
+    connect<WorkbenchDataProps>(
+        (state: RootState) => ({
+            projects: state.projects.items,
+            currentProjectId: state.projects.currentItemId,
+            user: state.auth.user,
+            sidePanelItems: state.sidePanel
+        })
+    )(
+        class extends React.Component<WorkbenchProps, WorkbenchState> {
+            state = {
+                isCreationDialogOpen: false,
+                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())
+                        }
+                    ]
                 }
-            ],
-            anonymousMenu: [
-                {
-                    label: "Sign in",
-                    action: () => this.props.dispatch(authActions.LOGIN())
-                }
-            ]
-        }
-    };
+            };
 
-    mainAppBarActions: MainAppBarActionProps = {
-        onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => {
-            this.props.dispatch<any>(setProjectItem(itemId, ItemMode.BOTH));
-            this.props.dispatch<any>(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<HTMLElement>, breadcrumb: NavBreadcrumb) => {
-            this.openContextMenu(event, breadcrumb.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
+                }));
 
-    toggleSidePanelOpen = (itemId: string) => {
-        this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_OPEN(itemId));
-    }
+                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}
+                                {...this.mainAppBarActions} />
+                        </div>
+                        {user &&
+                            <Drawer
+                                variant="permanent"
+                                classes={{
+                                    paper: classes.drawerPaper,
+                                }}>
+                                <div className={classes.toolbar} />
+                                <SidePanel
+                                    toggleOpen={this.toggleSidePanelOpen}
+                                    toggleActive={this.toggleSidePanelActive}
+                                    sidePanelItems={this.props.sidePanelItems}
+                                    onContextMenu={(event) => this.openContextMenu(event, authService.getUuid() || "", ContextMenuKind.RootProject)}>
+                                    <ProjectTree
+                                        projects={this.props.projects}
+                                        toggleOpen={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.OPEN))}
+                                        onContextMenu={(event, item) => this.openContextMenu(event, item.data.uuid, ContextMenuKind.Project)}
+                                        toggleActive={itemId => {
+                                            this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE));
+                                            this.props.dispatch<any>(loadDetails(itemId, ResourceKind.Project));
+                                            this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.Projects));
+                                        }} />
+                                </SidePanel>
+                            </Drawer>}
+                        <main className={classes.contentWrapper}>
+                            <div className={classes.content}>
+                                <Switch>
+                                    <Route path="/projects/:id" render={this.renderProjectPanel} />
+                                </Switch>
+                            </div>
+                            {user && <DetailsPanel />}
+                        </main>
+                        <ContextMenu />
+                        <CreateProjectDialog />
+                    </div>
+                );
+            }
 
-    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("/"));
-    }
+            renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => <ProjectPanel
+                onItemRouteChange={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE))}
+                onContextMenu={(event, item) => this.openContextMenu(event, item.uuid, ContextMenuKind.Project)}
+                onDialogOpen={this.handleCreationDialogOpen}
+                onItemClick={item => {
+                    this.props.dispatch<any>(loadDetails(item.uuid, item.kind as ResourceKind));
+                }}
+                onItemDoubleClick={item => {
+                    this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE));
+                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.Project));
+                }}
+                {...props} />
 
-    handleCreationDialogOpen = (itemUuid: string) => {
-        this.closeContextMenu();
-        this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid }));
-    }
+            mainAppBarActions: MainAppBarActionProps = {
+                onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => {
+                    this.props.dispatch<any>(setProjectItem(itemId, ItemMode.BOTH));
+                    this.props.dispatch<any>(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<HTMLElement>, breadcrumb: NavBreadcrumb) => {
+                    this.openContextMenu(event, breadcrumb.itemId, ContextMenuKind.Project);
+                }
+            };
 
+            toggleSidePanelOpen = (itemId: string) => {
+                this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_OPEN(itemId));
+            }
 
-    openContextMenu = (event: React.MouseEvent<HTMLElement>, itemUuid: string) => {
-        event.preventDefault();
-        this.setState({
-            contextMenu: {
-                anchorEl: mockAnchorFromMouseEvent(event),
-                itemUuid
+            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("/"));
             }
-        });
-    }
 
-    closeContextMenu = () => {
-        this.setState({ contextMenu: {} });
-    }
+            handleCreationDialogOpen = (itemUuid: string) => {
+                this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid }));
+            }
 
-    openCreateDialog = (item: ContextMenuAction) => {
-        const { itemUuid } = this.state.contextMenu;
-        if (item.openCreateDialog && itemUuid) {
-            this.handleCreationDialogOpen(itemUuid);
+            openContextMenu = (event: React.MouseEvent<HTMLElement>, itemUuid: string, kind: ContextMenuKind) => {
+                event.preventDefault();
+                this.props.dispatch(
+                    contextMenuActions.OPEN_CONTEXT_MENU({
+                        position: { x: event.clientX, y: event.clientY },
+                        resource: { uuid: itemUuid, kind }
+                    })
+                );
+            }
         }
-    }
-
-    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 (
-            <div className={classes.root}>
-                <div className={classes.appBar}>
-                    <MainAppBar
-                        breadcrumbs={breadcrumbs}
-                        searchText={this.state.searchText}
-                        user={this.props.user}
-                        menuItems={this.state.menuItems}
-                        {...this.mainAppBarActions} />
-                </div>
-                {user &&
-                    <Drawer
-                        variant="permanent"
-                        classes={{
-                            paper: classes.drawerPaper,
-                        }}>
-                        <div className={classes.toolbar} />
-                        <SidePanel
-                            toggleOpen={this.toggleSidePanelOpen}
-                            toggleActive={this.toggleSidePanelActive}
-                            sidePanelItems={this.props.sidePanelItems}
-                            onContextMenu={(event) => this.openContextMenu(event, authService.getUuid() || "")}>
-                            <ProjectTree
-                                projects={this.props.projects}
-                                toggleOpen={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.OPEN))}
-                                onContextMenu={(event, item) => this.openContextMenu(event, item.data.uuid)}
-                                toggleActive={itemId => {
-                                    this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE));
-                                    this.props.dispatch<any>(loadDetails(itemId, ResourceKind.Project));
-                                    this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.Projects));
-                                }} />
-                        </SidePanel>
-                    </Drawer>}
-                <main className={classes.contentWrapper}>
-                    <div className={classes.content}>
-                        <Switch>
-                            <Route path="/projects/:id" render={this.renderProjectPanel} />
-                        </Switch>
-                    </div>
-                    <DetailsPanel />
-                </main>
-                <ContextMenu
-                    anchorEl={this.state.contextMenu.anchorEl}
-                    actions={contextMenuActions}
-                    onActionClick={this.openCreateDialog}
-                    onClose={this.closeContextMenu} />
-                <DialogProjectCreate />
-            </div>
-        );
-    }
-
-    renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => <ProjectPanel
-        onItemRouteChange={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE))}
-        onContextMenu={(event, item) => this.openContextMenu(event, item.uuid)}
-        onDialogOpen={this.handleCreationDialogOpen}
-        onItemClick={item => {
-            this.props.dispatch<any>(loadDetails(item.uuid, item.kind as ResourceKind));
-        }}
-        onItemDoubleClick={item => {
-            this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE));
-            this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.Project));
-        }}
-        {...props} />
-}
-
-const contextMenuActions = [[{
-    icon: "fas fa-plus fa-fw",
-    name: "New project",
-    openCreateDialog: true
-}, {
-    icon: "fas fa-users fa-fw",
-    name: "Share"
-}, {
-    icon: "fas fa-sign-out-alt fa-fw",
-    name: "Move to"
-}, {
-    icon: "fas fa-star fa-fw",
-    name: "Add to favourite"
-}, {
-    icon: "fas fa-edit fa-fw",
-    name: "Rename"
-}, {
-    icon: "fas fa-copy fa-fw",
-    name: "Make a copy"
-}, {
-    icon: "fas fa-download fa-fw",
-    name: "Download"
-}], [{
-    icon: "fas fa-trash-alt fa-fw",
-    name: "Remove"
-}
-]];
-
-export default connect<WorkbenchDataProps>(
-    (state: RootState) => ({
-        projects: state.projects.items,
-        currentProjectId: state.projects.currentItemId,
-        user: state.auth.user,
-        sidePanelItems: state.sidePanel
-    })
-)(
-    withStyles(styles)(Workbench)
+    )
 );