projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15672-filters-translation-fix'
[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..eec5a9409adc9aa090783cc9843a86487581c69d 100644
(file)
--- a/
src/services/project-service/project-service.ts
+++ b/
src/services/project-service/project-service.ts
@@
-5,9
+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-service";
+import { FilterBuilder, joinFilters } from "~/services/api/filter-builder";
export class ProjectService extends GroupsService<ProjectResource> {
create(data: Partial<ProjectResource>) {
export class ProjectService extends GroupsService<ProjectResource> {
create(data: Partial<ProjectResource>) {
@@
-18,18
+17,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("group_class", GroupClass.PROJECT)
+ .getFilters()
+ )
});
}
});
}
-
- private addProjectFilter(filters?: FilterBuilder) {
- return FilterBuilder
- .create()
- .concat(filters
- ? filters
- : FilterBuilder.create())
- .concat(FilterBuilder
- .create()
- .addEqual("groupClass", GroupClass.PROJECT));
- }
}
}