X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/dc95b803fa84b3c9ef7c11a4f81dd0d86077d779..d1c2611350e47527730f6d3b226b998abf15a607:/src/models/user.ts

diff --git a/src/models/user.ts b/src/models/user.ts
index b0f004c3..9b3d97d8 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -2,7 +2,17 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Resource, ResourceKind } from '~/models/resource';
+import { Resource, ResourceKind } from 'models/resource';
+
+export type UserPrefs = {
+    profile?: {
+        organization?: string,
+        organization_email?: string,
+        lab?: string,
+        website_url?: string,
+        role?: string
+    }
+};
 
 export interface User {
     email: string;
@@ -10,33 +20,32 @@ export interface User {
     lastName: string;
     uuid: string;
     ownerUuid: string;
+    username: string;
+    prefs: UserPrefs;
     isAdmin: boolean;
+    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, withUuid = false) => {
+    const displayName = getUserFullname(user) || user.email || user.username || user.uuid;
+    let parts: string[] = [displayName];
+    if (withEmail && user.email && displayName !== user.email) {
+        parts.push(`<${user.email}>`);
+    }
+    if (withUuid) {
+        parts.push(`(${user.uuid})`);
+    }
+    return parts.join(' ');
 };
 
-export interface UserResource extends Resource {
+export interface UserResource extends Resource, User {
     kind: ResourceKind.USER;
-    email: string;
-    username: string;
-    firstName: string;
-    lastName: string;
-    identityUrl: string;
-    isAdmin: boolean;
-    prefs: UserPrefs;
     defaultOwnerUuid: string;
-    isActive: boolean;
     writableBy: string[];
 }
-
-export interface UserPrefs {
-    profile: {
-        lab: string;
-        organization: string;
-        organizationEmail: string;
-        role: string;
-        websiteUrl: string;
-    };
-}
\ No newline at end of file