Merge branch 'master' into 13765-information-inside-details-panel

[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 bc34081811fdbbdd6aaa14437087ab82549a08fa..9ce9e2131446f8ba28c7e3ecb8814f36ca28e1f1 100644 (file)
--- a/src/services/project-service/project-service.ts
+++ b/src/services/project-service/project-service.ts
@@ -2,49 +2,35 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { serverApi } from "../../common/api/server-api";
-import { Dispatch } from "redux";
-import { Project } from "../../models/project";
-import FilterBuilder, { FilterField } from "../../common/api/filter-builder";
-import { ArvadosResource } from "../response";
+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";
 
-interface GroupResource extends ArvadosResource {
-    name: string;
-    group_class: string;
-    description: string;
-    writable_by: string[];
-    delete_at: string;
-    trash_at: string;
-    is_trashed: boolean;
-}
+export default class ProjectService extends GroupsService<ProjectResource> {
 
-interface GroupsResponse {
-    offset: number;
-    limit: number;
-    items: GroupResource[];
-}
+    create(data: Partial<ProjectResource>) {
+        const projectData = { ...data, groupClass: GroupClass.Project };
+        return super.create(projectData);
+    }
+
+    list(args: ListArguments = {}) {
+        return super.list({
+            ...args,
+            filters: this.addProjectFilter(args.filters)
+        });
+    }
 
-export default class ProjectService {
-    public getProjectList = (parentUuid?: string): Promise<Project[]> => {
-        if (parentUuid) {
-            const fb = new FilterBuilder();
-            fb.addLike(FilterField.OWNER_UUID, parentUuid);
-            return serverApi.get<GroupsResponse>('/groups', { params: {
-                filters: fb.get()
-            }}).then(resp => {
-                const projects = resp.data.items.map(g => ({
-                    name: g.name,
-                    createdAt: g.created_at,
-                    modifiedAt: g.modified_at,
-                    href: g.href,
-                    uuid: g.uuid,
-                    ownerUuid: g.owner_uuid,
-                    kind: g.kind
-                } as Project));
-                return projects;
-            });
-        } else {
-            return Promise.resolve([]);
-        }
+    private addProjectFilter(filters?: FilterBuilder) {
+        return FilterBuilder
+            .create()
+            .concat(filters
+                ? filters
+                : FilterBuilder.create())
+            .concat(FilterBuilder
+                .create<ProjectResource>()
+                .addEqual("groupClass", GroupClass.Project));
     }
-}
+
+}
\ No newline at end of file