X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5e9c2244747eff9fc02ff3c0d140bdde5e0b6845..f75b0aa3966895160535bad24b05c1a763665a5a:/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 b69483cb3b..025314eb77 100644 --- a/src/services/groups-service/groups-service.ts +++ b/src/services/groups-service/groups-service.ts @@ -5,81 +5,93 @@ 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"; +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 | - WorkflowResource; + | CollectionResource + | ProjectResource + | ProcessResource + | WorkflowResource; -export class GroupsService extends TrashableResourceService { +export class GroupsService< + T extends GroupResource = GroupResource +> extends TrashableResourceService { + 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> { - 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 }; - } - - if (cancelToken) { - cfg.cancelToken = cancelToken; - } +async contents(uuid: string, args: ContentsArguments = {}, session?: Session, cancelToken?: CancelToken): 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), + }; - const response = await CommonResourceService.defaultResponse( - this.serverApi.get(this.resourceType + pathUrl, cfg), this.actions, false - ); - - return { ...TrashableResourceService.mapKeys(camelCase)(response), clusterId: session && session.clusterId }; + if (session) { + cfg.baseURL = session.baseUrl; + cfg.headers = { Authorization: 'Bearer ' + session.token }; } - shared(params: SharedArguments = {}): Promise> { - return CommonResourceService.defaultResponse( - this.serverApi - .get(this.resourceType + '/shared', { params }), - this.actions - ); + if (cancelToken) { + cfg.cancelToken = cancelToken; } + + 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 + '/shared', { params }), + this.actions + ); + } } export enum GroupContentsResourcePrefix { - COLLECTION = "collections", - PROJECT = "groups", - PROCESS = "container_requests", - WORKFLOW = "workflows" + COLLECTION = 'collections', + PROJECT = 'groups', + PROCESS = 'container_requests', + WORKFLOW = 'workflows', }