X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9fed03a84c6ef5234d61f7d62c93f7629da2409d..1c0f11ed17dea5be97e8ca63385f979925f1fb08:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 3611d7b1..8d8d937f 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -4,52 +4,48 @@ import * as React from 'react'; 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, RouteComponentProps } from "react-router"; -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 { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs'; +import { Route, Switch, Redirect } from "react-router"; +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 { 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 { 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 { collectionCreateActions } from '../../store/collections/creator/collection-creator-action'; -import { ProjectPanel } from "../project-panel/project-panel"; -import { DetailsPanel } from '../../views-components/details-panel/details-panel'; -import { ArvadosTheme } from '../../common/custom-theme'; -import { CreateProjectDialog } from "../../views-components/create-project-dialog/create-project-dialog"; - -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"; +import { TreeItem } from "~/components/tree/tree"; +import { getTreePath } from '~/store/project/project-reducer'; +import { ProjectPanel } from "~/views/project-panel/project-panel"; +import { DetailsPanel } from '~/views-components/details-panel/details-panel'; +import { ArvadosTheme } from '~/common/custom-theme'; +import { CreateProjectDialog } from "~/views-components/create-project-dialog/create-project-dialog"; +import { detailsPanelActions, loadDetailsPanel } from "~/store/details-panel/details-panel-action"; +import { openContextMenu } from '~/store/context-menu/context-menu-actions'; +import { ProjectResource, getProjectUrl } from '~/models/project'; +import { ContextMenu, ContextMenuKind } 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 { dataExplorerActions } from '../../store/data-explorer/data-explorer-action'; -import { Snackbar } from '../../views-components/snackbar/snackbar'; -import { favoritePanelActions } from '../../store/favorite-panel/favorite-panel-action'; -import { CreateCollectionDialog } from '../../views-components/create-collection-dialog/create-collection-dialog'; +import { CurrentTokenDialog } from '~/views-components/current-token-dialog/current-token-dialog'; +import { Snackbar } from '~/views-components/snackbar/snackbar'; +import { CreateCollectionDialog } from '~/views-components/create-collection-dialog/create-collection-dialog'; import { CollectionPanel } from '../collection-panel/collection-panel'; -import { loadCollection } from '../../store/collection-panel/collection-panel-action'; -import { getCollectionUrl } from '../../models/collection'; -import { RemoveDialog } from '../../views-components/remove-dialog/remove-dialog'; -import { RenameDialog } from '../../views-components/rename-dialog/rename-dialog'; -import { UpdateCollectionDialog } from '../../views-components/update-collection-dialog/update-collection-dialog.'; -import { AuthService } from "../../services/auth-service/auth-service"; +import { UpdateCollectionDialog } from '~/views-components/update-collection-dialog/update-collection-dialog.'; +import { UpdateProjectDialog } from '~/views-components/update-project-dialog/update-project-dialog'; +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 { DialogCollectionCreateWithSelectedFile } from '~/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected'; +import { UploadCollectionFilesDialog } from '~/views-components/upload-collection-files-dialog/upload-collection-files-dialog'; +import { ProjectCopyDialog } from '~/views-components/project-copy-dialog/project-copy-dialog'; +import { CollectionPartialCopyDialog } from '~/views-components/collection-partial-copy-dialog/collection-partial-copy-dialog'; +import { MoveProjectDialog } from '~/views-components/move-project-dialog/move-project-dialog'; +import { MoveCollectionDialog } from '~/views-components/move-collection-dialog/move-collection-dialog'; +import { SidePanel } from '~/views-components/side-panel/side-panel'; +import { Routes } from '~/routes/routes'; +import { navigateToResource } from '~/store/navigation/navigation-action'; -const DRAWER_WITDH = 240; const APP_BAR_HEIGHT = 100; -type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'contentWrapper' | 'toolbar'; +type CssRules = 'root' | 'appBar' | 'content' | 'contentWrapper'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { @@ -66,12 +62,6 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ position: "absolute", width: "100%" }, - drawerPaper: { - position: 'relative', - width: DRAWER_WITDH, - display: 'flex', - flexDirection: 'column', - }, contentWrapper: { backgroundColor: theme.palette.background.default, display: "flex", @@ -82,9 +72,9 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ content: { padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`, overflowY: "auto", - flexGrow: 1 + flexGrow: 1, + position: 'relative' }, - toolbar: theme.mixins.toolbar }); interface WorkbenchDataProps { @@ -92,17 +82,17 @@ interface WorkbenchDataProps { currentProjectId: string; user?: User; currentToken?: string; - sidePanelItems: SidePanelItem[]; } -interface WorkbenchServiceProps { +interface WorkbenchGeneralProps { authService: AuthService; + buildInfo: string; } interface WorkbenchActionProps { } -type WorkbenchProps = WorkbenchDataProps & WorkbenchServiceProps & WorkbenchActionProps & DispatchProp & WithStyles; +type WorkbenchProps = WorkbenchDataProps & WorkbenchGeneralProps & WorkbenchActionProps & DispatchProp & WithStyles; interface NavBreadcrumb extends Breadcrumb { itemId: string; @@ -130,12 +120,10 @@ export const Workbench = withStyles(styles)( currentProjectId: state.projects.currentItemId, user: state.auth.user, currentToken: state.auth.apiToken, - sidePanelItems: state.sidePanel }) )( class extends React.Component { state = { - isCreationDialogOpen: false, isCurrentTokenDialogOpen: false, anchorEl: null, searchText: "", @@ -178,6 +166,8 @@ export const Workbench = withStyles(styles)( status: item.status })); + const rootProjectUuid = this.props.authService.getUuid(); + const { classes, user } = this.props; return (
@@ -187,45 +177,16 @@ export const Workbench = withStyles(styles)( searchText={this.state.searchText} user={this.props.user} menuItems={this.state.menuItems} + buildInfo={this.props.buildInfo} {...this.mainAppBarActions} />
- {user && - -
- this.openContextMenu(event, { - uuid: this.props.authService.getUuid() || "", - name: "", - kind: ContextMenuKind.ROOT_PROJECT - })}> - this.props.dispatch(setProjectItem(itemId, ItemMode.OPEN))} - onContextMenu={(event, item) => this.openContextMenu(event, { - uuid: item.data.uuid, - name: item.data.name, - kind: ContextMenuKind.PROJECT - })} - toggleActive={itemId => { - this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE)); - this.props.dispatch(loadDetails(itemId, ResourceKind.PROJECT)); - this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS)); - }} /> - - } + {user && }
- - - + + +
{user && } @@ -234,9 +195,17 @@ export const Workbench = withStyles(styles)( - - + + + + + + + + + + ) => this.props.dispatch(loadCollection(collectionId, ResourceKind.COLLECTION))} - onContextMenu={(event, item) => { - this.openContextMenu(event, { - uuid: item.uuid, - name: item.name, - kind: ContextMenuKind.COLLECTION - }); - }} - {...props} /> - - renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))} - onContextMenu={(event, item) => { - - const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE; - this.openContextMenu(event, { - uuid: item.uuid, - name: item.name, - kind - }); - }} - onProjectCreationDialogOpen={this.handleProjectCreationDialogOpen} - onCollectionCreationDialogOpen={this.handleCollectionCreationDialogOpen} - onItemClick={item => { - this.props.dispatch(loadDetails(item.uuid, item.kind as ResourceKind)); - }} - onItemDoubleClick={item => { - switch (item.kind) { - case ResourceKind.COLLECTION: - this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind)); - this.props.dispatch(push(getCollectionUrl(item.uuid))); - default: - this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE)); - this.props.dispatch(loadDetails(item.uuid, item.kind as ResourceKind)); - } - - }} - {...props} /> - - renderFavoritePanel = (props: RouteComponentProps<{ id: string }>) => this.props.dispatch(favoritePanelActions.REQUEST_ITEMS())} - onContextMenu={(event, item) => { - const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE; - this.openContextMenu(event, { - uuid: item.uuid, - name: item.name, - kind, - }); - }} - onDialogOpen={this.handleProjectCreationDialogOpen} - onItemClick={item => { - this.props.dispatch(loadDetails(item.uuid, item.kind as ResourceKind)); - }} - onItemDoubleClick={item => { - switch (item.kind) { - case ResourceKind.COLLECTION: - this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind)); - this.props.dispatch(push(getCollectionUrl(item.uuid))); - default: - this.props.dispatch(loadDetails(item.uuid, ResourceKind.PROJECT)); - this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE)); - this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS)); - } - - }} - {...props} /> - mainAppBarActions: MainAppBarActionProps = { onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => { - this.props.dispatch(setProjectItem(itemId, ItemMode.BOTH)); - this.props.dispatch(loadDetails(itemId, ResourceKind.PROJECT)); + this.props.dispatch(navigateToResource(itemId)); }, onSearch: searchText => { this.setState({ searchText }); @@ -327,45 +227,14 @@ export const Workbench = withStyles(styles)( this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); }, onContextMenu: (event: React.MouseEvent, breadcrumb: NavBreadcrumb) => { - this.openContextMenu(event, { + this.props.dispatch(openContextMenu(event, { uuid: breadcrumb.itemId, name: breadcrumb.label, kind: ContextMenuKind.PROJECT - }); + })); } }; - 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)); - const panelItem = this.props.sidePanelItems.find(it => it.id === itemId); - if (panelItem && panelItem.activeAction) { - panelItem.activeAction(this.props.dispatch); - } - } - - handleProjectCreationDialogOpen = (itemUuid: string) => { - this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid })); - } - - handleCollectionCreationDialogOpen = (itemUuid: string) => { - this.props.dispatch(collectionCreateActions.OPEN_COLLECTION_CREATOR({ ownerUuid: itemUuid })); - } - - openContextMenu = (event: React.MouseEvent, resource: { name: string; uuid: string; kind: ContextMenuKind; }) => { - event.preventDefault(); - this.props.dispatch( - contextMenuActions.OPEN_CONTEXT_MENU({ - position: { x: event.clientX, y: event.clientY }, - resource - }) - ); - } - toggleCurrentTokenModal = () => { this.setState({ isCurrentTokenDialogOpen: !this.state.isCurrentTokenDialogOpen }); }