projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' into 19069-workflow-launching
[arvados-workbench2.git]
/
src
/
models
/
user.ts
diff --git
a/src/models/user.ts
b/src/models/user.ts
index 2857bce6bf14d2f71ad5d5f21bc0dacb9af9e2ad..9b3d97d8486337befae509d35761d93cf1edf6be 100644
(file)
--- a/
src/models/user.ts
+++ b/
src/models/user.ts
@@
-32,12
+32,16
@@
export const getUserFullname = (user: User) => {
: "";
};
: "";
};
-export const getUserDisplayName = (user: User, withEmail = false) => {
+export const getUserDisplayName = (user: User, withEmail = false
, withUuid = false
) => {
const displayName = getUserFullname(user) || user.email || user.username || user.uuid;
const displayName = getUserFullname(user) || user.email || user.username || user.uuid;
+ let parts: string[] = [displayName];
if (withEmail && user.email && displayName !== user.email) {
if (withEmail && user.email && displayName !== user.email) {
-
return `${displayName} <<${user.email}>>`
;
+
parts.push(`<${user.email}>`)
;
}
}
- return displayName;
+ if (withUuid) {
+ parts.push(`(${user.uuid})`);
+ }
+ return parts.join(' ');
};
export interface UserResource extends Resource, User {
};
export interface UserResource extends Resource, User {