X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e0cb98c44ed8f32f269d2b9f878184263cd14192..1feb5aaffe6fee4a9c8c8c64877f1da6f3490e06:/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 f230c70fa0..a0f27a4abb 100644
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -3,23 +3,16 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as _ from "lodash";
-import CommonResourceService, { Resource, ListResults } from "../../common/api/common-resource-service";
-import FilterBuilder from "../../common/api/filter-builder";
-import OrderBuilder from "../../common/api/order-builder";
+import { CommonResourceService, ListResults } from "../../common/api/common-resource-service";
+import { FilterBuilder } from "../../common/api/filter-builder";
+import { OrderBuilder } from "../../common/api/order-builder";
 import { AxiosInstance } from "axios";
+import { GroupResource } from "../../models/group";
+import { CollectionResource } from "../../models/collection";
+import { ProjectResource } from "../../models/project";
+import { ProcessResource } from "../../models/process";
 
-interface GroupResource extends Resource {
-    name: string;
-    groupClass: string;
-    description: string;
-    properties: string;
-    writeableBy: string[];
-    trashAt: string;
-    deleteAt: string;
-    isTrashed: boolean;
-}
-
-interface ContensArguments {
+export interface ContentsArguments {
     limit?: number;
     offset?: number;
     order?: OrderBuilder;
@@ -27,18 +20,23 @@ interface ContensArguments {
     recursive?: boolean;
 }
 
-export default class GroupsService extends CommonResourceService<GroupResource> {
+export type GroupContentsResource =
+    CollectionResource |
+    ProjectResource |
+    ProcessResource;
+
+export class GroupsService<T extends GroupResource = GroupResource> extends CommonResourceService<T> {
 
     constructor(serverApi: AxiosInstance) {
         super(serverApi, "groups");
     }
 
-    contents (uuid: string, args: ContensArguments = {}): Promise<ListResults<Resource>> {
+    contents(uuid: string, args: ContentsArguments = {}): Promise<ListResults<GroupContentsResource>> {
         const { filters, order, ...other } = args;
         const params = {
             ...other,
-            filters: filters ? filters.get() : undefined,
-            order: order ? order.get() : undefined
+            filters: filters ? filters.serialize() : undefined,
+            order: order ? order.getOrder() : undefined
         };
         return this.serverApi
             .get(this.resourceType + `${uuid}/contents/`, {
@@ -46,4 +44,10 @@ export default class GroupsService extends CommonResourceService<GroupResource>
             })
             .then(CommonResourceService.mapResponseKeys);
     }
-}
\ No newline at end of file
+}
+
+export enum GroupContentsResourcePrefix {
+    COLLECTION = "collections",
+    PROJECT = "groups",
+    PROCESS = "container_requests"
+}