X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/cbf153e45314bddf4458a5f8fc02462edc0d0595..ed5eba6574a98f8acfe4f1fc0c063b9347b656c1:/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 5806f5b8..5853acb0 100644 --- a/src/views/main-panel/main-panel-root.tsx +++ b/src/views/main-panel/main-panel-root.tsx @@ -2,15 +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 { 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'; +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'; @@ -31,13 +31,14 @@ export interface MainPanelRootDataProps { isNotLinking: boolean; isLinkingPath: boolean; siteBanner: string; + sessionIdleTimeout: number; } type MainPanelRootProps = MainPanelRootDataProps & WithStyles; export const MainPanelRoot = withStyles(styles)( ({ classes, loading, working, user, buildInfo, uuidPrefix, - isNotLinking, isLinkingPath, siteBanner }: MainPanelRootProps) => + isNotLinking, isLinkingPath, siteBanner, sessionIdleTimeout }: MainPanelRootProps) => loading ? : <> @@ -47,13 +48,13 @@ export const MainPanelRoot = withStyles(styles)( uuidPrefix={uuidPrefix} siteBanner={siteBanner}> {working - ? + ? : null} } {user ? (user.isActive || (!user.isActive && isLinkingPath) - ? + ? : ) : }