Merge branch '14277-search-results-view'

[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 ec80851d318c14245caa2c84770beed0b2598a00..bdb51198c32088510ad331a09dd3818fb927dcd7 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -20,6 +20,7 @@ export interface ContentsArguments {
     filters?: string;
     recursive?: boolean;
     includeTrash?: boolean;
+    excludeHomeProject?: boolean;
 }
 
 export interface SharedArguments extends ListArguments {
@@ -45,23 +46,24 @@ 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(_.camelCase)(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) => {
+        const mappedItems = items.map((item: GroupContentsResource) => {
+            const mappedItem = TrashableResourceService.mapKeys(_.camelCase)(item);
             if (item.kind === ResourceKind.COLLECTION) {
                 const { properties } = item;
-                return {
-                    ...TrashableResourceService.mapKeys(_.camelCase)(item),
-                    properties,
-                };
+                return { ...mappedItem, properties };
             } else {
-                return TrashableResourceService.mapKeys(_.camelCase)(item);
+                return mappedItem;
             }
         });
         const mappedResponse = { ...TrashableResourceService.mapKeys(_.camelCase)(res) };