X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3badd0539b3ba8e20db4c1243a02ce8dc6eb56a9..169f05f7c42e7d3a3a3347200472df81f26464b2:/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 bf928360..281aa921 100644
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -3,15 +3,16 @@
 // 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 { 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 { Session } from "~/models/session";
 
 export interface ContentsArguments {
     limit?: number;
@@ -20,6 +21,7 @@ export interface ContentsArguments {
     filters?: string;
     recursive?: boolean;
     includeTrash?: boolean;
+    excludeHomeProject?: boolean;
 }
 
 export interface SharedArguments extends ListArguments {
@@ -37,42 +39,32 @@ 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,
             filters: filters ? `[${filters}]` : undefined,
             order: order ? order : undefined
         };
+        const pathUrl = uuid ? `/${uuid}/contents` : '/contents';
+
+        const cfg: AxiosRequestConfig = { params: CommonResourceService.mapKeys(_.snakeCase)(params) };
+        if (session) {
+            cfg.baseURL = session.baseUrl;
+            cfg.headers = { 'Authorization': 'Bearer ' + session.token };
+        }
 
         const response = await CommonResourceService.defaultResponse(
-            this.serverApi
-                .get(this.resourceType + `${uuid}/contents`, {
-                    params: CommonResourceService.mapKeys(_.camelCase)(params)
-                }),
-            this.actions, 
-            false
+            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(_.camelCase)(item),
-                    properties,
-                };
-            } else {
-                return TrashableResourceService.mapKeys(_.camelCase)(item);
-            }
-        });
-        const mappedResponse = { ...TrashableResourceService.mapKeys(_.camelCase)(res) };
-        return { ...mappedResponse, items: mappedItems };
+
+        return { ...TrashableResourceService.mapKeys(_.camelCase)(response), clusterId: session && session.clusterId };
     }
 
     shared(params: SharedArguments = {}): Promise<ListResults<GroupContentsResource>> {
         return CommonResourceService.defaultResponse(
             this.serverApi
-                .get(this.resourceType + 'shared', { params }),
+                .get(this.resourceType + '/shared', { params }),
             this.actions
         );
     }