X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1514f6a2ae8103f75f08034299115ad751d8a785..3c7e3cdc547ad5468421e1c049daa94b0d4b8bc0:/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 15149dce..5853acb0 100644 --- a/src/views/main-panel/main-panel-root.tsx +++ b/src/views/main-panel/main-panel-root.tsx @@ -2,14 +2,15 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +import React from 'react'; import { StyleRulesCallback, WithStyles, withStyles, Grid, LinearProgress } from '@material-ui/core'; -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 { WorkbenchLoadingScreen } from '~/views/workbench/workbench-loading-screen'; -import { MainAppBar } from '~/views-components/main-app-bar/main-app-bar'; +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'; type CssRules = 'root'; @@ -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 +);