X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/df6ddb0c91aaed31cd242b5250835fce4308ef9f..9fe1e9ff7d9af167f0ee350ab5a68ded128d8043:/src/views/workbench/workbench.tsx?ds=sidebyside diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index f5cfda89..4a2cd700 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -2,140 +2,153 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; +import React from "react"; +import { StyleRulesCallback, WithStyles, withStyles } from "@material-ui/core/styles"; import { Route, Switch } from "react-router"; -import { ProjectPanel } from "~/views/project-panel/project-panel"; -import { DetailsPanel } from '~/views-components/details-panel/details-panel'; -import { ArvadosTheme } from '~/common/custom-theme'; -import { ContextMenu } from "~/views-components/context-menu/context-menu"; +import { ProjectPanel } from "views/project-panel/project-panel"; +import { DetailsPanel } from "views-components/details-panel/details-panel"; +import { ArvadosTheme } from "common/custom-theme"; +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 { 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 { 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'; -import { CopyProcessDialog } from '~/views-components/dialog-forms/copy-process-dialog'; -import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog'; -import { UpdateProcessDialog } from '~/views-components/dialog-forms/update-process-dialog'; -import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog'; -import { MoveProcessDialog } from '~/views-components/dialog-forms/move-process-dialog'; -import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog'; -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 { 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 { 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 { NotFoundDialog } from '~/views-components/not-found-dialog/not-found-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 { UserManageDialog } from '~/views-components/user-dialog/manage-dialog'; -import { SetupShellAccountDialog } from '~/views-components/dialog-forms/setup-shell-account-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'; -import { PartialCopyToCollectionDialog } from '~/views-components/dialog-forms/partial-copy-to-collection-dialog'; -import { PublicFavoritePanel } from '~/views/public-favorites-panel/public-favorites-panel'; -import { LinkAccountPanel } from '~/views/link-account-panel/link-account-panel'; -import { FedLogin } from './fed-login'; -import { CollectionsContentAddressPanel } from '~/views/collection-content-address-panel/collection-content-address-panel'; -import { AllProcessesPanel } from '../all-processes-panel/all-processes-panel'; -import { NotFoundPanel } from '../not-found-panel/not-found-panel'; -import { AutoLogout } from '~/views-components/auto-logout/auto-logout'; -import { RestoreCollectionVersionDialog } from '~/views-components/collections-dialog/restore-version-dialog'; -import { WebDavS3InfoDialog } from '~/views-components/webdav-s3-dialog/webdav-s3-dialog'; +import { TokenDialog } from "views-components/token-dialog/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 { 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 { Routes } from "routes/routes"; +import { SidePanel } from "views-components/side-panel/side-panel"; +import { ProcessPanel } from "views/process-panel/process-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, CopyMultiCollectionDialog } from "views-components/dialog-forms/copy-collection-dialog"; +import { CopyProcessDialog } from "views-components/dialog-forms/copy-process-dialog"; +import { UpdateCollectionDialog } from "views-components/dialog-forms/update-collection-dialog"; +import { UpdateProcessDialog } from "views-components/dialog-forms/update-process-dialog"; +import { UpdateProjectDialog } from "views-components/dialog-forms/update-project-dialog"; +import { MoveProcessDialog } from "views-components/dialog-forms/move-process-dialog"; +import { MoveProjectDialog } from "views-components/dialog-forms/move-project-dialog"; +import { MoveCollectionDialog } from "views-components/dialog-forms/move-collection-dialog"; +import { FilesUploadCollectionDialog } from "views-components/dialog-forms/files-upload-collection-dialog"; +import { PartialCopyToNewCollectionDialog } from "views-components/dialog-forms/partial-copy-to-new-collection-dialog"; +import { PartialCopyToExistingCollectionDialog } from "views-components/dialog-forms/partial-copy-to-existing-collection-dialog"; +import { PartialCopyToSeparateCollectionsDialog } from "views-components/dialog-forms/partial-copy-to-separate-collections-dialog"; +import { PartialMoveToNewCollectionDialog } from "views-components/dialog-forms/partial-move-to-new-collection-dialog"; +import { PartialMoveToExistingCollectionDialog } from "views-components/dialog-forms/partial-move-to-existing-collection-dialog"; +import { PartialMoveToSeparateCollectionsDialog } from "views-components/dialog-forms/partial-move-to-separate-collections-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 { 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 { RegisteredWorkflowPanel } from "views/workflow-panel/registered-workflow-panel"; +import { SearchResultsPanel } from "views/search-results-panel/search-results-panel"; +import { SshKeyPanel } from "views/ssh-key-panel/ssh-key-panel"; +import { SshKeyAdminPanel } from "views/ssh-key-panel/ssh-key-admin-panel"; +import { SiteManagerPanel } from "views/site-manager-panel/site-manager-panel"; +import { UserProfilePanel } from "views/user-profile-panel/user-profile-panel"; +import { SharingDialog } from "views-components/sharing-dialog/sharing-dialog"; +import { NotFoundDialog } from "views-components/not-found-dialog/not-found-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 { RepositoriesPanel } from "views/repositories-panel/repositories-panel"; +import { KeepServicePanel } from "views/keep-service-panel/keep-service-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 { 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 { VirtualMachineAttributesDialog } from "views-components/virtual-machines-dialog/attributes-dialog"; +import { RemoveVirtualMachineDialog } from "views-components/virtual-machines-dialog/remove-dialog"; +import { RemoveVirtualMachineLoginDialog } from "views-components/virtual-machines-dialog/remove-login-dialog"; +import { VirtualMachineAddLoginDialog } from "views-components/virtual-machines-dialog/add-login-dialog"; +import { AttributesApiClientAuthorizationDialog } from "views-components/api-client-authorizations-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 { 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 { DeactivateDialog } from "views-components/user-dialog/deactivate-dialog"; +import { ActivateDialog } from "views-components/user-dialog/activate-dialog"; +import { SetupDialog } from "views-components/user-dialog/setup-dialog"; +import { GroupsPanel } from "views/groups-panel/groups-panel"; +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 { PublicFavoritePanel } from "views/public-favorites-panel/public-favorites-panel"; +import { LinkAccountPanel } from "views/link-account-panel/link-account-panel"; +import { FedLogin } from "./fed-login"; +import { CollectionsContentAddressPanel } from "views/collection-content-address-panel/collection-content-address-panel"; +import { AllProcessesPanel } from "../all-processes-panel/all-processes-panel"; +import { NotFoundPanel } from "../not-found-panel/not-found-panel"; +import { AutoLogout } from "views-components/auto-logout/auto-logout"; +import { RestoreCollectionVersionDialog } from "views-components/collections-dialog/restore-version-dialog"; +import { WebDavS3InfoDialog } from "views-components/webdav-s3-dialog/webdav-s3-dialog"; +import { pluginConfig } from "plugins"; +import { ElementListReducer } from "common/plugintypes"; +import { COLLAPSE_ICON_SIZE } from "views-components/side-panel-toggle/side-panel-toggle"; +import { Banner } from "views-components/baner/banner"; -type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; +type CssRules = "root" | "container" | "splitter" | "asidePanel" | "contentWrapper" | "content"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { paddingTop: theme.spacing.unit * 7, - background: theme.palette.background.default + background: theme.palette.background.default, }, container: { - position: 'relative' + position: "relative", }, splitter: { - '& > .layout-splitter': { - width: '2px' - } + "& > .layout-splitter": { + width: "3px", + }, + "& > .layout-splitter-disabled": { + pointerEvents: "none", + cursor: "pointer", + }, }, asidePanel: { paddingTop: theme.spacing.unit, - height: '100%' + height: "100%", }, contentWrapper: { paddingTop: theme.spacing.unit, - minWidth: 0 + minWidth: 0, }, content: { minWidth: 0, paddingLeft: theme.spacing.unit * 3, paddingRight: theme.spacing.unit * 3, - } + // Reserve vertical space for app bar + MainContentBar + minHeight: `calc(100vh - ${theme.spacing.unit * 16}px)`, + display: "flex", + }, }); interface WorkbenchDataProps { isUserActive: boolean; isNotLinking: boolean; sessionIdleTimeout: number; + sidePanelIsCollapsed: boolean; } type WorkbenchPanelProps = WithStyles & WorkbenchDataProps; @@ -143,59 +156,213 @@ type WorkbenchPanelProps = WithStyles & WorkbenchDataProps; const defaultSplitterSize = 90; const getSplitterInitialSize = () => { - const splitterSize = localStorage.getItem('splitterSize'); + const splitterSize = localStorage.getItem("splitterSize"); return splitterSize ? Number(splitterSize) : defaultSplitterSize; }; -const saveSplitterSize = (size: number) => localStorage.setItem('splitterSize', size.toString()); +const saveSplitterSize = (size: number) => localStorage.setItem("splitterSize", size.toString()); + +let routes = ( + <> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +); + +const reduceRoutesFn: (a: React.ReactElement[], b: ElementListReducer) => React.ReactElement[] = (a, b) => b(a); + +routes = React.createElement( + React.Fragment, + null, + pluginConfig.centerPanelList.reduce(reduceRoutesFn, React.Children.toArray(routes.props.children)) +); + +const applyCollapsedState = isCollapsed => { + const rightPanel: Element = document.getElementsByClassName("layout-pane")[1]; + const totalWidth: number = document.getElementsByClassName("splitter-layout")[0]?.clientWidth; + const rightPanelExpandedWidth = (totalWidth - COLLAPSE_ICON_SIZE) / (totalWidth / 100); + if (rightPanel) { + rightPanel.setAttribute("style", `width: ${isCollapsed ? `calc(${rightPanelExpandedWidth}% - 1rem)` : `${getSplitterInitialSize()}%`}`); + } + const splitter = document.getElementsByClassName("layout-splitter")[0]; + isCollapsed ? splitter?.classList.add("layout-splitter-disabled") : splitter?.classList.remove("layout-splitter-disabled"); +}; + +export const WorkbenchPanel = withStyles(styles)((props: WorkbenchPanelProps) => { + //panel size will not scale automatically on window resize, so we do it manually + window.addEventListener("resize", () => applyCollapsedState(props.sidePanelIsCollapsed)); + applyCollapsedState(props.sidePanelIsCollapsed); -export const WorkbenchPanel = - withStyles(styles)((props: WorkbenchPanelProps) => - + return ( + {props.sessionIdleTimeout > 0 && } - - - {props.isUserActive && props.isNotLinking && - - } - - + + + {props.isUserActive && props.isNotLinking && ( + + + + )} + + {props.isNotLinking && } - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {routes.props.children} + @@ -204,24 +371,22 @@ export const WorkbenchPanel = - - + - - + @@ -232,14 +397,15 @@ export const WorkbenchPanel = - - - + + + + + + - - @@ -248,11 +414,12 @@ export const WorkbenchPanel = + + - @@ -260,9 +427,14 @@ export const WorkbenchPanel = - + + + + + {React.createElement(React.Fragment, null, pluginConfig.dialogs)} ); +});