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 350128fb8606af535fd8cd2fbcd0450279b6bb37..87c668f2ae4ca3ff3e9b36e0f6bb16d3c51a96e8 100644 (file)
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -4,34 +4,50 @@
 
 import { AuthService } from "./auth-service/auth-service";
 import { GroupsService } from "./groups-service/groups-service";
-import { authClient, apiClient } from "../common/api/server-api";
 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 { 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;
+
     authService: AuthService;
     groupsService: GroupsService;
     projectService: ProjectService;
     linkService: LinkService;
     favoriteService: FavoriteService;
+    tagService: TagService;
+    collectionService: CollectionService;
+    collectionFilesService: CollectionFilesService;
 }
 
 export const createServices = (baseUrl: string): ServiceRepository => {
-    authClient.defaults.baseURL = baseUrl;
-    apiClient.defaults.baseURL = baseUrl + "/arvados/v1";
+    const apiClient = Axios.create();
+    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 CollectionService(apiClient);
+    const tagService = new TagService(linkService);
+    const collectionFilesService = new CollectionFilesService(collectionService);
 
     return {
+        apiClient,
         authService,
         groupsService,
         projectService,
         linkService,
-        favoriteService
+        favoriteService,
+        collectionService,
+        tagService,
+        collectionFilesService
     };
 };