Merge branch 'main' into 19482-wf-panel refs #19482

[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 d8b33f601f94c553e79e8be078f0dc2c9c4ee62f..a36ddba894c84a987f8f672c1a370a627f89b13c 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -2,86 +2,96 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as _ from "lodash";
-import { CommonResourceService } from '~/services/common-service/common-resource-service';
-import { ListResults, ListArguments } from '~/services/common-service/common-service';
-import { AxiosInstance } 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 { CancelToken } from 'axios';
+import { snakeCase, camelCase } from "lodash";
+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 { WorkflowResource } from 'models/workflow';
+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;
-    offset?: number;
-    order?: string;
-    filters?: string;
-    recursive?: boolean;
-    includeTrash?: boolean;
-    excludeHomeProject?: boolean;
+  limit?: number;
+  offset?: number;
+  order?: string;
+  filters?: string;
+  recursive?: boolean;
+  includeTrash?: boolean;
+  excludeHomeProject?: boolean;
 }
 
 export interface SharedArguments extends ListArguments {
-    include?: string;
+  include?: string;
 }
 
 export type GroupContentsResource =
-    CollectionResource |
-    ProjectResource |
-    ProcessResource;
+  | CollectionResource
+  | ProjectResource
+  | ProcessResource
+  | WorkflowResource;
 
-export class GroupsService<T extends GroupResource = GroupResource> extends TrashableResourceService<T> {
+export class GroupsService<
+  T extends GroupResource = GroupResource
+> extends TrashableResourceService<T> {
+  constructor(serverApi: AxiosInstance, actions: ApiActions) {
+    super(serverApi, 'groups', actions);
+  }
 
-    constructor(serverApi: AxiosInstance, actions: ApiActions) {
-        super(serverApi, "groups", actions);
+async contents(uuid: string, args: ContentsArguments = {}, session?: Session, cancelToken?: CancelToken): 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 };
     }
 
-    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
-        };
+    if (cancelToken) {
+      cfg.cancelToken = cancelToken;
+    }
 
-        const pathUrl = uuid ? `${uuid}/contents` : 'contents';
-        const response = await CommonResourceService.defaultResponse(
-                this.serverApi
-                    .get(this.resourceType + pathUrl, {
-                        params: CommonResourceService.mapKeys(_.snakeCase)(params)
-                    }),
-                this.actions, 
-                false
-            );
+    const response = await CommonResourceService.defaultResponse(
+      this.serverApi.get(this.resourceType + pathUrl, cfg),
+      this.actions,
+      false
+    );
 
-        const { items, ...res } = response;
-        const mappedItems = items.map((item: GroupContentsResource) => {
-            const mappedItem = TrashableResourceService.mapKeys(_.camelCase)(item);
-            if (item.kind === ResourceKind.COLLECTION || item.kind === ResourceKind.PROJECT) {
-                const { properties } = item;
-                return { ...mappedItem, properties };
-            } else {
-                return mappedItem;
-            }
-        });
-        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 }),
-            this.actions
-        );
-    }
+  shared(
+    params: SharedArguments = {}
+  ): Promise<ListResults<GroupContentsResource>> {
+    return CommonResourceService.defaultResponse(
+      this.serverApi.get(this.resourceType + '/shared', { params }),
+      this.actions
+    );
+  }
 }
 
 export enum GroupContentsResourcePrefix {
-    COLLECTION = "collections",
-    PROJECT = "groups",
-    PROCESS = "container_requests"
+  COLLECTION = 'collections',
+  PROJECT = 'groups',
+  PROCESS = 'container_requests',
+  WORKFLOW = 'workflows',
 }