19049: Clean up participant select display, show UUIDs

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

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 {

diff --git a/src/store/virtual-machines/virtual-machines-actions.ts b/src/store/virtual-machines/virtual-machines-actions.ts
index 7034b4a570f1ad1c135f6fc00bfdc6868b5190b0..35cf8d53b7f459cc1e207bbbc862e7c539f6cc14 100644 (file)
--- a/src/store/virtual-machines/virtual-machines-actions.ts
+++ b/src/store/virtual-machines/virtual-machines-actions.ts
@@ -125,7 +125,7 @@ export const openEditVirtualMachineLoginDialog = (permissionUuid: string) =>
         const user = await services.userService.get(login.tailUuid);
         dispatch(initialize(VIRTUAL_MACHINE_ADD_LOGIN_FORM, {
                 [VIRTUAL_MACHINE_UPDATE_LOGIN_UUID_FIELD]: permissionUuid,
         const user = await services.userService.get(login.tailUuid);
         dispatch(initialize(VIRTUAL_MACHINE_ADD_LOGIN_FORM, {
                 [VIRTUAL_MACHINE_UPDATE_LOGIN_UUID_FIELD]: permissionUuid,

-                [VIRTUAL_MACHINE_ADD_LOGIN_USER_FIELD]: {name: getUserDisplayName(user, true), uuid: login.tailUuid},
+                [VIRTUAL_MACHINE_ADD_LOGIN_USER_FIELD]: {name: getUserDisplayName(user, true, true), uuid: login.tailUuid},

                 [VIRTUAL_MACHINE_ADD_LOGIN_GROUPS_FIELD]: login.properties.groups,
             }));
         dispatch(dialogActions.OPEN_DIALOG( {id: VIRTUAL_MACHINE_ADD_LOGIN_DIALOG, data: {updating: true}} ));
                 [VIRTUAL_MACHINE_ADD_LOGIN_GROUPS_FIELD]: login.properties.groups,
             }));
         dispatch(dialogActions.OPEN_DIALOG( {id: VIRTUAL_MACHINE_ADD_LOGIN_DIALOG, data: {updating: true}} ));

diff --git a/src/views-components/sharing-dialog/participant-select.tsx b/src/views-components/sharing-dialog/participant-select.tsx
index 402faa7f9414d935c64ccc3ec677c98f5db8a00f..c7b540cd3104bde323c0ab36fff544751b787a1b 100644 (file)
--- a/src/views-components/sharing-dialog/participant-select.tsx
+++ b/src/views-components/sharing-dialog/participant-select.tsx
@@ -43,9 +43,9 @@ interface ParticipantSelectState {
 const getDisplayName = (item: GroupResource | UserResource) => {
     switch (item.kind) {
         case ResourceKind.USER:
 const getDisplayName = (item: GroupResource | UserResource) => {
     switch (item.kind) {
         case ResourceKind.USER:

-            return getUserDisplayName(item, true);
+            return getUserDisplayName(item, true, true);

         case ResourceKind.GROUP:
         case ResourceKind.GROUP:

-            return item.name;
+            return item.name + `(${`(${(item as Resource).uuid})`})`;

         default:
             return (item as Resource).uuid;
     }
         default:
             return (item as Resource).uuid;
     }