X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/31e84a9315728c2f58a26bf0e9e1d2b38326fb86..829d595bb4b9e7c0a8a1dd38995b4b5e197841f5:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 78ec3c87..a6c49e34 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -2,107 +2,103 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +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 { 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 { 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 { 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 { 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 } 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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'; type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; @@ -131,6 +127,9 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ 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', } }); @@ -158,7 +157,6 @@ let routes = <> - @@ -167,13 +165,13 @@ let routes = <> - + - - + + @@ -205,7 +203,7 @@ export const WorkbenchPanel = - {routes} + {routes.props.children} @@ -215,10 +213,8 @@ export const WorkbenchPanel = - - @@ -227,7 +223,6 @@ export const WorkbenchPanel = - @@ -245,12 +240,9 @@ export const WorkbenchPanel = - - - @@ -259,11 +251,12 @@ export const WorkbenchPanel = + + - @@ -271,7 +264,9 @@ export const WorkbenchPanel = - + + +