X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/6faff5910b3e7bdaf47ab5ede7cf8094a1b4adb9..a353970c1fcfc61ebac8b3587f4b16b6c25b62e1:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 6c7c2438..f5cfda89 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -45,8 +45,10 @@ 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'; @@ -89,6 +91,16 @@ import { GroupDetailsPanel } from '~/views/group-details-panel/group-details-pan 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'; @@ -120,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; @@ -132,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 && } - + + @@ -163,6 +183,7 @@ export const WorkbenchPanel = + @@ -171,6 +192,10 @@ export const WorkbenchPanel = + + + + @@ -208,9 +233,11 @@ export const WorkbenchPanel = + + @@ -227,6 +254,7 @@ export const WorkbenchPanel = + @@ -234,5 +262,7 @@ export const WorkbenchPanel = + + - ); \ No newline at end of file + );