15027: Removes code to avoid camel_case translation back to the api server.

[arvados-workbench2.git] / src / services / groups-service / groups-service.ts

diff --git a/src/services/groups-service/groups-service.ts b/src/services/groups-service/groups-service.ts
index f4443e8e4fca2581f85a6d0307448149e67f6d94..ac6ffb943bdba71999df06ff42bece2be19f80c9 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -3,16 +3,17 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as _ from "lodash";
-import { CommonResourceService, ListResults, ListArguments } from '~/services/common-service/common-resource-service';
-import { AxiosInstance } from "axios";
+import { CommonResourceService } from '~/services/common-service/common-resource-service';
+import { ListResults, ListArguments } from '~/services/common-service/common-service';
+import { AxiosInstance, AxiosRequestConfig } 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';
+import { Session } from "~/models/session";
 
 export interface ContentsArguments {
     limit?: number;
@@ -21,6 +22,7 @@ export interface ContentsArguments {
     filters?: string;
     recursive?: boolean;
     includeTrash?: boolean;
+    excludeHomeProject?: boolean;
 }
 
 export interface SharedArguments extends ListArguments {
@@ -38,7 +40,7 @@ export class GroupsService<T extends GroupResource = GroupResource> extends Tras
         super(serverApi, "groups", actions);
     }
 
-    async contents(uuid: string, args: ContentsArguments = {}): Promise<ListResults<GroupContentsResource>> {
+    async contents(uuid: string, args: ContentsArguments = {}, session?: Session): Promise<ListResults<GroupContentsResource>> {
         const { filters, order, ...other } = args;
         const params = {
             ...other,
@@ -46,28 +48,18 @@ export class GroupsService<T extends GroupResource = GroupResource> extends Tras
             order: order ? order : undefined
         };
 
-        const response = await CommonResourceService.customResponse(
-            this.serverApi
-                .get(this.resourceType + `${uuid}/contents`, {
-                    params: CommonResourceService.mapKeys(_.snakeCase)(params)
-                }),
-            this.actions
+        const pathUrl = uuid ? `${uuid}/contents` : 'contents';
+
+        const cfg: AxiosRequestConfig = { params: CommonResourceService.mapKeys(_.snakeCase)(params) };
+        if (session) {
+            cfg.baseURL = session.baseUrl;
+        }
+
+        const response = await CommonResourceService.defaultResponse(
+            this.serverApi.get(this.resourceType + pathUrl, cfg), this.actions, false
         );
 
-        const { items, ...res } = response;
-        const mappedItems = items.map((item: any) => {
-            if (item.kind === ResourceKind.COLLECTION) {
-                const { properties } = item;
-                return {
-                    ...TrashableResourceService.mapKeys(snakeCase)(item),
-                    properties,
-                };
-            } else {
-                return TrashableResourceService.mapKeys(item);
-            }
-        });
-        const mappedResponse = TrashableResourceService.mapResponseKeys(res);
-        return  { ...mappedResponse, items: mappedItems };
+        return { ...TrashableResourceService.mapKeys(_.camelCase)(response), clusterId: session && session.clusterId };
     }
 
     shared(params: SharedArguments = {}): Promise<ListResults<GroupContentsResource>> {