Merge branch '16602-wb2-acr-version' refs #16602

[arvados-workbench2.git] / src / models / user.ts

diff --git a/src/models/user.ts b/src/models/user.ts
index 1e9a026055b7b54364289a9521cdd3705cc81c9f..3f0bcf47fc082c89c65b04a4dad2420e4afb73d1 100644 (file)
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -32,8 +32,12 @@ export const getUserFullname = (user: User) => {
         : "";
 };
 
-export const getUserDisplayName = (user: User) => {
-    return getUserFullname(user) || user.email || user.username || user.uuid;
+export const getUserDisplayName = (user: User, withEmail = false) => {
+    const displayName = getUserFullname(user) || user.email || user.username || user.uuid;
+    if (withEmail && user.email && displayName !== user.email) {
+        return `${displayName} <<${user.email}>>`;
+    }
+    return displayName;
 };
 
 export interface UserResource extends Resource, User {