projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 15067-tag-editing-by-ids
[arvados.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 43bc7fbc158ba6c891ff3d87b60dd0f8d5deca74..e7daaf00932f0a0c8080946b22f340e2114870f9 100644
(file)
--- a/
src/views/main-panel/main-panel-root.tsx
+++ b/
src/views/main-panel/main-panel-root.tsx
@@
-11,7
+11,6
@@
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 { 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 { LinkAccountPanel } from '~/views/link-account-panel/link-account-panel';
type CssRules = 'root';
type CssRules = 'root';
@@
-31,23
+30,26
@@
export interface MainPanelRootDataProps {
uuidPrefix: string;
isNotLinking: boolean;
isLinkingPath: boolean;
uuidPrefix: string;
isNotLinking: boolean;
isLinkingPath: boolean;
+ siteBanner: string;
}
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, uuidPrefix, isNotLinking, isLinkingPath }: MainPanelRootProps) =>
+ ({ classes, loading, working, user, buildInfo, uuidPrefix,
+ isNotLinking, isLinkingPath, siteBanner }: MainPanelRootProps) =>
loading
? <WorkbenchLoadingScreen />
: <>
loading
? <WorkbenchLoadingScreen />
: <>
-
{
isNotLinking && <MainAppBar
+
{
isNotLinking && <MainAppBar
user={user}
buildInfo={buildInfo}
user={user}
buildInfo={buildInfo}
- uuidPrefix={uuidPrefix}>
+ uuidPrefix={uuidPrefix}
+ siteBanner={siteBanner}>
{working ? <LinearProgress color="secondary" /> : null}
{working ? <LinearProgress color="secondary" /> : null}
-
</MainAppBar>
}
+
</MainAppBar>
}
<Grid container direction="column" className={classes.root}>
<Grid container direction="column" className={classes.root}>
- {
user ? (user.isActive || (!user.isActive && isLinkingPath) ? <WorkbenchPanel isNotLinking={isNotLinking} isUserActive={user.isActive} /> : <InactivePanel />) : <LoginPanel />
}
+ {
user ? (user.isActive || (!user.isActive && isLinkingPath) ? <WorkbenchPanel isNotLinking={isNotLinking} isUserActive={user.isActive} /> : <InactivePanel />) : <LoginPanel />
}
</Grid>
</>
);
</Grid>
</>
);