18975: Adds 'Main logs' filter selection. Fixes filter dynamic population.

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

diff --git a/src/models/user.ts b/src/models/user.ts
index 1e9a026055b7b54364289a9521cdd3705cc81c9f..9b3d97d8486337befae509d35761d93cf1edf6be 100644 (file)
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Resource, ResourceKind } from '~/models/resource';
+import { Resource, ResourceKind } from 'models/resource';
 
 export type UserPrefs = {
     profile?: {
@@ -32,8 +32,16 @@ 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, 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, User {