X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/fd49462a5a09e107b7bb5c0ef8635db328b399b8..261201611113224f4a61b3979f6cd9992c4aa6c6:/src/store/advanced-tab/advanced-tab.tsx?ds=sidebyside diff --git a/src/store/advanced-tab/advanced-tab.tsx b/src/store/advanced-tab/advanced-tab.tsx index 0f8bf3cb..33faebbe 100644 --- a/src/store/advanced-tab/advanced-tab.tsx +++ b/src/store/advanced-tab/advanced-tab.tsx @@ -18,7 +18,7 @@ import { ListResults } from 'services/common-service/common-service'; import { RepositoryResource } from 'models/repositories'; import { SshKeyResource } from 'models/ssh-key'; import { VirtualMachinesResource } from 'models/virtual-machines'; -import { UserResource } from 'models/user'; +import { UserResource, getUserDisplayName } from 'models/user'; import { LinkResource } from 'models/link'; import { KeepServiceResource } from 'models/keep-services'; import { ApiClientAuthorization } from 'models/api-client-authorization'; @@ -280,7 +280,21 @@ const getDataForAdvancedTab = (uuid: string) => .addEqual('head_uuid', uuid) .getFilters() }); - const user = metadata.itemsAvailable && await services.userService.get(metadata.items[0].tailUuid || ''); + let user; + + if (metadata.itemsAvailable) { + metadata.items.forEach(async (item) => { + const {tailKind, tailUuid, properties} = item; + properties['tail'] = tailUuid; + try { + if (tailKind === ResourceKind.USER && tailUuid) { + user = await services.userService.get(tailUuid); + properties['tail'] = getUserDisplayName(user); + } + } catch {}; + }); + } + return { data, metadata, user }; }; @@ -411,7 +425,7 @@ const containerRequestApiResponse = (apiResponse: ContainerRequestResource) => { const collectionApiResponse = (apiResponse: CollectionResource) => { const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, description, properties, portableDataHash, replicationDesired, - replicationConfirmedAt, replicationConfirmed, manifestText, deleteAt, trashAt, isTrashed, storageClassesDesired, + replicationConfirmedAt, replicationConfirmed, deleteAt, trashAt, isTrashed, storageClassesDesired, storageClassesConfirmed, storageClassesConfirmedAt, currentVersionUuid, version, preserveVersion, fileCount, fileSizeTotal } = apiResponse; const response = ` "uuid": "${uuid}", @@ -424,7 +438,6 @@ const collectionApiResponse = (apiResponse: CollectionResource) => { "replication_desired": ${stringify(replicationDesired)}, "replication_confirmed_at": ${stringify(replicationConfirmedAt)}, "replication_confirmed": ${stringify(replicationConfirmed)}, -"manifest_text": ${stringify(manifestText)}, "name": ${stringify(name)}, "description": ${stringify(description)}, "properties": ${stringifyObject(properties)},