Merge branch 'master' into 13854-tags-card

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

diff --git a/src/services/services.ts b/src/services/services.ts
index 0d19cee55344c51cc565f32d260786a7f1342d06..87c668f2ae4ca3ff3e9b36e0f6bb16d3c51a96e8 100644 (file)
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -8,45 +8,46 @@ 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 { CollectionService } from "./collection-service/collection-service";
+import { TagService } from "./tag-service/tag-service";
 import Axios from "axios";
+import { CollectionFilesService } from "./collection-files-service/collection-files-service";
 
 export interface ServiceRepository {
     apiClient: AxiosInstance;
-    authClient: AxiosInstance;
 
     authService: AuthService;
     groupsService: GroupsService;
     projectService: ProjectService;
     linkService: LinkService;
     favoriteService: FavoriteService;
-    collectionService: CommonResourceService<Resource>;
+    tagService: TagService;
+    collectionService: CollectionService;
+    collectionFilesService: CollectionFilesService;
 }
 
 export const createServices = (baseUrl: string): ServiceRepository => {
-    const authClient = Axios.create();
     const apiClient = Axios.create();
-
-    authClient.defaults.baseURL = baseUrl;
     apiClient.defaults.baseURL = `${baseUrl}/arvados/v1`;
 
-    const authService = new AuthService(authClient, apiClient);
+    const authService = new AuthService(apiClient, baseUrl);
     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);
+    const tagService = new TagService(linkService);
+    const collectionFilesService = new CollectionFilesService(collectionService);
 
     return {
         apiClient,
-        authClient,
         authService,
         groupsService,
         projectService,
         linkService,
         favoriteService,
-        collectionService
+        collectionService,
+        tagService,
+        collectionFilesService
     };
 };