X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/25216cc7acedc987c26a159f0b640210c0ef101e..16d7bc7663c99f73f8f129d60021e6f3ebaec2a4:/src/services/common-service/common-resource-service.ts diff --git a/src/services/common-service/common-resource-service.ts b/src/services/common-service/common-resource-service.ts index 69c4bac3ac..d9be8dae9f 100644 --- a/src/services/common-service/common-resource-service.ts +++ b/src/services/common-service/common-resource-service.ts @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0 import { AxiosInstance } from "axios"; -import * as _ from "lodash"; -import { Resource } from "src/models/resource"; +import { snakeCase } from "lodash"; +import { Resource } from "models/resource"; import { ApiActions } from "services/api/api-actions"; import { CommonService } from "services/common-service/common-service"; @@ -26,31 +26,34 @@ export class CommonResourceService extends CommonService ])); } - create(data?: Partial) { + create(data?: Partial, showErrors?: boolean) { let payload: any; if (data !== undefined) { this.readOnlyFields.forEach( field => delete data[field] ); payload = { - [this.resourceType.slice(0, -1)]: CommonService.mapKeys(_.snakeCase)(data), + [this.resourceType.slice(0, -1)]: CommonService.mapKeys(snakeCase)(data), }; } - return super.create(payload); + return super.create(payload, showErrors); } - update(uuid: string, data: Partial) { + update(uuid: string, data: Partial, showErrors?: boolean, select?: string[]) { let payload: any; if (data !== undefined) { this.readOnlyFields.forEach( field => delete data[field] ); payload = { - [this.resourceType.slice(0, -1)]: CommonService.mapKeys(_.snakeCase)(data), + [this.resourceType.slice(0, -1)]: CommonService.mapKeys(snakeCase)(data), + }; + if (select !== undefined && select.length > 0) { + payload.select = ['uuid', ...select.map(field => snakeCase(field))]; }; } - return super.update(uuid, payload); + return super.update(uuid, payload, showErrors); } } export const getCommonResourceServiceError = (errorResponse: any) => { - if ('errors' in errorResponse && 'errorToken' in errorResponse) { + if ('errors' in errorResponse) { const error = errorResponse.errors.join(''); switch (true) { case /UniqueViolation/.test(error):