X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/fc1ebe112503a685dbbf4acb86dca25d1073b82c..ecd0b3c069eed7d411e3cec7d707b43ab6675081:/src/views/main-panel/main-panel-root.tsx?ds=sidebyside diff --git a/src/views/main-panel/main-panel-root.tsx b/src/views/main-panel/main-panel-root.tsx index 15149dce..acaa43ad 100644 --- a/src/views/main-panel/main-panel-root.tsx +++ b/src/views/main-panel/main-panel-root.tsx @@ -8,6 +8,7 @@ import { User } from "~/models/user"; import { ArvadosTheme } from '~/common/custom-theme'; import { WorkbenchPanel } from '~/views/workbench/workbench'; import { LoginPanel } from '~/views/login-panel/login-panel'; +import { InactivePanel } from '~/views/inactive-panel/inactive-panel'; import { WorkbenchLoadingScreen } from '~/views/workbench/workbench-loading-screen'; import { MainAppBar } from '~/views-components/main-app-bar/main-app-bar'; @@ -26,22 +27,36 @@ export interface MainPanelRootDataProps { working: boolean; loading: boolean; buildInfo: string; + uuidPrefix: string; + isNotLinking: boolean; + isLinkingPath: boolean; + siteBanner: string; + sessionIdleTimeout: number; } type MainPanelRootProps = MainPanelRootDataProps & WithStyles; export const MainPanelRoot = withStyles(styles)( - ({ classes, loading, working, user, buildInfo }: MainPanelRootProps) => - loading + ({ classes, loading, working, user, buildInfo, uuidPrefix, + isNotLinking, isLinkingPath, siteBanner, sessionIdleTimeout }: MainPanelRootProps) => + loading ? : <> - - {working ? : null} - + buildInfo={buildInfo} + uuidPrefix={uuidPrefix} + siteBanner={siteBanner}> + {working + ? + : null} + } - {user ? : } + {user + ? (user.isActive || (!user.isActive && isLinkingPath) + ? + : ) + : } -); \ No newline at end of file +);