X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a71b18d036e642ace1ae4bdd06f7df8409faf1b4..a4e2c41eb689b86b04a88ea2971282ce14de2b88:/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 822c810e..f4443e8e 100644
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -3,12 +3,16 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as _ from "lodash";
-import { CommonResourceService, ListResults } from "~/common/api/common-resource-service";
+import { CommonResourceService, ListResults, ListArguments } from '~/services/common-service/common-resource-service';
 import { AxiosInstance } from "axios";
-import { GroupResource } from "~/models/group";
 import { CollectionResource } from "~/models/collection";
 import { ProjectResource } from "~/models/project";
 import { ProcessResource } from "~/models/process";
+import { TrashableResource, 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;
@@ -16,6 +20,11 @@ export interface ContentsArguments {
     order?: string;
     filters?: string;
     recursive?: boolean;
+    includeTrash?: boolean;
+}
+
+export interface SharedArguments extends ListArguments {
+    include?: string;
 }
 
 export type GroupContentsResource =
@@ -23,24 +32,50 @@ export type GroupContentsResource =
     ProjectResource |
     ProcessResource;
 
-export class GroupsService<T extends GroupResource = GroupResource> extends CommonResourceService<T> {
+export class GroupsService<T extends GroupResource = GroupResource> extends TrashableResourceService<T> {
 
-    constructor(serverApi: AxiosInstance) {
-        super(serverApi, "groups");
+    constructor(serverApi: AxiosInstance, actions: ApiActions) {
+        super(serverApi, "groups", actions);
     }
 
-    contents(uuid: string, args: ContentsArguments = {}): Promise<ListResults<GroupContentsResource>> {
+    async contents(uuid: string, args: ContentsArguments = {}): Promise<ListResults<GroupContentsResource>> {
         const { filters, order, ...other } = args;
         const params = {
             ...other,
             filters: filters ? `[${filters}]` : undefined,
             order: order ? order : undefined
         };
-        return this.serverApi
-            .get(this.resourceType + `${uuid}/contents/`, {
-                params: CommonResourceService.mapKeys(_.snakeCase)(params)
-            })
-            .then(CommonResourceService.mapResponseKeys);
+
+        const response = await CommonResourceService.customResponse(
+            this.serverApi
+                .get(this.resourceType + `${uuid}/contents`, {
+                    params: CommonResourceService.mapKeys(_.snakeCase)(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),
+                    properties,
+                };
+            } else {
+                return TrashableResourceService.mapKeys(item);
+            }
+        });
+        const mappedResponse = TrashableResourceService.mapResponseKeys(res);
+        return  { ...mappedResponse, items: mappedItems };
+    }
+
+    shared(params: SharedArguments = {}): Promise<ListResults<GroupContentsResource>> {
+        return CommonResourceService.defaultResponse(
+            this.serverApi
+                .get(this.resourceType + 'shared', { params }),
+            this.actions
+        );
     }
 }