From: Lucas Di Pentima Date: Wed, 21 Aug 2019 12:09:59 +0000 (-0300) Subject: 15027: Removes code to avoid camel_case translation back to the api server. X-Git-Tag: 2.0.0~39^2~9 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/50c7935cf1152cb9061f4c4bcbcb7086261a1204 15027: Removes code to avoid camel_case translation back to the api server. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts index 86b1aded..9390777f 100644 --- a/src/services/collection-service/collection-service.ts +++ b/src/services/collection-service/collection-service.ts @@ -82,27 +82,4 @@ export class CollectionService extends TrashableResourceService) { - if (uuid && data && data.properties) { - const { properties } = data; - const mappedData = { - ...TrashableResourceService.mapKeys(snakeCase)(data), - properties, - }; - return TrashableResourceService - .defaultResponse( - this.serverApi - .put(this.resourceType + uuid, mappedData), - this.actions, - false - ); - } - return TrashableResourceService - .defaultResponse( - this.serverApi - .put(this.resourceType + uuid, data && TrashableResourceService.mapKeys(snakeCase)(data)), - this.actions - ); - } } diff --git a/src/services/container-request-service/container-request-service.ts b/src/services/container-request-service/container-request-service.ts index 2e2ccd1c..1e59560a 100644 --- a/src/services/container-request-service/container-request-service.ts +++ b/src/services/container-request-service/container-request-service.ts @@ -12,25 +12,4 @@ export class ContainerRequestService extends CommonResourceService) { - if (data) { - const { mounts } = data; - if (mounts) { - const mappedData = { - ...CommonResourceService.mapKeys(snakeCase)(data), - mounts, - }; - return CommonResourceService - .defaultResponse( - this.serverApi.post(this.resourceType, mappedData), - this.actions); - } - } - return CommonResourceService - .defaultResponse( - this.serverApi - .post(this.resourceType, data && CommonResourceService.mapKeys(snakeCase)(data)), - this.actions); - } } diff --git a/src/services/groups-service/groups-service.ts b/src/services/groups-service/groups-service.ts index a676557a..ac6ffb94 100644 --- a/src/services/groups-service/groups-service.ts +++ b/src/services/groups-service/groups-service.ts @@ -59,18 +59,7 @@ export class GroupsService extends Tras this.serverApi.get(this.resourceType + pathUrl, cfg), this.actions, false ); - const { items, ...res } = response; - const mappedItems = (items || []).map((item: GroupContentsResource) => { - const mappedItem = TrashableResourceService.mapKeys(_.camelCase)(item); - if (item.kind === ResourceKind.COLLECTION || item.kind === ResourceKind.PROJECT) { - const { properties } = item; - return { ...mappedItem, properties }; - } else { - return mappedItem; - } - }); - const mappedResponse = { ...TrashableResourceService.mapKeys(_.camelCase)(res) }; - return { ...mappedResponse, items: mappedItems, clusterId: session && session.clusterId }; + return { ...TrashableResourceService.mapKeys(_.camelCase)(response), clusterId: session && session.clusterId }; } shared(params: SharedArguments = {}): Promise> { diff --git a/src/services/project-service/project-service.ts b/src/services/project-service/project-service.ts index 5c686aae..ac16564a 100644 --- a/src/services/project-service/project-service.ts +++ b/src/services/project-service/project-service.ts @@ -16,29 +16,6 @@ export class ProjectService extends GroupsService { return super.create(projectData); } - update(uuid: string, data: Partial) { - if (uuid && data && data.properties) { - const { properties } = data; - const mappedData = { - ...TrashableResourceService.mapKeys(snakeCase)(data), - properties, - }; - return TrashableResourceService - .defaultResponse( - this.serverApi - .put(this.resourceType + uuid, mappedData), - this.actions, - false - ); - } - return TrashableResourceService - .defaultResponse( - this.serverApi - .put(this.resourceType + uuid, data && TrashableResourceService.mapKeys(snakeCase)(data)), - this.actions - ); - } - list(args: ListArguments = {}) { return super.list({ ...args,