X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ecd0b3c069eed7d411e3cec7d707b43ab6675081..d0611f387f0ec0163fc8f6053a7715bc3d592700:/src/services/services.ts diff --git a/src/services/services.ts b/src/services/services.ts index 6434075c..2afb843f 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"; @@ -13,24 +13,23 @@ import { FavoriteService } from "./favorite-service/favorite-service"; import { CollectionService } from "./collection-service/collection-service"; import { TagService } from "./tag-service/tag-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 { 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"; @@ -69,7 +68,6 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient 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); @@ -80,7 +78,7 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient const ancestorsService = new AncestorService(groupsService, userService); - const idleTimeout = config && config.clusterConfig && config.clusterConfig.Workbench.IdleTimeout || '0s'; + const idleTimeout = (config && config.clusterConfig && config.clusterConfig.Workbench.IdleTimeout) || '0s'; const authService = new AuthService(apiClient, config.rootUrl, actions, (parse(idleTimeout, 's') || 0) > 0); @@ -106,7 +104,6 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient keepService, linkService, logService, - nodeService, permissionService, projectService, repositoriesService,