Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 13751-shared-with...

[arvados.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 4756aa3edcf22c1b000a6b7894fdc265970c9a44..299e6808546b224cb2e1b39f18bb3aeb73061b40 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -3,12 +3,14 @@
 // 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 { CollectionResource } from "~/models/collection";
 import { ProjectResource } from "~/models/project";
 import { ProcessResource } from "~/models/process";
-import { TrashResource } from "~/models/resource";
+import { TrashableResource } from "~/models/resource";
+import { TrashableResourceService } from "~/services/common-service/trashable-resource-service";
+import { GroupResource } from '~/models/group';
 
 export interface ContentsArguments {
     limit?: number;
@@ -19,12 +21,16 @@ export interface ContentsArguments {
     includeTrash?: boolean;
 }
 
+export interface SharedArguments extends ListArguments {
+    include?: string;
+}
+
 export type GroupContentsResource =
     CollectionResource |
     ProjectResource |
     ProcessResource;
 
-export class GroupsService<T extends TrashResource = TrashResource> extends CommonResourceService<T> {
+export class GroupsService<T extends GroupResource = GroupResource> extends TrashableResourceService<T> {
 
     constructor(serverApi: AxiosInstance) {
         super(serverApi, "groups");
@@ -44,23 +50,11 @@ export class GroupsService<T extends TrashResource = TrashResource> extends Comm
             .then(CommonResourceService.mapResponseKeys);
     }
 
-    trash(uuid: string): Promise<T> {
+    shared(params: SharedArguments = {}): Promise<ListResults<GroupContentsResource>> {
         return this.serverApi
-            .post(this.resourceType + `${uuid}/trash`)
+            .get(this.resourceType + 'shared', { params })
             .then(CommonResourceService.mapResponseKeys);
     }
-
-    untrash(uuid: string): Promise<T> {
-        const params = {
-            ensure_unique_name: true
-        };
-        return this.serverApi
-            .post(this.resourceType + `${uuid}/untrash`, {
-                params: CommonResourceService.mapKeys(_.snakeCase)(params)
-            })
-            .then(CommonResourceService.mapResponseKeys);
-    }
-
 }
 
 export enum GroupContentsResourcePrefix {