projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16679-token-security-enhancements'
[arvados-workbench2.git]
/
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 15149dced0c5c7b07dc4ef6088b54170aab8a5ac..acaa43ad2b8b67741ae6babf238d65f38cf832fa 100644
(file)
--- 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 { 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 { 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;
working: boolean;
loading: boolean;
buildInfo: string;
+ uuidPrefix: string;
+ isNotLinking: boolean;
+ isLinkingPath: boolean;
+ siteBanner: string;
+ sessionIdleTimeout: number;
}
type MainPanelRootProps = MainPanelRootDataProps & WithStyles<CssRules>;
export const MainPanelRoot = withStyles(styles)(
}
type MainPanelRootProps = MainPanelRootDataProps & WithStyles<CssRules>;
export const MainPanelRoot = withStyles(styles)(
- ({ classes, loading, working, user, buildInfo }: MainPanelRootProps) =>
- loading
+ ({ classes, loading, working, user, buildInfo, uuidPrefix,
+ isNotLinking, isLinkingPath, siteBanner, sessionIdleTimeout }: MainPanelRootProps) =>
+ loading
? <WorkbenchLoadingScreen />
: <>
? <WorkbenchLoadingScreen />
: <>
- <MainAppBar
+
{isNotLinking &&
<MainAppBar
user={user}
user={user}
- buildInfo={buildInfo}>
- {working ? <LinearProgress color="secondary" /> : null}
- </MainAppBar>
+ buildInfo={buildInfo}
+ uuidPrefix={uuidPrefix}
+ siteBanner={siteBanner}>
+ {working
+ ? <LinearProgress color="secondary" />
+ : null}
+ </MainAppBar>}
<Grid container direction="column" className={classes.root}>
<Grid container direction="column" className={classes.root}>
- {user ? <WorkbenchPanel /> : <LoginPanel />}
+ {user
+ ? (user.isActive || (!user.isActive && isLinkingPath)
+ ? <WorkbenchPanel isNotLinking={isNotLinking} isUserActive={user.isActive} sessionIdleTimeout={sessionIdleTimeout} />
+ : <InactivePanel />)
+ : <LoginPanel />}
</Grid>
</>
</Grid>
</>
-);
\ No newline at end of file
+);