projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
workflow-view-middleware-service
[arvados-workbench2.git]
/
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 3ffaa35f8c9145fb6337f04c7bfb0ec868bd2f1f..2dc3eeb0a87f61ee5af40454802d4d8b09e9e860 100644
(file)
--- a/
src/services/project-service/project-service.ts
+++ b/
src/services/project-service/project-service.ts
@@
-5,8
+5,8
@@
import { GroupsService } from "../groups-service/groups-service";
import { ProjectResource } from "~/models/project";
import { GroupClass } from "~/models/group";
import { GroupsService } from "../groups-service/groups-service";
import { ProjectResource } from "~/models/project";
import { GroupClass } from "~/models/group";
-import { ListArguments } from "~/
common/api
/common-resource-service";
-import { FilterBuilder
} from "~/common
/api/filter-builder";
+import { ListArguments } from "~/
services/common-service
/common-resource-service";
+import { FilterBuilder
, joinFilters } from "~/services
/api/filter-builder";
export class ProjectService extends GroupsService<ProjectResource> {
export class ProjectService extends GroupsService<ProjectResource> {
@@
-18,18
+18,12
@@
export class ProjectService extends GroupsService<ProjectResource> {
list(args: ListArguments = {}) {
return super.list({
...args,
list(args: ListArguments = {}) {
return super.list({
...args,
- filters: this.addProjectFilter(args.filters)
+ filters: joinFilters(
+ args.filters,
+ new FilterBuilder()
+ .addEqual("groupClass", GroupClass.PROJECT)
+ .getFilters()
+ )
});
}
});
}
-
- private addProjectFilter(filters?: FilterBuilder) {
- return FilterBuilder
- .create()
- .concat(filters
- ? filters
- : FilterBuilder.create())
- .concat(FilterBuilder
- .create()
- .addEqual("groupClass", GroupClass.PROJECT));
- }
}
}