X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1534cfafa7025c358548d9910b603b94b5984912..e4de9a43cee1a8859cb2a42ea01723d632621ce4:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index cca374d6..78ec3c87 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'; @@ -48,6 +48,7 @@ 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'; @@ -90,6 +91,18 @@ 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'; +import { pluginConfig } from '~/plugins'; +import { ElementListReducer } from '~/common/plugintypes'; type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; @@ -121,7 +134,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,47 +151,62 @@ const getSplitterInitialSize = () => { 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))); + export const WorkbenchPanel = - withStyles(styles)(({ classes }: WorkbenchPanelProps) => - - - - + withStyles(styles)((props: WorkbenchPanelProps) => + + {props.sessionIdleTimeout > 0 && } + + + {props.isUserActive && props.isNotLinking && - - - - + } + + + {props.isNotLinking && } - + - - - - - - - - - - - - - - - - - - - - - - - - + {routes} + @@ -198,7 +232,7 @@ export const WorkbenchPanel = - + @@ -210,9 +244,11 @@ export const WorkbenchPanel = + + @@ -229,6 +265,7 @@ export const WorkbenchPanel = + @@ -236,5 +273,8 @@ export const WorkbenchPanel = + + + {React.createElement(React.Fragment, null, pluginConfig.dialogs)} );