X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c133ed0f3634fe29b082a4501abd04f05f6221d5..60894bab3aaca17946060ecf2d3392452547c568:/src/models/user.ts diff --git a/src/models/user.ts b/src/models/user.ts index 87a97dfc..3f0bcf47 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -26,8 +26,18 @@ export interface User { isActive: boolean; } -export const getUserFullname = (user?: User) => { - return user ? `${user.firstName} ${user.lastName}` : ""; +export const getUserFullname = (user: User) => { + return user.firstName && user.lastName + ? `${user.firstName} ${user.lastName}` + : ""; +}; + +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 {