X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f9dde5c781766b8be71d43d0f031c201a0edcfbb..30ef6aaa179aa1d18e70e2a54b1a997146328147:/src/services/project-service/project-service.ts diff --git a/src/services/project-service/project-service.ts b/src/services/project-service/project-service.ts index 5c686aae..07b083fd 100644 --- a/src/services/project-service/project-service.ts +++ b/src/services/project-service/project-service.ts @@ -3,12 +3,10 @@ // SPDX-License-Identifier: AGPL-3.0 import { GroupsService } from "../groups-service/groups-service"; -import { ProjectResource } from "~/models/project"; -import { GroupClass } from "~/models/group"; -import { ListArguments } from "~/services/common-service/common-service"; -import { FilterBuilder, joinFilters } from "~/services/api/filter-builder"; -import { TrashableResourceService } from '~/services/common-service/trashable-resource-service'; -import { snakeCase } from 'lodash'; +import { ProjectResource } from "models/project"; +import { GroupClass } from "models/group"; +import { ListArguments } from "services/common-service/common-service"; +import { FilterBuilder, joinFilters } from "services/api/filter-builder"; export class ProjectService extends GroupsService { create(data: Partial) { @@ -16,36 +14,13 @@ export class ProjectService extends GroupsService { return super.create(projectData); } - update(uuid: string, data: Partial) { - if (uuid && data && data.properties) { - const { properties } = data; - const mappedData = { - ...TrashableResourceService.mapKeys(snakeCase)(data), - properties, - }; - return TrashableResourceService - .defaultResponse( - this.serverApi - .put(this.resourceType + uuid, mappedData), - this.actions, - false - ); - } - return TrashableResourceService - .defaultResponse( - this.serverApi - .put(this.resourceType + uuid, data && TrashableResourceService.mapKeys(snakeCase)(data)), - this.actions - ); - } - list(args: ListArguments = {}) { return super.list({ ...args, filters: joinFilters( - args.filters, + args.filters || '', new FilterBuilder() - .addEqual("groupClass", GroupClass.PROJECT) + .addIn('group_class', [GroupClass.PROJECT, GroupClass.FILTER]) .getFilters() ) });