X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/4afdbe4d6f060423725d77fa7500d76d8e7e5f04..5385afcada8666051658c6889c83848702497759:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 62c10f24..9c2a7df8 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -10,7 +10,7 @@ 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 { 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'; @@ -45,16 +45,20 @@ 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 { VirtualMachinePanel } from '~/views/virtual-machine-panel/virtual-machine-panel'; +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'; @@ -64,21 +68,39 @@ import { PublicKeyDialog } from '~/views-components/ssh-keys-dialog/public-key-d 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'; type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; @@ -110,7 +132,13 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ } }); -type WorkbenchPanelProps = WithStyles; +interface WorkbenchDataProps { + isUserActive: boolean; + isNotLinking: boolean; + sessionIdleTimeout: number; +} + +type WorkbenchPanelProps = WithStyles & WorkbenchDataProps; const defaultSplitterSize = 90; @@ -122,25 +150,27 @@ const getSplitterInitialSize = () => { const saveSplitterSize = (size: number) => localStorage.setItem('splitterSize', size.toString()); export const WorkbenchPanel = - withStyles(styles)(({ classes }: WorkbenchPanelProps) => - - - - + withStyles(styles)((props: WorkbenchPanelProps) => + + {props.sessionIdleTimeout > 0 && } + + + {props.isUserActive && props.isNotLinking && - - - - + } + + + {props.isNotLinking && } - + + @@ -148,15 +178,24 @@ export const WorkbenchPanel = - + + - + + + + + + + + + @@ -165,10 +204,12 @@ export const WorkbenchPanel = + + @@ -180,10 +221,11 @@ export const WorkbenchPanel = - + + @@ -191,13 +233,17 @@ export const WorkbenchPanel = + + + + @@ -206,12 +252,17 @@ export const WorkbenchPanel = + + + + + - ); \ No newline at end of file + );