X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/950ea822015652a479f236fff9ea8271b60f1ee9..05010c44073b52c0e414d180cfc21bae215c4d33:/src/views-components/main-app-bar/main-app-bar.tsx
diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx
index 7bec7b24..442b9034 100644
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@ -2,19 +2,19 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import * as React from "react";
+import React from "react";
import { AppBar, Toolbar, Typography, Grid } from "@material-ui/core";
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
import { Link } from "react-router-dom";
-import { User } from "~/models/user";
-import { SearchBar } from "~/views-components/search-bar/search-bar";
-import { Routes } from '~/routes/routes';
-import { NotificationsMenu } from "~/views-components/main-app-bar/notifications-menu";
-import { AccountMenu } from "~/views-components/main-app-bar/account-menu";
-import { HelpMenu } from '~/views-components/main-app-bar/help-menu';
+import { User } from "models/user";
+import { SearchBar } from "views-components/search-bar/search-bar";
+import { Routes } from 'routes/routes';
+import { NotificationsMenu } from "views-components/main-app-bar/notifications-menu";
+import { AccountMenu } from "views-components/main-app-bar/account-menu";
+import { HelpMenu } from 'views-components/main-app-bar/help-menu';
import { ReactNode } from "react";
-import { AdminMenu } from "~/views-components/main-app-bar/admin-menu";
-import { pluginConfig } from '~/plugins';
+import { AdminMenu } from "views-components/main-app-bar/admin-menu";
+import { pluginConfig } from 'plugins';
type CssRules = 'toolbar' | 'link';
@@ -47,7 +47,7 @@ export const MainAppBar = withStyles(styles)(
({props.uuidPrefix})
-
+
{props.buildInfo}
}
@@ -65,14 +65,17 @@ export const MainAppBar = withStyles(styles)(
alignItems="center"
justify="flex-end"
wrap="nowrap">
- {pluginConfig.appBarRight ||
- (props.user ? <>
-
-
- {props.user.isAdmin && }
-
- > :
- )}
+ {props.user ? <>
+
+
+ {pluginConfig.appBarRight ||
+ <>
+ {props.user.isAdmin && }
+
+ >}
+ > :
+ pluginConfig.appBarRight ||
+ }