[ARVADOS-WORKBENCH2] updated: 1.3.1-364-gc74d94da

[Git user]

Summary of changes:
 src/views-components/main-app-bar/account-menu.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

       via  c74d94dabd5f66bc948f9a9ed6283cdb59fb392b (commit)
      from  7335a6a0b9a54bfacc94f2d8c9e57827fc77553f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c74d94dabd5f66bc948f9a9ed6283cdb59fb392b
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Feb 22 15:18:25 2019 -0500

    14720: Show home cluster for federated users.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at 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 c04d0045..16bb8c13 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>}

-----------------------------------------------------------------------


hooks/post-receive
--