merge conflicts

[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 8c5fd8fa6ce855d9a2cbc052eb924920431b1c9b..dfaf11d6e82ccfbc77ad4ba484e7577fa66b4bdf 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -3,17 +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 { WorkflowResource } from "../../models/workflow";
 import { ProcessResource } from "../../models/process";
 
-interface ContensArguments {
+export interface ContentsArguments {
     limit?: number;
     offset?: number;
     order?: OrderBuilder;
@@ -24,16 +23,15 @@ interface ContensArguments {
 export type GroupContentsResource =
     CollectionResource |
     ProjectResource |
-    WorkflowResource |
     ProcessResource;
 
-export default class GroupsService extends CommonResourceService<GroupResource> {
+export class GroupsService<T extends GroupResource = GroupResource> extends CommonResourceService<T> {
 
     constructor(serverApi: AxiosInstance) {
         super(serverApi, "groups");
     }
 
-    contents(uuid: string, args: ContensArguments = {}): Promise<ListResults<GroupContentsResource>> {
+    contents(uuid: string, args: ContentsArguments = {}): Promise<ListResults<GroupContentsResource>> {
         const { filters, order, ...other } = args;
         const params = {
             ...other,
@@ -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"
+}