X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/84e4588aed7bea1bcf5727ef2eea1a692b4e3bab..45ee419ff7952fc722a139666c327a321a92cc81:/src/views/main-panel/main-panel-root.tsx diff --git a/src/views/main-panel/main-panel-root.tsx b/src/views/main-panel/main-panel-root.tsx index 15149dced0..e7daaf0093 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,29 @@ export interface MainPanelRootDataProps { working: boolean; loading: boolean; buildInfo: string; + uuidPrefix: string; + isNotLinking: boolean; + isLinkingPath: boolean; + siteBanner: string; } 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 }: MainPanelRootProps) => + loading ? : <> - + buildInfo={buildInfo} + uuidPrefix={uuidPrefix} + siteBanner={siteBanner}> {working ? : null} - + } - {user ? : } + {user ? (user.isActive || (!user.isActive && isLinkingPath) ? : ) : } -); \ No newline at end of file +);