X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7adbd161925c71840bf4ddb799b87f1734e5af7e..a5f5a2ec8ae05ec2ad41dda0cd736dafe6cc669d:/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 f6521ce5..07b083fd 100644
--- a/src/services/project-service/project-service.ts
+++ b/src/services/project-service/project-service.ts
@@ -2,60 +2,27 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { serverApi } from "../../common/api/server-api";
-import { Dispatch } from "redux";
-import actions from "../../store/project/project-action";
-import { Project } from "../../models/project";
-import UrlBuilder from "../../common/api/url-builder";
-import FilterBuilder, { FilterField } 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> {
 
-interface GroupsResponse {
-    offset: number;
-    limit: number;
-    items: Array<{
-        href: string;
-        kind: string;
-        etag: string;
-        uuid: string;
-        owner_uuid: string;
-        created_at: string;
-        modified_by_client_uuid: string;
-        modified_by_user_uuid: string;
-        modified_at: string;
-        name: string;
-        group_class: string;
-        description: string;
-        writable_by: string[];
-        delete_at: string;
-        trash_at: string;
-        is_trashed: boolean;
-    }>;
-}
+    create(data: Partial<ProjectResource>) {
+        const projectData = { ...data, groupClass: GroupClass.PROJECT };
+        return super.create(projectData);
+    }
 
-export default class ProjectService {
-    public getProjectList = (parentUuid?: string) => (dispatch: Dispatch): Promise<Project[]> => {
-        dispatch(actions.PROJECTS_REQUEST());
-        if (parentUuid) {
-            const fb = new FilterBuilder();
-            fb.addLike(FilterField.OWNER_UUID, parentUuid);
-            return serverApi.get<GroupsResponse>('/groups', { params: {
-                filters: fb.get()
-            }}).then(groups => {
-                const projects = groups.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));
-                dispatch(actions.PROJECTS_SUCCESS({projects, parentItemId: parentUuid}));
-                return projects;
-            });
-        } else {
-            dispatch(actions.PROJECTS_SUCCESS({projects: [], parentItemId: parentUuid}));
-            return Promise.resolve([]);
-        }
+    list(args: ListArguments = {}) {
+        return super.list({
+            ...args,
+            filters: joinFilters(
+                args.filters || '',
+                new FilterBuilder()
+                    .addIn('group_class', [GroupClass.PROJECT, GroupClass.FILTER])
+                    .getFilters()
+            )
+        });
     }
 }