Merge branch 'master' into 14452-my-account

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

diff --git a/src/services/services.ts b/src/services/services.ts
index bd73c745d8e30a0a9747c8948c2696a1193f170f..d524405fe62000a889d980520e00ef0b9e771e79 100644 (file)
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -20,36 +20,54 @@ import { ResourceKind } from "~/models/resource";
 import { ContainerRequestService } from './container-request-service/container-request-service';
 import { ContainerService } from './container-service/container-service';
 import { LogService } from './log-service/log-service';
+import { ApiActions } from "~/services/api/api-actions";
+import { WorkflowService } from "~/services/workflow-service/workflow-service";
+import { SearchService } from '~/services/search-service/search-service';
+import { PermissionService } from "~/services/permission-service/permission-service";
+import { VirtualMachinesService } from "~/services/virtual-machines-service/virtual-machines-service";
+import { RepositoriesService } from '~/services/repositories-service/repositories-service';
+import { AuthorizedKeysService } from '~/services/authorized-keys-service/authorized-keys-service';
+import { VocabularyService } from '~/services/vocabulary-service/vocabulary-service';
+import { NodeService } from '~/services/node-service/node-service';
 
 export type ServiceRepository = ReturnType<typeof createServices>;
 
-export const createServices = (config: Config, progressFn: (id: string, working: boolean) => void) => {
+export const createServices = (config: Config, actions: ApiActions) => {
     const apiClient = Axios.create();
     apiClient.defaults.baseURL = config.baseUrl;
 
     const webdavClient = new WebDAV();
     webdavClient.defaults.baseURL = config.keepWebServiceUrl;
 
-    const containerRequestService = new ContainerRequestService(apiClient, progressFn);
-    const containerService = new ContainerService(apiClient, progressFn);
-    const groupsService = new GroupsService(apiClient, progressFn);
-    const keepService = new KeepService(apiClient, progressFn);
-    const linkService = new LinkService(apiClient, progressFn);
-    const logService = new LogService(apiClient, progressFn);
-    const projectService = new ProjectService(apiClient, progressFn);
-    const userService = new UserService(apiClient, progressFn);
+    const authorizedKeysService = new AuthorizedKeysService(apiClient, actions);
+    const containerRequestService = new ContainerRequestService(apiClient, actions);
+    const containerService = new ContainerService(apiClient, actions);
+    const groupsService = new GroupsService(apiClient, actions);
+    const keepService = new KeepService(apiClient, actions);
+    const linkService = new LinkService(apiClient, actions);
+    const logService = new LogService(apiClient, actions);
+    const nodeService = new NodeService(apiClient, actions);
+    const permissionService = new PermissionService(apiClient, actions);
+    const projectService = new ProjectService(apiClient, actions);
+    const repositoriesService = new RepositoriesService(apiClient, actions);
+    const userService = new UserService(apiClient, actions);
+    const virtualMachineService = new VirtualMachinesService(apiClient, actions);
+    const workflowService = new WorkflowService(apiClient, actions);
 
     const ancestorsService = new AncestorService(groupsService, userService);
-    const authService = new AuthService(apiClient, config.rootUrl, progressFn);
-    const collectionService = new CollectionService(apiClient, webdavClient, authService, progressFn);
+    const authService = new AuthService(apiClient, config.rootUrl, actions);
+    const collectionService = new CollectionService(apiClient, webdavClient, authService, actions);
     const collectionFilesService = new CollectionFilesService(collectionService);
     const favoriteService = new FavoriteService(linkService, groupsService);
     const tagService = new TagService(linkService);
+    const searchService = new SearchService();
+    const vocabularyService = new VocabularyService(config.vocabularyUrl);
 
     return {
         ancestorsService,
         apiClient,
         authService,
+        authorizedKeysService,
         collectionFilesService,
         collectionService,
         containerRequestService,
@@ -59,10 +77,17 @@ export const createServices = (config: Config, progressFn: (id: string, working:
         keepService,
         linkService,
         logService,
+        nodeService,
+        permissionService,
         projectService,
+        repositoriesService,
+        searchService,
         tagService,
         userService,
+        virtualMachineService,
         webdavClient,
+        workflowService,
+        vocabularyService,
     };
 };