projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14137-new-button
[arvados-workbench2.git]
/
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 e4c3167550990995ff0c3a3e1504b5383e883afa..b285e9285518505cf6e459d357ba72ee58acec05 100644
(file)
--- a/
src/services/groups-service/groups-service.ts
+++ b/
src/services/groups-service/groups-service.ts
@@
-3,21
+3,21
@@
// SPDX-License-Identifier: AGPL-3.0
import * as _ from "lodash";
// SPDX-License-Identifier: AGPL-3.0
import * as _ from "lodash";
-import { CommonResourceService, ListResults } from "~/common/api/common-resource-service";
-import { FilterBuilder } from "~/common/api/filter-builder";
-import { OrderBuilder } from "~/common/api/order-builder";
+import { CommonResourceService, ListResults } from "~/services/common-service/common-resource-service";
import { AxiosInstance } from "axios";
import { AxiosInstance } from "axios";
-import { GroupResource } from "~/models/group";
import { CollectionResource } from "~/models/collection";
import { ProjectResource } from "~/models/project";
import { ProcessResource } from "~/models/process";
import { CollectionResource } from "~/models/collection";
import { ProjectResource } from "~/models/project";
import { ProcessResource } from "~/models/process";
+import { TrashableResource } from "~/models/resource";
+import { TrashableResourceService } from "~/services/common-service/trashable-resource-service";
export interface ContentsArguments {
limit?: number;
offset?: number;
export interface ContentsArguments {
limit?: number;
offset?: number;
- order?:
OrderBuilder
;
- filters?:
FilterBuilder
;
+ order?:
string
;
+ filters?:
string
;
recursive?: boolean;
recursive?: boolean;
+ includeTrash?: boolean;
}
export type GroupContentsResource =
}
export type GroupContentsResource =
@@
-25,7
+25,7
@@
export type GroupContentsResource =
ProjectResource |
ProcessResource;
ProjectResource |
ProcessResource;
-export class GroupsService<T extends
GroupResource = GroupResource> extends Common
ResourceService<T> {
+export class GroupsService<T extends
TrashableResource = TrashableResource> extends Trashable
ResourceService<T> {
constructor(serverApi: AxiosInstance) {
super(serverApi, "groups");
constructor(serverApi: AxiosInstance) {
super(serverApi, "groups");
@@
-35,11
+35,11
@@
export class GroupsService<T extends GroupResource = GroupResource> extends Comm
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 this.serverApi
};
return this.serverApi
- .get(this.resourceType + `${uuid}/contents
/
`, {
+ .get(this.resourceType + `${uuid}/contents`, {
params: CommonResourceService.mapKeys(_.snakeCase)(params)
})
.then(CommonResourceService.mapResponseKeys);
params: CommonResourceService.mapKeys(_.snakeCase)(params)
})
.then(CommonResourceService.mapResponseKeys);