X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/75e65fcb253a488da1b3032a54c229cdafdbc9a2..f9dde5c781766b8be71d43d0f031c201a0edcfbb:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 1d7d47d0..90b2dad0 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -4,22 +4,16 @@ import * as React from 'react'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; -import { connect, DispatchProp } from "react-redux"; import { Route, Switch } from "react-router"; -import { User } from "~/models/user"; -import { RootState } from "~/store/store"; -import { MainAppBar } 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 { RichTextEditorDialog } from '~/views-components/rich-text-editor-dialog/rich-text-editor-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'; @@ -27,6 +21,7 @@ import { Routes } from '~/routes/routes'; import { SidePanel } from '~/views-components/side-panel/side-panel'; import { ProcessPanel } from '~/views/process-panel/process-panel'; import { ProcessLogPanel } from '~/views/process-log-panel/process-log-panel'; +import { ChangeWorkflowDialog } from '~/views-components/run-process-dialog/change-workflow-dialog'; 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'; @@ -39,20 +34,67 @@ import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project- import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog'; import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/files-upload-collection-dialog'; import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog'; -import { TrashPanel } from "~/views/trash-panel/trash-panel"; +import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog'; +import { RemoveProcessDialog } from '~/views-components/process-remove-dialog/process-remove-dialog'; import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar'; import { Grid } from '@material-ui/core'; -import { SharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel'; -import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog'; +import { TrashPanel } from "~/views/trash-panel/trash-panel"; +import { SharedWithMePanel } from '~/views/shared-with-me-panel/shared-with-me-panel'; +import { RunProcessPanel } from '~/views/run-process-panel/run-process-panel'; import SplitterLayout from 'react-splitter-layout'; +import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel'; +import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel'; +import { SshKeyPanel } from '~/views/ssh-key-panel/ssh-key-panel'; +import { SiteManagerPanel } from "~/views/site-manager-panel/site-manager-panel"; +import { MyAccountPanel } from '~/views/my-account-panel/my-account-panel'; +import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog'; +import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog'; +import { ProcessInputDialog } from '~/views-components/process-input-dialog/process-input-dialog'; +import { VirtualMachineUserPanel } from '~/views/virtual-machine-panel/virtual-machine-user-panel'; +import { VirtualMachineAdminPanel } from '~/views/virtual-machine-panel/virtual-machine-admin-panel'; +import { ProjectPropertiesDialog } from '~/views-components/project-properties-dialog/project-properties-dialog'; +import { RepositoriesPanel } from '~/views/repositories-panel/repositories-panel'; +import { KeepServicePanel } from '~/views/keep-service-panel/keep-service-panel'; +import { ComputeNodePanel } from '~/views/compute-node-panel/compute-node-panel'; +import { ApiClientAuthorizationPanel } from '~/views/api-client-authorization-panel/api-client-authorization-panel'; +import { LinkPanel } from '~/views/link-panel/link-panel'; +import { RepositoriesSampleGitDialog } from '~/views-components/repositories-sample-git-dialog/repositories-sample-git-dialog'; +import { RepositoryAttributesDialog } from '~/views-components/repository-attributes-dialog/repository-attributes-dialog'; +import { CreateRepositoryDialog } from '~/views-components/dialog-forms/create-repository-dialog'; +import { RemoveRepositoryDialog } from '~/views-components/repository-remove-dialog/repository-remove-dialog'; +import { CreateSshKeyDialog } from '~/views-components/dialog-forms/create-ssh-key-dialog'; +import { PublicKeyDialog } from '~/views-components/ssh-keys-dialog/public-key-dialog'; +import { RemoveApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/remove-dialog'; +import { RemoveComputeNodeDialog } from '~/views-components/compute-nodes-dialog/remove-dialog'; +import { RemoveKeepServiceDialog } from '~/views-components/keep-services-dialog/remove-dialog'; +import { RemoveLinkDialog } from '~/views-components/links-dialog/remove-dialog'; +import { RemoveSshKeyDialog } from '~/views-components/ssh-keys-dialog/remove-dialog'; +import { RemoveVirtualMachineDialog } from '~/views-components/virtual-machines-dialog/remove-dialog'; +import { AttributesApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/attributes-dialog'; +import { AttributesComputeNodeDialog } from '~/views-components/compute-nodes-dialog/attributes-dialog'; +import { AttributesKeepServiceDialog } from '~/views-components/keep-services-dialog/attributes-dialog'; +import { AttributesLinkDialog } from '~/views-components/links-dialog/attributes-dialog'; +import { AttributesSshKeyDialog } from '~/views-components/ssh-keys-dialog/attributes-dialog'; +import { VirtualMachineAttributesDialog } from '~/views-components/virtual-machines-dialog/attributes-dialog'; +import { UserPanel } from '~/views/user-panel/user-panel'; +import { UserAttributesDialog } from '~/views-components/user-dialog/attributes-dialog'; +import { CreateUserDialog } from '~/views-components/dialog-forms/create-user-dialog'; +import { HelpApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/help-dialog'; +import { GroupsPanel } from '~/views/groups-panel/groups-panel'; +import { CreateGroupDialog } from '~/views-components/dialog-forms/create-group-dialog'; +import { RemoveGroupDialog } from '~/views-components/groups-dialog/remove-dialog'; +import { GroupAttributesDialog } from '~/views-components/groups-dialog/attributes-dialog'; +import { GroupDetailsPanel } from '~/views/group-details-panel/group-details-panel'; +import { RemoveGroupMemberDialog } from '~/views-components/groups-dialog/member-remove-dialog'; +import { GroupMemberAttributesDialog } from '~/views-components/groups-dialog/member-attributes-dialog'; +import { AddGroupMembersDialog } from '~/views-components/dialog-forms/add-group-member-dialog'; -type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar'; +type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { - overflow: 'hidden', - width: '100vw', - height: '100vh' + paddingTop: theme.spacing.unit * 7, + background: theme.palette.background.default }, container: { position: 'relative' @@ -63,125 +105,132 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ } }, asidePanel: { - height: '100%', - background: theme.palette.background.default + paddingTop: theme.spacing.unit, + height: '100%' }, contentWrapper: { - background: theme.palette.background.default, - minWidth: 0, + paddingTop: theme.spacing.unit, + minWidth: 0 }, content: { minWidth: 0, paddingLeft: theme.spacing.unit * 3, paddingRight: theme.spacing.unit * 3, - }, - appBar: { - zIndex: 1, } }); -interface WorkbenchDataProps { - user?: User; - currentToken?: string; -} +type WorkbenchPanelProps = WithStyles; -interface WorkbenchGeneralProps { - authService: AuthService; - buildInfo: string; -} +const defaultSplitterSize = 90; -type WorkbenchProps = WorkbenchDataProps & WorkbenchGeneralProps & DispatchProp & WithStyles; +const getSplitterInitialSize = () => { + const splitterSize = localStorage.getItem('splitterSize'); + return splitterSize ? Number(splitterSize) : defaultSplitterSize; +}; -interface WorkbenchState { - searchText: string; -} +const saveSplitterSize = (size: number) => localStorage.setItem('splitterSize', size.toString()); -export const Workbench = withStyles(styles)( - connect( - (state: RootState) => ({ - user: state.auth.user, - currentToken: state.auth.apiToken, - }) - )( - class extends React.Component { - state = { - searchText: "", - }; - render() { - const { classes } = this.props; - return <> - - - +export const WorkbenchPanel = + withStyles(styles)(({ classes }: WorkbenchPanelProps) => + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - {this.props.user && - - - - - - - - - - - - - - - - - - - - - - - - - - - - - } - - - - - - - - - - - - - - - - - - - - - ; - } - - onSearch = (searchText: string) => { - this.setState({ searchText }); - this.props.dispatch(push(`/search?q=${searchText}`)); - } - - toggleDetailsPanel = () => { - this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); - } - - } - ) -); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + );