Merge branch '21128-toolbar-context-menu'

[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 7b1640ee021dfc1352816851149bf88a6938e72e..442a6ab94fc78dae1974459e6fc20c8013af405f 100644 (file)
--- a/src/services/project-service/project-service.ts
+++ b/src/services/project-service/project-service.ts
@@ -2,34 +2,27 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { GroupsService, ContentsArguments } 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 { GroupsService } from "../groups-service/groups-service";
+import { ProjectResource } from "models/project";
+import { GroupClass } from "models/group";
+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>) {
-        const projectData = { ...data, groupClass: GroupClass.Project };
-        return super.create(projectData);
+    create(data: Partial<ProjectResource>, showErrors?: boolean) {
+        const projectData = { ...data, groupClass: GroupClass.PROJECT };
+        return super.create(projectData, showErrors);
     }
 
     list(args: ListArguments = {}) {
         return super.list({
             ...args,
-            filters: this.addProjectFilter(args.filters)
+            filters: joinFilters(
+                args.filters || '',
+                new FilterBuilder()
+                    .addIn('group_class', [GroupClass.PROJECT, GroupClass.FILTER])
+                    .getFilters()
+            )
         });
     }
-
-    private addProjectFilter(filters?: FilterBuilder) {
-        return FilterBuilder
-            .create()
-            .concat(filters
-                ? filters
-                : FilterBuilder.create())
-            .concat(FilterBuilder
-                .create<ProjectResource>()
-                .addEqual("groupClass", GroupClass.Project));
-    }
 }