15027: Removes code to avoid camel_case translation back to the api server.
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Wed, 21 Aug 2019 12:09:59 +0000 (09:09 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Wed, 21 Aug 2019 12:09:59 +0000 (09:09 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

src/services/collection-service/collection-service.ts
src/services/container-request-service/container-request-service.ts
src/services/groups-service/groups-service.ts
src/services/project-service/project-service.ts

index 86b1aded7cf69ac280564a530eb5ebb8a0439f21..9390777f383f358a0e4bf568956ea14d01342d16 100644 (file)
@@ -82,27 +82,4 @@ export class CollectionService extends TrashableResourceService<CollectionResour
         };
         return this.webdavClient.upload(fileURL, [file], requestConfig);
     }
-
-    update(uuid: string, data: Partial<CollectionResource>) {
-        if (uuid && data && data.properties) {
-            const { properties } = data;
-            const mappedData = {
-                ...TrashableResourceService.mapKeys(snakeCase)(data),
-                properties,
-            };
-            return TrashableResourceService
-                .defaultResponse(
-                    this.serverApi
-                        .put<CollectionResource>(this.resourceType + uuid, mappedData),
-                    this.actions,
-                    false
-                );
-        }
-        return TrashableResourceService
-            .defaultResponse(
-                this.serverApi
-                    .put<CollectionResource>(this.resourceType + uuid, data && TrashableResourceService.mapKeys(snakeCase)(data)),
-                this.actions
-            );
-    }
 }
index 2e2ccd1c851bdc031d0f3f0aba8b9badb5873b33..1e59560a2e6b5c049c9cbc75c07bcd193d7f4b86 100644 (file)
@@ -12,25 +12,4 @@ export class ContainerRequestService extends CommonResourceService<ContainerRequ
     constructor(serverApi: AxiosInstance, actions: ApiActions) {
         super(serverApi, "container_requests", actions);
     }
-
-    create(data?: Partial<ContainerRequestResource>) {
-        if (data) {
-            const { mounts } = data;
-            if (mounts) {
-                const mappedData = {
-                    ...CommonResourceService.mapKeys(snakeCase)(data),
-                    mounts,
-                };
-                return CommonResourceService
-                    .defaultResponse(
-                        this.serverApi.post<ContainerRequestResource>(this.resourceType, mappedData),
-                        this.actions);
-            }
-        }
-        return CommonResourceService
-            .defaultResponse(
-                this.serverApi
-                    .post<ContainerRequestResource>(this.resourceType, data && CommonResourceService.mapKeys(snakeCase)(data)),
-                this.actions);
-    }
 }
index a676557a78afd4e44c3b5c1ae771077b63541f49..ac6ffb943bdba71999df06ff42bece2be19f80c9 100644 (file)
@@ -59,18 +59,7 @@ export class GroupsService<T extends GroupResource = GroupResource> 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<ListResults<GroupContentsResource>> {
index 5c686aae67fd5db06251071bacbc591b5c5f0f51..ac16564a2df22a14c4608a11a6f687e192002fb7 100644 (file)
@@ -16,29 +16,6 @@ export class ProjectService extends GroupsService<ProjectResource> {
         return super.create(projectData);
     }
 
-    update(uuid: string, data: Partial<ProjectResource>) {
-        if (uuid && data && data.properties) {
-            const { properties } = data;
-            const mappedData = {
-                ...TrashableResourceService.mapKeys(snakeCase)(data),
-                properties,
-            };
-            return TrashableResourceService
-                .defaultResponse(
-                    this.serverApi
-                        .put<ProjectResource>(this.resourceType + uuid, mappedData),
-                    this.actions,
-                    false
-                );
-        }
-        return TrashableResourceService
-            .defaultResponse(
-                this.serverApi
-                    .put<ProjectResource>(this.resourceType + uuid, data && TrashableResourceService.mapKeys(snakeCase)(data)),
-                this.actions
-            );
-    }
-
     list(args: ListArguments = {}) {
         return super.list({
             ...args,