Merge branch '17585-Redesign-navigation-of-files-in-collections' into main

[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 ac16564a2df22a14c4608a11a6f687e192002fb7..07b083fdab34a06ed7890fa001172886ab960451 100644 (file)
--- a/src/services/project-service/project-service.ts
+++ b/src/services/project-service/project-service.ts
@@ -3,12 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 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";
-import { TrashableResourceService } from '~/services/common-service/trashable-resource-service';
-import { snakeCase } from 'lodash';
+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>) {
@@ -20,9 +18,9 @@ export class ProjectService extends GroupsService<ProjectResource> {
         return super.list({
             ...args,
             filters: joinFilters(
-                args.filters,
+                args.filters || '',
                 new FilterBuilder()
-                    .addEqual("groupClass", GroupClass.PROJECT)
+                    .addIn('group_class', [GroupClass.PROJECT, GroupClass.FILTER])
                     .getFilters()
             )
         });