[ARVADOS-WORKBENCH2] updated: 1.2.0-531-g4a96a18

Git user git at public.curoverse.com
Thu Oct 4 07:49:10 EDT 2018


Summary of changes:
 src/services/groups-service/groups-service.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

       via  4a96a184698695992ecbeb5600210984341163a6 (commit)
      from  a4e2c41eb689b86b04a88ea2971282ce14de2b88 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4a96a184698695992ecbeb5600210984341163a6
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date:   Thu Oct 4 13:49:01 2018 +0200

    fix groups service, add camleCase instead of snakeCase
    
    Feature #14278
    
    Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>

diff --git a/src/services/groups-service/groups-service.ts b/src/services/groups-service/groups-service.ts
index f4443e8..ec80851 100644
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -8,11 +8,10 @@ import { AxiosInstance } from "axios";
 import { CollectionResource } from "~/models/collection";
 import { ProjectResource } from "~/models/project";
 import { ProcessResource } from "~/models/process";
-import { TrashableResource, ResourceKind } from '~/models/resource';
+import { ResourceKind } from '~/models/resource';
 import { TrashableResourceService } from "~/services/common-service/trashable-resource-service";
 import { ApiActions } from "~/services/api/api-actions";
 import { GroupResource } from "~/models/group";
-import { snakeCase } from 'lodash';
 
 export interface ContentsArguments {
     limit?: number;
@@ -49,25 +48,24 @@ export class GroupsService<T extends GroupResource = GroupResource> extends Tras
         const response = await CommonResourceService.customResponse(
             this.serverApi
                 .get(this.resourceType + `${uuid}/contents`, {
-                    params: CommonResourceService.mapKeys(_.snakeCase)(params)
+                    params: CommonResourceService.mapKeys(_.camelCase)(params)
                 }),
             this.actions
         );
-
         const { items, ...res } = response;
         const mappedItems = items.map((item: any) => {
             if (item.kind === ResourceKind.COLLECTION) {
                 const { properties } = item;
                 return {
-                    ...TrashableResourceService.mapKeys(snakeCase)(item),
+                    ...TrashableResourceService.mapKeys(_.camelCase)(item),
                     properties,
                 };
             } else {
-                return TrashableResourceService.mapKeys(item);
+                return TrashableResourceService.mapKeys(_.camelCase)(item);
             }
         });
-        const mappedResponse = TrashableResourceService.mapResponseKeys(res);
-        return  { ...mappedResponse, items: mappedItems };
+        const mappedResponse = { ...TrashableResourceService.mapKeys(_.camelCase)(res) };
+        return { ...mappedResponse, items: mappedItems };
     }
 
     shared(params: SharedArguments = {}): Promise<ListResults<GroupContentsResource>> {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list