projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13703-data-explorer-and-contents-api'
[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 1e5318530853fbbe4b947b45311261550a9f7235..ed61297dabe1fb82f78a50a08d6df05917f070a4 100644
(file)
--- a/
src/services/groups-service/groups-service.ts
+++ b/
src/services/groups-service/groups-service.ts
@@
-7,17
+7,10
@@
import CommonResourceService, { Resource, ListResults } from "../../common/api/c
import FilterBuilder from "../../common/api/filter-builder";
import OrderBuilder from "../../common/api/order-builder";
import { AxiosInstance } from "axios";
import FilterBuilder from "../../common/api/filter-builder";
import OrderBuilder from "../../common/api/order-builder";
import { AxiosInstance } from "axios";
-
-interface GroupResource extends Resource {
- name: string;
- groupClass: string;
- description: string;
- properties: string;
- writeableBy: string[];
- trashAt: string;
- deleteAt: string;
- isTrashed: boolean;
-}
+import { GroupResource } from "../../models/group";
+import { CollectionResource } from "../../models/collection";
+import { ProjectResource } from "../../models/project";
+import { ProcessResource } from "../../models/process";
interface ContensArguments {
limit?: number;
interface ContensArguments {
limit?: number;
@@
-27,17
+20,22
@@
interface ContensArguments {
recursive?: boolean;
}
recursive?: boolean;
}
+export type GroupContentsResource =
+ CollectionResource |
+ ProjectResource |
+ ProcessResource;
+
export default class GroupsService extends CommonResourceService<GroupResource> {
constructor(serverApi: AxiosInstance) {
super(serverApi, "groups");
}
export default class GroupsService extends CommonResourceService<GroupResource> {
constructor(serverApi: AxiosInstance) {
super(serverApi, "groups");
}
- contents
(uuid: string, args: ContensArguments = {}): Promise<ListResults<
Resource>> {
+ contents
(uuid: string, args: ContensArguments = {}): Promise<ListResults<GroupContents
Resource>> {
const { filters, order, ...other } = args;
const params = {
...other,
const { filters, order, ...other } = args;
const params = {
...other,
- filters: filters ? filters.
get
() : undefined,
+ filters: filters ? filters.
serialize
() : undefined,
order: order ? order.getOrder() : undefined
};
return this.serverApi
order: order ? order.getOrder() : undefined
};
return this.serverApi
@@
-46,4
+44,10
@@
export default class GroupsService extends CommonResourceService<GroupResource>
})
.then(CommonResourceService.mapResponseKeys);
}
})
.then(CommonResourceService.mapResponseKeys);
}
+}
+
+export enum GroupContentsResourcePrefix {
+ Collection = "collections",
+ Project = "groups",
+ Process = "container_requests"
}
\ No newline at end of file
}
\ No newline at end of file