19049: Clean up participant select display, show UUIDs

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

diff --git a/src/models/user.ts b/src/models/user.ts
index eed135a21cf816133dc14deb4a656cce21953553..9b3d97d8486337befae509d35761d93cf1edf6be 100644 (file)
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Resource, ResourceKind } from '~/models/resource';
+import { Resource, ResourceKind } from 'models/resource';
 
-export type userPrefs = {
+export type UserPrefs = {
     profile?: {
         organization?: string,
         organization_email?: string,
@@ -20,24 +20,32 @@ export interface User {
     lastName: string;
     uuid: string;
     ownerUuid: string;
-    identityUrl: string;
-    prefs: userPrefs;
+    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: string;
     defaultOwnerUuid: string;
-    isActive: boolean;
     writableBy: string[];
-}
\ No newline at end of file
+}