X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/6fdd4a4d609cf8fa459786f42eb337f8da6a5afa..8e812c1e720af23a4fa50a492981940cddd4f7f3:/src/services/services.ts diff --git a/src/services/services.ts b/src/services/services.ts index af547dec..b9118981 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -4,7 +4,7 @@ import Axios from "axios"; import { AxiosInstance } from "axios"; -import { ApiClientAuthorizationService } from '~/services/api-client-authorization-service/api-client-authorization-service'; +import { ApiClientAuthorizationService } from 'services/api-client-authorization-service/api-client-authorization-service'; import { AuthService } from "./auth-service/auth-service"; import { GroupsService } from "./groups-service/groups-service"; import { ProjectService } from "./project-service/project-service"; @@ -12,27 +12,27 @@ import { LinkService } from "./link-service/link-service"; import { FavoriteService } from "./favorite-service/favorite-service"; 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"; +import { WebDAV } from "common/webdav"; +import { Config } from "common/config"; import { UserService } from './user-service/user-service'; -import { AncestorService } from "~/services/ancestors-service/ancestors-service"; -import { ResourceKind } from "~/models/resource"; +import { AncestorService } from "services/ancestors-service/ancestors-service"; +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'; -import { FileViewersConfigService } from '~/services/file-viewers-config-service/file-viewers-config-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'; +import { FileViewersConfigService } from 'services/file-viewers-config-service/file-viewers-config-service'; import { LinkAccountService } from "./link-account-service/link-account-service"; +import parse from "parse-duration"; export type ServiceRepository = ReturnType; @@ -79,9 +79,12 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient const linkAccountService = new LinkAccountService(apiClient, actions); const ancestorsService = new AncestorService(groupsService, userService); - const authService = new AuthService(apiClient, config.rootUrl, actions); + + const idleTimeout = (config && config.clusterConfig && config.clusterConfig.Workbench.IdleTimeout) || '0s'; + const authService = new AuthService(apiClient, config.rootUrl, actions, + (parse(idleTimeout, 's') || 0) > 0); + 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(); @@ -94,7 +97,6 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient apiClientAuthorizationService, authService, authorizedKeysService, - collectionFilesService, collectionService, containerRequestService, containerService,