next conflicts

[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..d8b33f601f94c553e79e8be078f0dc2c9c4ee62f 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -3,16 +3,16 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as _ from "lodash";
-import { CommonResourceService, ListResults, ListArguments } from '~/services/common-service/common-resource-service';
+import { CommonResourceService } from '~/services/common-service/common-resource-service';
+import { ListResults, ListArguments } from '~/services/common-service/common-service';
 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;
@@ -21,6 +21,7 @@ export interface ContentsArguments {
     filters?: string;
     recursive?: boolean;
     includeTrash?: boolean;
+    excludeHomeProject?: boolean;
 }
 
 export interface SharedArguments extends ListArguments {
@@ -46,28 +47,28 @@ 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 response = await CommonResourceService.defaultResponse(
+                this.serverApi
+                    .get(this.resourceType + pathUrl, {
+                        params: CommonResourceService.mapKeys(_.snakeCase)(params)
+                    }),
+                this.actions, 
+                false
+            );
 
         const { items, ...res } = response;
-        const mappedItems = items.map((item: any) => {
-            if (item.kind === ResourceKind.COLLECTION) {
+        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 {
-                    ...TrashableResourceService.mapKeys(snakeCase)(item),
-                    properties,
-                };
+                return { ...mappedItem, properties };
             } else {
-                return TrashableResourceService.mapKeys(item);
+                return mappedItem;
             }
         });
-        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>> {