X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/aafa91ce918b23cff556f73e337ad8fe76ed578a..eb7235a7a2cf4c6b6f52b42ac8313de388235aa9:/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 c2b559b78b..f61b9eff05 100644 --- a/src/services/groups-service/groups-service.ts +++ b/src/services/groups-service/groups-service.ts @@ -3,14 +3,17 @@ // SPDX-License-Identifier: AGPL-3.0 import * as _ from "lodash"; -import { CommonResourceService, ListResults } from "~/services/common-service/common-resource-service"; -import { AxiosInstance } from "axios"; +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 { TrashableResource } from "~/models/resource"; +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; @@ -19,31 +22,51 @@ export interface ContentsArguments { filters?: string; recursive?: boolean; includeTrash?: boolean; + excludeHomeProject?: boolean; +} + +export interface SharedArguments extends ListArguments { + include?: string; } export type GroupContentsResource = CollectionResource | ProjectResource | - ProcessResource; + ProcessResource | + WorkflowResource; -export class GroupsService extends TrashableResourceService { +export class GroupsService extends TrashableResourceService { constructor(serverApi: AxiosInstance, actions: ApiActions) { super(serverApi, "groups", actions); } - contents(uuid: string, args: ContentsArguments = {}): Promise> { + async contents(uuid: string, args: ContentsArguments = {}, session?: Session): Promise> { 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 }; + } + + const response = await CommonResourceService.defaultResponse( + this.serverApi.get(this.resourceType + pathUrl, cfg), this.actions, false + ); + + return { ...TrashableResourceService.mapKeys(_.camelCase)(response), clusterId: session && session.clusterId }; + } + + shared(params: SharedArguments = {}): Promise> { return CommonResourceService.defaultResponse( this.serverApi - .get(this.resourceType + `${uuid}/contents`, { - params: CommonResourceService.mapKeys(_.snakeCase)(params) - }), + .get(this.resourceType + '/shared', { params }), this.actions ); } @@ -52,5 +75,6 @@ export class GroupsService exte export enum GroupContentsResourcePrefix { COLLECTION = "collections", PROJECT = "groups", - PROCESS = "container_requests" + PROCESS = "container_requests", + WORKFLOW = "workflows" }