From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Fri, 22 Feb 2019 20:18:25 +0000 (-0500)
Subject: 14720: Show home cluster for federated users.
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c74d94dabd5f66bc948f9a9ed6283cdb59fb392b

14720: Show home cluster for federated users.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---

diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx
index c04d0045a2..16bb8c1347 100644
--- a/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@ -26,13 +26,15 @@ interface AccountMenuProps {
     currentRoute: string;
     workbenchURL: string;
     apiToken?: string;
+    localCluster: string;
 }
 
 const mapStateToProps = (state: RootState): AccountMenuProps => ({
     user: state.auth.user,
     currentRoute: state.router.location ? state.router.location.pathname : '',
     workbenchURL: state.config.workbenchUrl,
-    apiToken: state.auth.apiToken
+    apiToken: state.auth.apiToken,
+    localCluster: state.auth.localCluster
 });
 
 const wb1URL = (route: string) => {
@@ -56,7 +58,7 @@ const styles: StyleRulesCallback<CssRules> = () => ({
 
 export const AccountMenu = withStyles(styles)(
     connect(mapStateToProps)(
-        ({ user, dispatch, currentRoute, workbenchURL, apiToken, classes }: AccountMenuProps & DispatchProp<any> & WithStyles<CssRules>) =>
+        ({ user, dispatch, currentRoute, workbenchURL, apiToken, localCluster, classes }: AccountMenuProps & DispatchProp<any> & WithStyles<CssRules>) =>
             user
                 ? <DropdownMenu
                     icon={<UserPanelIcon />}
@@ -64,7 +66,7 @@ export const AccountMenu = withStyles(styles)(
                     title="Account Management"
                     key={currentRoute}>
                     <MenuItem disabled>
-                        {getUserFullname(user)}
+                        {getUserFullname(user)} {user.uuid.substr(0, 5) !== localCluster && `(${user.uuid.substr(0, 5)})`}
                     </MenuItem>
                     <MenuItem onClick={() => dispatch(openUserVirtualMachines())}>Virtual Machines</MenuItem>
                     {!user.isAdmin && <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>}