refs #13989 Merge branch 'origin/13989-webdav-service'

[arvados-workbench2.git] / src / services / services.ts

diff --git a/src/services/services.ts b/src/services/services.ts
index 0d19cee55344c51cc565f32d260786a7f1342d06..99f802dfe079521074c2fa143297e0d1bca0cb2d 100644 (file)
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2,51 +2,50 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+import Axios, { AxiosInstance } from "axios";
 import { AuthService } from "./auth-service/auth-service";
 import { GroupsService } from "./groups-service/groups-service";
 import { ProjectService } from "./project-service/project-service";
 import { LinkService } from "./link-service/link-service";
 import { FavoriteService } from "./favorite-service/favorite-service";
-import { AxiosInstance } from "axios";
-import { CommonResourceService } from "../common/api/common-resource-service";
-import { CollectionResource } from "../models/collection";
-import { Resource } from "../models/resource";
-import Axios from "axios";
+import { CollectionService } from "./collection-service/collection-service";
+import { TagService } from "./tag-service/tag-service";
+import { CollectionFilesService } from "./collection-files-service/collection-files-service";
+import { KeepService } from "./keep-service/keep-service";
+import { WebDAV } from "../common/webdav";
+import { Config } from "../common/config";
 
-export interface ServiceRepository {
-    apiClient: AxiosInstance;
-    authClient: AxiosInstance;
+export type ServiceRepository = ReturnType<typeof createServices>;
 
-    authService: AuthService;
-    groupsService: GroupsService;
-    projectService: ProjectService;
-    linkService: LinkService;
-    favoriteService: FavoriteService;
-    collectionService: CommonResourceService<Resource>;
-}
-
-export const createServices = (baseUrl: string): ServiceRepository => {
-    const authClient = Axios.create();
+export const createServices = (config: Config) => {
     const apiClient = Axios.create();
+    apiClient.defaults.baseURL = `${config.apiHost}/arvados/v1`;
 
-    authClient.defaults.baseURL = baseUrl;
-    apiClient.defaults.baseURL = `${baseUrl}/arvados/v1`;
+    const webdavClient = new WebDAV();
+    webdavClient.defaults.baseURL = config.keepWebHost;
 
-    const authService = new AuthService(authClient, apiClient);
+    const authService = new AuthService(apiClient, config.apiHost);
+    const keepService = new KeepService(apiClient);
     const groupsService = new GroupsService(apiClient);
     const projectService = new ProjectService(apiClient);
     const linkService = new LinkService(apiClient);
     const favoriteService = new FavoriteService(linkService, groupsService);
-    const collectionService = new CommonResourceService<CollectionResource>(apiClient, "collections");
+    const collectionService = new CollectionService(apiClient, keepService);
+    const tagService = new TagService(linkService);
+    const collectionFilesService = new CollectionFilesService(collectionService);
 
     return {
         apiClient,
-        authClient,
+        webdavClient,
         authService,
+        keepService,
         groupsService,
         projectService,
         linkService,
         favoriteService,
-        collectionService
+        collectionService,
+        tagService,
+        collectionFilesService
     };
 };
+