Merge branch 'master' into 14078-obtain-configuration-data-from-discovery-endpoint

refs #14078

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --combined src/services/services.ts
index 8ddc3f477403be59e73d981bdcbac9f8a2fab499,1fa35fcaae2694f82dea51b9959dd54aaf8b7044..183deefb4548393dfc677e7b29ce61a0b1c8f016
--- 1/src/services/services.ts
--- 2/src/services/services.ts
+++ b/src/services/services.ts
@@@ -19,18 -19,18 +19,18 @@@ export type ServiceRepository = ReturnT
  
  export const createServices = (config: Config) => {
      const apiClient = Axios.create();
 -    apiClient.defaults.baseURL = `${config.apiHost}/arvados/v1`;
 +    apiClient.defaults.baseURL = config.baseUrl;
  
      const webdavClient = new WebDAV();
 -    webdavClient.defaults.baseURL = config.keepWebHost;
 +    webdavClient.defaults.baseURL = config.keepWebServiceUrl;
  
 -    const authService = new AuthService(apiClient, config.apiHost);
 +    const authService = new AuthService(apiClient, config.rootUrl);
      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 CollectionService(apiClient, keepService, webdavClient, authService);
+     const collectionService = new CollectionService(apiClient, webdavClient, authService);
      const tagService = new TagService(linkService);
      const collectionFilesService = new CollectionFilesService(collectionService);