projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Obtain configuration from discovery endpoint
[arvados.git]
/
src
/
common
/
api
/
common-resource-service.ts
diff --git
a/src/common/api/common-resource-service.ts
b/src/common/api/common-resource-service.ts
index 8ad8fe916ee48e7ef7cf373c105530a224b1c1a2..caa4d760c9e08ef1c7af63bf86e90b34a03d4ebb 100644
(file)
--- a/
src/common/api/common-resource-service.ts
+++ b/
src/common/api/common-resource-service.ts
@@
-3,16
+3,14
@@
// SPDX-License-Identifier: AGPL-3.0
import * as _ from "lodash";
// SPDX-License-Identifier: AGPL-3.0
import * as _ from "lodash";
-import { FilterBuilder } from "./filter-builder";
-import { OrderBuilder } from "./order-builder";
import { AxiosInstance, AxiosPromise } from "axios";
import { AxiosInstance, AxiosPromise } from "axios";
-import { Resource } from "
../..
/models/resource";
+import { Resource } from "
~
/models/resource";
export interface ListArguments {
limit?: number;
offset?: number;
export interface ListArguments {
limit?: number;
offset?: number;
- filters?:
FilterBuilder
;
- order?:
OrderBuilder
;
+ filters?:
string
;
+ order?:
string
;
select?: string[];
distinct?: boolean;
count?: string;
select?: string[];
distinct?: boolean;
count?: string;
@@
-68,10
+66,10
@@
export class CommonResourceService<T extends Resource> {
this.resourceType = '/' + resourceType + '/';
}
this.resourceType = '/' + resourceType + '/';
}
- create(data
: Partial<T>
) {
+ create(data
?: Partial<T> | any
) {
return CommonResourceService.defaultResponse(
this.serverApi
return CommonResourceService.defaultResponse(
this.serverApi
- .post<T>(this.resourceType, CommonResourceService.mapKeys(_.snakeCase)(data)));
+ .post<T>(this.resourceType,
data &&
CommonResourceService.mapKeys(_.snakeCase)(data)));
}
delete(uuid: string): Promise<T> {
}
delete(uuid: string): Promise<T> {
@@
-90,8
+88,8
@@
export class CommonResourceService<T extends Resource> {
const { filters, order, ...other } = args;
const params = {
...other,
const { filters, order, ...other } = args;
const params = {
...other,
- filters: filters ?
filters.serialize()
: undefined,
- order: order ? order
.getOrder()
: undefined
+ filters: filters ?
`[${filters}]`
: undefined,
+ order: order ? order : undefined
};
return CommonResourceService.defaultResponse(
this.serverApi
};
return CommonResourceService.defaultResponse(
this.serverApi
@@
-104,7
+102,7
@@
export class CommonResourceService<T extends Resource> {
return CommonResourceService.defaultResponse(
this.serverApi
.put<T>(this.resourceType + uuid, data));
return CommonResourceService.defaultResponse(
this.serverApi
.put<T>(this.resourceType + uuid, data));
-
+
}
}
}
}