chore: use absolute paths for imports (#941)

* chore: use absolute paths for imports Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com> * fixup! chore: use absolute paths for imports --------- Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>
eclipse-che · Oct 11, 2023 · bc51275 · bc51275
1 parent 7486131
commit bc51275
Show file tree

Hide file tree

Showing 576 changed files with 3,402 additions and 2,408 deletions.
diff --git a/.deps/dev.md b/.deps/dev.md
@@ -165,6 +165,7 @@
 | [`@types/jest@29.5.3`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/jsdom@20.0.1`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/json-schema@7.0.12`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
+| [`@types/json5@0.0.29`](https://www.github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/jsonfile@6.1.1`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/less@3.0.3`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/lodash@4.14.197`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | #4131 |
@@ -241,6 +242,7 @@
 | [`array-ify@1.0.0`](https://github.com/stevemao/array-ify.git) | MIT | clearlydefined |
 | [`array-includes@3.1.6`](git://github.com/es-shims/array-includes.git) | MIT | #4577 |
 | [`array-union@2.1.0`](https://github.com/sindresorhus/array-union.git) | MIT | clearlydefined |
+| [`array.prototype.findlastindex@1.2.3`](git+https://github.com/es-shims/Array.prototype.findLastIndex.git) | MIT | #9900 |
 | [`array.prototype.flat@1.3.1`](git://github.com/es-shims/Array.prototype.flat.git) | MIT | #4574 |
 | [`array.prototype.flatmap@1.3.1`](git://github.com/es-shims/Array.prototype.flatMap.git) | MIT | #4651 |
 | [`array.prototype.tosorted@1.1.1`](git+https://github.com/es-shims/Array.prototype.toSorted.git) | MIT | #5051 |
@@ -354,6 +356,7 @@
 | [`default-browser-id@3.0.0`](https://github.com/sindresorhus/default-browser-id.git) | MIT | clearlydefined |
 | [`default-browser@4.0.0`](https://github.com/sindresorhus/default-browser.git) | MIT | clearlydefined |
 | [`defaults@1.0.4`](git://github.com/sindresorhus/node-defaults.git) | MIT | clearlydefined |
+| [`define-data-property@1.1.0`](git+https://github.com/ljharb/define-data-property.git) | MIT | #10591 |
 | [`define-lazy-prop@2.0.0`](https://github.com/sindresorhus/define-lazy-prop.git) | MIT | clearlydefined |
 | [`define-properties@1.2.0`](git://github.com/ljharb/define-properties.git) | MIT | #7116 |
 | [`del@6.1.1`](https://github.com/sindresorhus/del.git) | MIT | clearlydefined |
@@ -397,10 +400,15 @@
 | [`escalade@3.1.1`](https://github.com/lukeed/escalade.git) | MIT | clearlydefined |
 | [`escodegen@2.1.0`](http://github.com/estools/escodegen.git) | BSD-2-Clause | #9306 |
 | [`eslint-config-prettier@9.0.0`](https://github.com/prettier/eslint-config-prettier.git) | MIT | (clearlydefined)[https://clearlydefined.io/definitions/npm/npmjs/-/eslint-config-prettier/9.0.0] |
+| [`eslint-import-resolver-node@0.3.9`](https://github.com/import-js/eslint-plugin-import) | MIT | #9923 |
+| [`eslint-module-utils@2.8.0`](git+https://github.com/import-js/eslint-plugin-import.git) | MIT | #8209 |
+| [`eslint-plugin-import@2.28.1`](https://github.com/import-js/eslint-plugin-import) | MIT | #9927 |
+| [`eslint-plugin-no-relative-import-paths@1.5.2`](https://github.com/MelvinVermeer/eslint-plugin-no-relative-import-paths) | ISC | clearlydefined |
 | [`eslint-plugin-notice@0.9.10`](https://github.com/nickdeis/eslint-plugin-notice) | MIT | clearlydefined |
 | [`eslint-plugin-prettier@5.0.0`](git+https://github.com/prettier/eslint-plugin-prettier.git) | MIT | clearlydefined |
 | [`eslint-plugin-react-hooks@4.6.0`](https://github.com/facebook/react.git) | MIT | clearlydefined |
 | [`eslint-plugin-react@7.33.2`](https://github.com/jsx-eslint/eslint-plugin-react) | MIT | #9877 |
+| [`eslint-plugin-simple-import-sort@10.0.0`](https://github.com/lydell/eslint-plugin-simple-import-sort.git) | MIT | clearlydefined |
 | [`eslint-scope@5.1.1`](https://github.com/eslint/eslint-scope.git) | BSD-2-Clause | clearlydefined |
 | [`eslint-visitor-keys@3.4.3`](https://github.com/eslint/eslint-visitor-keys.git) | Apache-2.0 | #7729 |
 | [`eslint-webpack-plugin@4.0.1`](https://github.com/webpack-contrib/eslint-webpack-plugin.git) | MIT | clearlydefined |
@@ -682,6 +690,7 @@
 | [`object.assign@4.1.4`](git://github.com/ljharb/object.assign.git) | MIT | #3232 |
 | [`object.entries@1.1.6`](git://github.com/es-shims/Object.entries.git) | MIT | #4671 |
 | [`object.fromentries@2.0.6`](git://github.com/es-shims/Object.fromEntries.git) | MIT | #4600 |
+| [`object.groupby@1.0.1`](git+https://github.com/es-shims/Object.groupBy.git) | MIT | #10360 |
 | [`object.hasown@1.1.2`](https://github.com/es-shims/Object.hasOwn.git) | MIT | #4667 |
 | [`object.values@1.1.6`](git://github.com/es-shims/Object.values.git) | MIT | #4665 |
 | [`onetime@5.1.2`](https://github.com/sindresorhus/onetime.git) | MIT | clearlydefined |
@@ -809,6 +818,7 @@
 | [`schema-utils@4.2.0`](https://github.com/webpack/schema-utils.git) | MIT | #8986 |
 | [`serialize-javascript@6.0.1`](git+https://github.com/yahoo/serialize-javascript.git) | BSD-3-Clause | clearlydefined |
 | [`set-blocking@2.0.0`](git+https://github.com/yargs/set-blocking.git) | ISC | #5899 |
+| [`set-function-name@2.0.1`](git+https://github.com/ljharb/set-function-name.git) | MIT | #10590 |
 | [`shallow-clone@3.0.1`](https://github.com/jonschlinkert/shallow-clone.git) | MIT | clearlydefined |
 | [`shebang-command@2.0.0`](https://github.com/kevva/shebang-command.git) | MIT | clearlydefined |
 | [`shebang-regex@3.0.0`](https://github.com/sindresorhus/shebang-regex.git) | MIT | clearlydefined |
@@ -889,7 +899,7 @@
 | [`ts-api-utils@1.0.1`](https://github.com/JoshuaKGoldberg/ts-api-utils) | MIT | clearlydefined |
 | [`ts-jest@29.1.1`](git+https://github.com/kulshekhar/ts-jest.git) | MIT | clearlydefined |
 | [`ts-loader@9.4.4`](https://github.com/TypeStrong/ts-loader.git) | MIT | #5028 |
-| [`tsconfig-paths@4.2.0`](https://github.com/dividab/tsconfig-paths) | MIT | #7709 |
+| [`tsconfig-paths@3.14.2`](https://github.com/dividab/tsconfig-paths) | MIT | clearlydefined |
 | [`tuf-js@1.1.7`](git+https://github.com/theupdateframework/tuf-js.git) | MIT | #7585 |
 | [`type-check@0.4.0`](git://github.com/gkz/type-check.git) | MIT | clearlydefined |
 | [`type-detect@4.0.8`](git+ssh://git@github.com/chaijs/type-detect.git) | MIT | clearlydefined |

diff --git a/packages/dashboard-backend/.eslintrc.js b/packages/dashboard-backend/.eslintrc.js
@@ -17,6 +17,11 @@ module.exports = {
   extends: [
     '../../.eslintrc.js',
   ],
+  plugins: [
+    'import',
+    'no-relative-import-paths',
+    'simple-import-sort',
+  ],
   rules: {
     'notice/notice': [
       'error',
@@ -28,5 +33,16 @@ module.exports = {
         },
       },
     ],
+
+    'simple-import-sort/imports': 'error',
+    'simple-import-sort/exports': 'error',
+    "import/first": "error",
+    "import/newline-after-import": "error",
+    "import/no-duplicates": "error",
+
+    "no-relative-import-paths/no-relative-import-paths": [
+      "error",
+      { "allowSameFolder": false, 'prefix': '@', 'rootDir': 'src' }
+    ]
   },
 };
diff --git a/packages/dashboard-backend/.vscode/settings.json b/packages/dashboard-backend/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+ "editor.tabSize": 2,
+  "search.exclude": {
+    "**/lib": true,
+    "**/coverage": true
+  },
+  "typescript.preferences.importModuleSpecifier": "non-relative",
+  "javascript.preferences.importModuleSpecifier": "non-relative"
+}
diff --git a/packages/dashboard-backend/jest.config.js b/packages/dashboard-backend/jest.config.js
@@ -18,6 +18,10 @@ module.exports = {
   moduleDirectories: [
     'node_modules',
   ],
+  moduleNameMapper: {
+    // mapping for absolute imports (see tsconfig.json)
+    '^@/(.*)$': '<rootDir>/src/$1',
+  },
   collectCoverageFrom: [
     ...base.collectCoverageFrom,
 

diff --git a/packages/dashboard-backend/package.json b/packages/dashboard-backend/package.json
@@ -61,8 +61,11 @@
     "copy-webpack-plugin": "^11.0.0",
     "eslint": "^8.46.0",
     "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-no-relative-import-paths": "^1.5.2",
     "eslint-plugin-notice": "^0.9.10",
     "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-webpack-plugin": "^4.0.1",
     "file-loader": "^6.2.0",
     "jest": "^29.7.0",

diff --git a/packages/dashboard-backend/src/__tests__/app.spec.ts b/packages/dashboard-backend/src/__tests__/app.spec.ts
@@ -11,7 +11,8 @@
  */
 
 import process from 'process';
-import { setup, teardown } from '../helpers/tests/appBuilder';
+
+import { setup, teardown } from '@/helpers/tests/appBuilder';
 
 const mockProcessExit = jest.fn();
 (process as any).exit = mockProcessExit.mockImplementation(code => {

diff --git a/packages/dashboard-backend/src/app.ts b/packages/dashboard-backend/src/app.ts
@@ -10,34 +10,36 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
+import 'reflect-metadata';
+
 import { helpers } from '@eclipse-che/common';
 import { FastifyInstance } from 'fastify';
-import 'reflect-metadata';
-import parseArgs from './helpers/parseArgs';
-import { isLocalRun, registerLocalRun } from './localRun';
-import { registerCors } from './plugins/cors';
-import { registerStaticServer } from './plugins/staticServer';
-import { registerSwagger } from './plugins/swagger';
-import { registerWebSocket } from './plugins/webSocket';
-import { registerClusterConfigRoute } from './routes/api/clusterConfig';
-import { registerClusterInfoRoute } from './routes/api/clusterInfo';
-import { registerDevworkspaceResourcesRoute } from './routes/api/devworkspaceResources';
-import { registerDevworkspacesRoutes } from './routes/api/devworkspaces';
-import { registerDevWorkspaceTemplates } from './routes/api/devworkspaceTemplates';
-import { registerDockerConfigRoutes } from './routes/api/dockerConfig';
-import { registerEventsRoutes } from './routes/api/events';
-import { registerKubeConfigRoute } from './routes/api/kubeConfig';
-import { registerPodmanLoginRoute } from './routes/api/podmanLogin';
-import { registerPersonalAccessTokenRoutes } from './routes/api/personalAccessToken';
-import { registerPodsRoutes } from './routes/api/pods';
-import { registerServerConfigRoute } from './routes/api/serverConfig';
-import { registerUserProfileRoute } from './routes/api/userProfile';
-import { registerWebsocket } from './routes/api/websocket';
-import { registerYamlResolverRoute } from './routes/api/yamlResolver';
-import { registerFactoryAcceptanceRedirect } from './routes/factoryAcceptanceRedirect';
-import { registerWorkspaceRedirect } from './routes/workspaceRedirect';
-import { registerGitConfigRoutes } from './routes/api/gitConfig';
-import { registerGettingStartedSamplesRoutes } from './routes/api/gettingStartedSample';
+
+import parseArgs from '@/helpers/parseArgs';
+import { isLocalRun, registerLocalRun } from '@/localRun';
+import { registerCors } from '@/plugins/cors';
+import { registerStaticServer } from '@/plugins/staticServer';
+import { registerSwagger } from '@/plugins/swagger';
+import { registerWebSocket } from '@/plugins/webSocket';
+import { registerClusterConfigRoute } from '@/routes/api/clusterConfig';
+import { registerClusterInfoRoute } from '@/routes/api/clusterInfo';
+import { registerDevworkspaceResourcesRoute } from '@/routes/api/devworkspaceResources';
+import { registerDevworkspacesRoutes } from '@/routes/api/devworkspaces';
+import { registerDevWorkspaceTemplates } from '@/routes/api/devworkspaceTemplates';
+import { registerDockerConfigRoutes } from '@/routes/api/dockerConfig';
+import { registerEventsRoutes } from '@/routes/api/events';
+import { registerGettingStartedSamplesRoutes } from '@/routes/api/gettingStartedSample';
+import { registerGitConfigRoutes } from '@/routes/api/gitConfig';
+import { registerKubeConfigRoute } from '@/routes/api/kubeConfig';
+import { registerPersonalAccessTokenRoutes } from '@/routes/api/personalAccessToken';
+import { registerPodmanLoginRoute } from '@/routes/api/podmanLogin';
+import { registerPodsRoutes } from '@/routes/api/pods';
+import { registerServerConfigRoute } from '@/routes/api/serverConfig';
+import { registerUserProfileRoute } from '@/routes/api/userProfile';
+import { registerWebsocket } from '@/routes/api/websocket';
+import { registerYamlResolverRoute } from '@/routes/api/yamlResolver';
+import { registerFactoryAcceptanceRedirect } from '@/routes/factoryAcceptanceRedirect';
+import { registerWorkspaceRedirect } from '@/routes/workspaceRedirect';
 
 export default async function buildApp(server: FastifyInstance): Promise<void> {
   const cheHost = process.env.CHE_HOST as string;

diff --git a/packages/dashboard-backend/src/constants/schemas.ts b/packages/dashboard-backend/src/constants/schemas.ts
@@ -10,9 +10,10 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { dockerConfigExample, devWorkspaceResourcesExample } from './examples';
 import { JSONSchema7 } from 'json-schema';
 
+import { devWorkspaceResourcesExample, dockerConfigExample } from '@/constants/examples';
+
 export const authenticationHeaderSchema: JSONSchema7 = {
   type: 'object',
   properties: {

diff --git a/packages/dashboard-backend/src/devworkspaceClient/__mocks__/index.ts b/packages/dashboard-backend/src/devworkspaceClient/__mocks__/index.ts
@@ -10,7 +10,6 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { IDevWorkspaceClient } from '..';
 import {
   IDevWorkspaceApi,
   IDevWorkspaceTemplateApi,
@@ -22,7 +21,9 @@ import {
   IPodApi,
   IServerConfigApi,
   IUserProfileApi,
-} from '../types';
+} from '@/devworkspaceClient/types';
+
+import { IDevWorkspaceClient } from '..';
 
 export class DevWorkspaceClient implements IDevWorkspaceClient {
   get eventApi(): IEventApi {

diff --git a/packages/dashboard-backend/src/devworkspaceClient/__tests__/index.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/__tests__/index.spec.ts
@@ -12,18 +12,20 @@
 
 import * as mockClientNode from '@kubernetes/client-node';
 import { KubeConfig } from '@kubernetes/client-node';
+
+import { DevWorkspaceApiService } from '@/devworkspaceClient/services/devWorkspaceApi';
+import { DevWorkspaceTemplateApiService } from '@/devworkspaceClient/services/devWorkspaceTemplateApi';
+import { DockerConfigApiService } from '@/devworkspaceClient/services/dockerConfigApi';
+import { EventApiService } from '@/devworkspaceClient/services/eventApi';
+import { GettingStartedSamplesApiService } from '@/devworkspaceClient/services/gettingStartedSamplesApi';
+import { GitConfigApiService } from '@/devworkspaceClient/services/gitConfigApi';
+import { KubeConfigApiService } from '@/devworkspaceClient/services/kubeConfigApi';
+import { LogsApiService } from '@/devworkspaceClient/services/logsApi';
+import { PodApiService } from '@/devworkspaceClient/services/podApi';
+import { ServerConfigApiService } from '@/devworkspaceClient/services/serverConfigApi';
+import { UserProfileApiService } from '@/devworkspaceClient/services/userProfileApi';
+
 import { DevWorkspaceClient } from '..';
-import { DevWorkspaceApiService } from '../services/devWorkspaceApi';
-import { DevWorkspaceTemplateApiService } from '../services/devWorkspaceTemplateApi';
-import { DockerConfigApiService } from '../services/dockerConfigApi';
-import { EventApiService } from '../services/eventApi';
-import { GitConfigApiService } from '../services/gitConfigApi';
-import { KubeConfigApiService } from '../services/kubeConfigApi';
-import { LogsApiService } from '../services/logsApi';
-import { PodApiService } from '../services/podApi';
-import { ServerConfigApiService } from '../services/serverConfigApi';
-import { UserProfileApiService } from '../services/userProfileApi';
-import { GettingStartedSamplesApiService } from '../services/gettingStartedSamplesApi';
 
 jest.mock('../services/devWorkspaceApi.ts');
 

diff --git a/packages/dashboard-backend/src/devworkspaceClient/index.ts b/packages/dashboard-backend/src/devworkspaceClient/index.ts
@@ -11,19 +11,20 @@
  */
 
 import * as k8s from '@kubernetes/client-node';
-import { DevWorkspaceApiService } from './services/devWorkspaceApi';
-import { DevWorkspaceTemplateApiService } from './services/devWorkspaceTemplateApi';
-import { DockerConfigApiService } from './services/dockerConfigApi';
-import { EventApiService } from './services/eventApi';
-import { GettingStartedSamplesApiService } from './services/gettingStartedSamplesApi';
-import { GitConfigApiService } from './services/gitConfigApi';
-import { KubeConfigApiService } from './services/kubeConfigApi';
-import { LogsApiService } from './services/logsApi';
-import { PersonalAccessTokenService } from './services/personalAccessTokenApi';
-import { PodApiService } from './services/podApi';
-import { PodmanApiService } from './services/podmanApi';
-import { ServerConfigApiService } from './services/serverConfigApi';
-import { UserProfileApiService } from './services/userProfileApi';
+
+import { DevWorkspaceApiService } from '@/devworkspaceClient/services/devWorkspaceApi';
+import { DevWorkspaceTemplateApiService } from '@/devworkspaceClient/services/devWorkspaceTemplateApi';
+import { DockerConfigApiService } from '@/devworkspaceClient/services/dockerConfigApi';
+import { EventApiService } from '@/devworkspaceClient/services/eventApi';
+import { GettingStartedSamplesApiService } from '@/devworkspaceClient/services/gettingStartedSamplesApi';
+import { GitConfigApiService } from '@/devworkspaceClient/services/gitConfigApi';
+import { KubeConfigApiService } from '@/devworkspaceClient/services/kubeConfigApi';
+import { LogsApiService } from '@/devworkspaceClient/services/logsApi';
+import { PersonalAccessTokenService } from '@/devworkspaceClient/services/personalAccessTokenApi';
+import { PodApiService } from '@/devworkspaceClient/services/podApi';
+import { PodmanApiService } from '@/devworkspaceClient/services/podmanApi';
+import { ServerConfigApiService } from '@/devworkspaceClient/services/serverConfigApi';
+import { UserProfileApiService } from '@/devworkspaceClient/services/userProfileApi';
 import {
   IDevWorkspaceApi,
   IDevWorkspaceClient,
@@ -39,7 +40,7 @@ import {
   IPodmanApi,
   IServerConfigApi,
   IUserProfileApi,
-} from './types';
+} from '@/devworkspaceClient/types';
 
 export * from './types';
 

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts
@@ -19,11 +19,11 @@ import {
   V1alpha2DevWorkspace,
 } from '@devfile/api';
 import { api } from '@eclipse-che/common';
-import { IPatch } from '@eclipse-che/common/src/dto/api';
 import * as mockClient from '@kubernetes/client-node';
 import { CustomObjectsApi } from '@kubernetes/client-node';
 import { IncomingMessage } from 'http';
-import { DevWorkspaceApiService } from '../devWorkspaceApi';
+
+import { DevWorkspaceApiService } from '@/devworkspaceClient/services/devWorkspaceApi';
 
 const namespace = 'user-che';
 const name = 'wksp-name';
@@ -138,7 +138,7 @@ describe('DevWorkspace API Service', () => {
   });
 
   test('patching', async () => {
-    const patches: IPatch[] = [
+    const patches: api.IPatch[] = [
       {
         op: 'replace',
         path: '/metadata/annotations',

diff --git a/...shboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts b/...shboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts
@@ -18,13 +18,14 @@ import {
   devworkspacetemplatePlural,
   V1alpha2DevWorkspaceTemplate,
 } from '@devfile/api';
-import { IPatch } from '@eclipse-che/common/src/dto/api';
+import { api } from '@eclipse-che/common';
 import * as mockClient from '@kubernetes/client-node';
 import { CustomObjectsApi } from '@kubernetes/client-node';
+
 import {
   DevWorkspaceTemplateApiService,
   DevWorkspaceTemplateList,
-} from '../devWorkspaceTemplateApi';
+} from '@/devworkspaceClient/services/devWorkspaceTemplateApi';
 
 const namespace = 'user-che';
 const name = 'tmpl-name';
@@ -128,7 +129,7 @@ describe('DevWorkspaceTemplate API Service', () => {
   });
 
   test('patching', async () => {
-    const patches: IPatch[] = [
+    const patches: api.IPatch[] = [
       {
         op: 'replace',
         path: '/metadata/annotations',

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/dockerConfigApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/dockerConfigApi.spec.ts
@@ -14,7 +14,12 @@
 
 import * as mockClient from '@kubernetes/client-node';
 import { CoreV1Api, V1Secret } from '@kubernetes/client-node';
-import { DockerConfigApiService, SECRET_KEY, SECRET_NAME } from '../dockerConfigApi';
+
+import {
+  DockerConfigApiService,
+  SECRET_KEY,
+  SECRET_NAME,
+} from '@/devworkspaceClient/services/dockerConfigApi';
 
 describe('Docker Config API Service', () => {
   let dockerConfigService: DockerConfigApiService;

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/eventApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/eventApi.spec.ts
@@ -15,7 +15,8 @@
 import { api } from '@eclipse-che/common';
 import * as mockClient from '@kubernetes/client-node';
 import { CoreV1Api, CoreV1Event, V1Status } from '@kubernetes/client-node';
-import { EventApiService } from '../eventApi';
+
+import { EventApiService } from '@/devworkspaceClient/services/eventApi';
 
 jest.mock('../helpers/prepareCustomObjectWatch');
 

diff --git a/...hboard-backend/src/devworkspaceClient/services/__tests__/gettingStartedSamplesApi.spec.ts b/...hboard-backend/src/devworkspaceClient/services/__tests__/gettingStartedSamplesApi.spec.ts
@@ -10,9 +10,10 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import * as mockClient from '@kubernetes/client-node';
-import { GettingStartedSamplesApiService } from '../gettingStartedSamplesApi';
 import { api } from '@eclipse-che/common';
+import * as mockClient from '@kubernetes/client-node';
+
+import { GettingStartedSamplesApiService } from '@/devworkspaceClient/services/gettingStartedSamplesApi';
 
 describe('Getting Started Samples API Service', () => {
   const env = process.env;