X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ec2ce1a965e15cb272737251b56bca2c1529ebff..25216cc7acedc987c26a159f0b640210c0ef101e:/src/store/advanced-tab/advanced-tab.tsx diff --git a/src/store/advanced-tab/advanced-tab.tsx b/src/store/advanced-tab/advanced-tab.tsx index b1f0f983..dd318bd5 100644 --- a/src/store/advanced-tab/advanced-tab.tsx +++ b/src/store/advanced-tab/advanced-tab.tsx @@ -3,26 +3,26 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from 'redux'; -import { dialogActions } from '~/store/dialog/dialog-actions'; -import { RootState } from '~/store/store'; -import { ResourceKind, extractUuidKind } from '~/models/resource'; -import { getResource } from '~/store/resources/resources'; -import { GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; -import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -import { ContainerRequestResource } from '~/models/container-request'; -import { CollectionResource } from '~/models/collection'; -import { ProjectResource } from '~/models/project'; -import { ServiceRepository } from '~/services/services'; -import { FilterBuilder } from '~/services/api/filter-builder'; -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 { LinkResource } from '~/models/link'; -import { KeepServiceResource } from '~/models/keep-services'; -import { NodeResource } from '~/models/node'; -import { ApiClientAuthorization } from '~/models/api-client-authorization'; +import { dialogActions } from 'store/dialog/dialog-actions'; +import { RootState } from 'store/store'; +import { ResourceKind, extractUuidKind } from 'models/resource'; +import { getResource } from 'store/resources/resources'; +import { GroupContentsResourcePrefix } from 'services/groups-service/groups-service'; +import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; +import { ContainerRequestResource } from 'models/container-request'; +import { CollectionResource } from 'models/collection'; +import { ProjectResource } from 'models/project'; +import { ServiceRepository } from 'services/services'; +import { FilterBuilder } from 'services/api/filter-builder'; +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 { LinkResource } from 'models/link'; +import { KeepServiceResource } from 'models/keep-services'; +import { NodeResource } from 'models/node'; +import { ApiClientAuthorization } from 'models/api-client-authorization'; import * as React from 'react'; export const ADVANCED_TAB_DIALOG = 'advancedTabDialog'; @@ -225,7 +225,7 @@ export const openAdvancedTabDialog = (uuid: string) => const data = getResource(uuid)(resources); const metadata = await services.linkService.list({ filters: new FilterBuilder() - .addEqual('headUuid', uuid) + .addEqual('head_uuid', uuid) .getFilters() }); const advanceDataUser = advancedTabData({ @@ -300,7 +300,7 @@ const getDataForAdvancedTab = (uuid: string) => const data = getResource(uuid)(resources); const metadata = await services.linkService.list({ filters: new FilterBuilder() - .addEqual('headUuid', uuid) + .addEqual('head_uuid', uuid) .getFilters() }); const user = metadata.itemsAvailable && await services.userService.get(metadata.items[0].tailUuid || ''); @@ -413,7 +413,7 @@ const containerRequestApiResponse = (apiResponse: ContainerRequestResource) => { "container_count_max": ${stringify(containerCountMax)}, "mounts": ${stringifyObject(mounts)}, "runtime_constraints": ${stringifyObject(runtimeConstraints)}, -"container_image": "${stringify(containerImage)}", +"container_image": ${stringify(containerImage)}, "environment": ${stringifyObject(environment)}, "cwd": ${stringify(cwd)}, "command": ${stringifyObject(command)}, @@ -435,7 +435,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, - storageClassesConfirmed, storageClassesConfirmedAt, currentVersionUuid, version, preserveVersion } = apiResponse; + storageClassesConfirmed, storageClassesConfirmedAt, currentVersionUuid, version, preserveVersion, fileCount, fileSizeTotal } = apiResponse; const response = ` "uuid": "${uuid}", "owner_uuid": "${ownerUuid}", @@ -457,15 +457,17 @@ const collectionApiResponse = (apiResponse: CollectionResource) => { "storage_classes_desired": ${JSON.stringify(storageClassesDesired, null, 2)}, "storage_classes_confirmed": ${JSON.stringify(storageClassesConfirmed, null, 2)}, "storage_classes_confirmed_at": ${stringify(storageClassesConfirmedAt)}, -"currentVersionUuid": ${stringify(currentVersionUuid)}, +"current_version_uuid": ${stringify(currentVersionUuid)}, "version": ${version}, -"preserveVersion": ${preserveVersion}`; +"preserve_version": ${preserveVersion}, +"file_count": ${fileCount}, +"file_size_total": ${fileSizeTotal}`; return {'{'} {response} {'\n'} {'}'}; }; const groupRequestApiResponse = (apiResponse: ProjectResource) => { - const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, description, groupClass, trashAt, isTrashed, deleteAt, properties, writeableBy } = apiResponse; + const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, description, groupClass, trashAt, isTrashed, deleteAt, properties, writableBy } = apiResponse; const response = ` "uuid": "${uuid}", "owner_uuid": "${ownerUuid}", @@ -480,7 +482,7 @@ const groupRequestApiResponse = (apiResponse: ProjectResource) => { "is_trashed": ${stringify(isTrashed)}, "delete_at": ${stringify(deleteAt)}, "properties": ${stringifyObject(properties)}, -"witable_by": ${stringifyObject(writeableBy)}`; +"writable_by": ${stringifyObject(writableBy)}`; return {'{'} {response} {'\n'} {'}'}; };