From: Pawel Kowalczyk Date: Thu, 7 Feb 2019 13:19:07 +0000 (+0100) Subject: refs #14801-api-resonse-is-not-complete X-Git-Tag: 1.4.0~52 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/47f421fa743e2b4b09d4f0fbfbead00545e327d4 refs #14801-api-resonse-is-not-complete Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- diff --git a/src/components/code-snippet/code-snippet.tsx b/src/components/code-snippet/code-snippet.tsx index a23a5fe2..84271f0e 100644 --- a/src/components/code-snippet/code-snippet.tsx +++ b/src/components/code-snippet/code-snippet.tsx @@ -7,31 +7,35 @@ import { StyleRulesCallback, WithStyles, Typography, withStyles } from '@materia import { ArvadosTheme } from '~/common/custom-theme'; import * as classNames from 'classnames'; -type CssRules = 'root'; +type CssRules = 'root' | 'space'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { boxSizing: 'border-box', overflow: 'auto', padding: theme.spacing.unit + }, + space: { + marginLeft: '15px' } }); export interface CodeSnippetDataProps { lines: string[]; className?: string; + apiResponse?: boolean; } type CodeSnippetProps = CodeSnippetDataProps & WithStyles; export const CodeSnippet = withStyles(styles)( - ({ classes, lines, className }: CodeSnippetProps) => + ({ classes, lines, className, apiResponse }: CodeSnippetProps) => { lines.map((line: string, index: number) => { - return {line}; + return {line}; }) } diff --git a/src/models/collection.ts b/src/models/collection.ts index 2b16ea25..72075fdb 100644 --- a/src/models/collection.ts +++ b/src/models/collection.ts @@ -17,6 +17,9 @@ export interface CollectionResource extends TrashableResource { storageClassesDesired: string[]; storageClassesConfirmed: string[]; storageClassesConfirmedAt: string; + currentVersionUuid: string; + version: number; + preserveVersion: boolean; } export const getCollectionUrl = (uuid: string) => { diff --git a/src/store/advanced-tab/advanced-tab.ts b/src/store/advanced-tab/advanced-tab.tsx similarity index 90% rename from src/store/advanced-tab/advanced-tab.ts rename to src/store/advanced-tab/advanced-tab.tsx index 921b1cd7..3d10e54a 100644 --- a/src/store/advanced-tab/advanced-tab.ts +++ b/src/store/advanced-tab/advanced-tab.tsx @@ -23,6 +23,7 @@ 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'; @@ -312,7 +313,7 @@ interface AdvancedTabData { uuid: string; metadata: ListResults | string; user: UserResource | string; - apiResponseKind: (apiResponse: AdvanceResponseData) => string; + apiResponseKind: any; data: AdvanceResponseData; resourceKind: AdvanceResourceKind; resourcePrefix: AdvanceResourcePrefix; @@ -396,7 +397,8 @@ const containerRequestApiResponse = (apiResponse: ContainerRequestResource) => { const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, description, properties, state, requestingContainerUuid, containerUuid, containerCountMax, mounts, runtimeConstraints, containerImage, environment, cwd, command, outputPath, priority, expiresAt, filters, containerCount, useExisting, schedulingParameters, outputUuid, logUuid, outputName, outputTtl } = apiResponse; - const response = `"uuid": "${uuid}", + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "created_at": "${createdAt}", "modified_at": ${stringify(modifiedAt)}, @@ -427,14 +429,15 @@ const containerRequestApiResponse = (apiResponse: ContainerRequestResource) => { "output_name": ${stringify(outputName)}, "output_ttl": ${stringify(outputTtl)}`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; 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 } = apiResponse; - const response = `"uuid": "${uuid}", + storageClassesConfirmed, storageClassesConfirmedAt, currentVersionUuid, version, preserveVersion } = apiResponse; + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "created_at": "${createdAt}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, @@ -453,14 +456,18 @@ const collectionApiResponse = (apiResponse: CollectionResource) => { "is_trashed": ${stringify(isTrashed)}, "storage_classes_desired": ${JSON.stringify(storageClassesDesired, null, 2)}, "storage_classes_confirmed": ${JSON.stringify(storageClassesConfirmed, null, 2)}, -"storage_classes_confirmed_at": ${stringify(storageClassesConfirmedAt)}`; +"storage_classes_confirmed_at": ${stringify(storageClassesConfirmedAt)}, +"currentVersionUuid": ${stringify(currentVersionUuid)}, +"version": ${version}, +"preserveVersion": ${preserveVersion}`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const groupRequestApiResponse = (apiResponse: ProjectResource) => { - const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, description, groupClass, trashAt, isTrashed, deleteAt, properties } = apiResponse; - const response = `"uuid": "${uuid}", + const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, description, groupClass, trashAt, isTrashed, deleteAt, properties, writeableBy } = apiResponse; + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "created_at": "${createdAt}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, @@ -472,27 +479,31 @@ const groupRequestApiResponse = (apiResponse: ProjectResource) => { "trash_at": ${stringify(trashAt)}, "is_trashed": ${stringify(isTrashed)}, "delete_at": ${stringify(deleteAt)}, -"properties": ${stringifyObject(properties)}`; +"properties": ${stringifyObject(properties)}, +"witable_by": ${stringifyObject(writeableBy)}`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const repositoryApiResponse = (apiResponse: RepositoryResource) => { - const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name } = apiResponse; - const response = `"uuid": "${uuid}", + const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, cloneUrls } = apiResponse; + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, "modified_by_user_uuid": ${stringify(modifiedByUserUuid)}, "modified_at": ${stringify(modifiedAt)}, "name": ${stringify(name)}, -"created_at": "${createdAt}"`; +"created_at": "${createdAt}", +"clone_urls": ${stringifyObject(cloneUrls)}`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const sshKeyApiResponse = (apiResponse: SshKeyResource) => { const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, name, authorizedUserUuid, expiresAt } = apiResponse; - const response = `"uuid": "${uuid}", + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "authorized_user_uuid": "${authorizedUserUuid}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, @@ -501,12 +512,13 @@ const sshKeyApiResponse = (apiResponse: SshKeyResource) => { "name": ${stringify(name)}, "created_at": "${createdAt}", "expires_at": "${expiresAt}"`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const virtualMachineApiResponse = (apiResponse: VirtualMachinesResource) => { const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, hostname } = apiResponse; - const response = `"hostname": ${stringify(hostname)}, + const response = ` +"hostname": ${stringify(hostname)}, "uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, @@ -515,7 +527,7 @@ const virtualMachineApiResponse = (apiResponse: VirtualMachinesResource) => { "modified_at": ${stringify(modifiedAt)}, "created_at": "${createdAt}"`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const keepServiceApiResponse = (apiResponse: KeepServiceResource) => { @@ -523,7 +535,8 @@ const keepServiceApiResponse = (apiResponse: KeepServiceResource) => { uuid, readOnly, serviceHost, servicePort, serviceSslFlag, serviceType, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid } = apiResponse; - const response = `"uuid": "${uuid}", + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, "modified_by_user_uuid": ${stringify(modifiedByUserUuid)}, @@ -535,7 +548,7 @@ const keepServiceApiResponse = (apiResponse: KeepServiceResource) => { "created_at": "${createdAt}", "read_only": "${stringify(readOnly)}"`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const userApiResponse = (apiResponse: UserResource) => { @@ -543,7 +556,8 @@ const userApiResponse = (apiResponse: UserResource) => { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, email, firstName, lastName, identityUrl, isActive, isAdmin, prefs, defaultOwnerUuid, username } = apiResponse; - const response = `"uuid": "${uuid}", + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "created_at": "${createdAt}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, @@ -559,7 +573,7 @@ const userApiResponse = (apiResponse: UserResource) => { "default_owner_uuid": "${defaultOwnerUuid}, "username": "${username}"`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const computeNodeApiResponse = (apiResponse: NodeResource) => { @@ -568,7 +582,8 @@ const computeNodeApiResponse = (apiResponse: NodeResource) => { ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, properties, info } = apiResponse; - const response = `"uuid": "${uuid}", + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, "modified_by_user_uuid": ${stringify(modifiedByUserUuid)}, @@ -581,10 +596,10 @@ const computeNodeApiResponse = (apiResponse: NodeResource) => { "first_ping_at": "${stringify(firstPingAt)}", "last_ping_at": "${stringify(lastPingAt)}", "job_uuid": "${stringify(jobUuid)}", -"properties": "${JSON.stringify(properties, null, 4)}", -"info": "${JSON.stringify(info, null, 4)}"`; +"properties": "${JSON.stringify(properties, null, 2)}", +"info": "${JSON.stringify(info, null, 2)}"`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const apiClientAuthorizationApiResponse = (apiResponse: ApiClientAuthorization) => { @@ -592,7 +607,8 @@ const apiClientAuthorizationApiResponse = (apiResponse: ApiClientAuthorization) uuid, ownerUuid, apiToken, apiClientId, userId, createdByIpAddress, lastUsedByIpAddress, lastUsedAt, expiresAt, defaultOwnerUuid, scopes, updatedAt, createdAt } = apiResponse; - const response = `"uuid": "${uuid}", + const response = ` +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "api_token": "${stringify(apiToken)}", "api_client_id": "${stringify(apiClientId)}", @@ -604,9 +620,9 @@ const apiClientAuthorizationApiResponse = (apiResponse: ApiClientAuthorization) "created_at": "${stringify(createdAt)}", "updated_at": "${stringify(updatedAt)}", "default_owner_uuid": "${stringify(defaultOwnerUuid)}", -"scopes": "${JSON.stringify(scopes, null, 4)}"`; +"scopes": "${JSON.stringify(scopes, null, 2)}"`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; const linkApiResponse = (apiResponse: LinkResource) => { @@ -614,7 +630,8 @@ const linkApiResponse = (apiResponse: LinkResource) => { uuid, name, headUuid, properties, headKind, tailUuid, tailKind, linkClass, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid } = apiResponse; - const response = `"uuid": "${uuid}", + const response = ` +"uuid": "${uuid}", "name": "${name}", "head_uuid": "${headUuid}", "head_kind": "${headKind}", @@ -626,7 +643,7 @@ const linkApiResponse = (apiResponse: LinkResource) => { "modified_at": ${stringify(modifiedAt)}, "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, "modified_by_user_uuid": ${stringify(modifiedByUserUuid)}, -"properties": "${JSON.stringify(properties, null, 4)}"`; +"properties": "${JSON.stringify(properties, null, 2)}"`; - return response; + return {'{'} {response} {'\n'} {'}'}; }; \ No newline at end of file diff --git a/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx b/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx index 74333409..fdd0bd70 100644 --- a/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx +++ b/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx @@ -109,5 +109,6 @@ const dialogContentHeader = (header: string) => const dialogContentExample = (example: string, classes: any) => ; \ No newline at end of file