fix: import constants from @devfile/api

Signed-off-by: Oleksii Orel <[email protected]>
eclipse-che · Dec 17, 2024 · 47d7f6d · 47d7f6d
1 parent 2f614a1
commit 47d7f6d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 47 deletions.
diff --git a/packages/dashboard-backend/jest.config.js b/packages/dashboard-backend/jest.config.js
@@ -21,7 +21,14 @@ module.exports = {
   moduleNameMapper: {
     // mapping for absolute imports (see tsconfig.json)
     '^@/(.*)$': '<rootDir>/src/$1',
+
+    // not everything we need is exported from the package
+    // so we need to alias the rest
+    '@devfile/api/constants(.*)$': '<rootDir>/../../node_modules/@devfile/api/constants/$1.ts',
   },
+  transformIgnorePatterns: [
+    'node_modules/(?!@devfile/api/constants/constants)',
+  ],
   collectCoverageFrom: [
     ...base.collectCoverageFrom,
 

diff --git a/packages/dashboard-backend/src/constants/devfile.ts b/packages/dashboard-backend/src/constants/devfile.ts
diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts
@@ -13,16 +13,16 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
 import { V1alpha2DevWorkspace } from '@devfile/api';
+import {
+  devworkspaceGroup,
+  devworkspaceLatestVersion,
+  devworkspacePlural,
+} from '@devfile/api/constants/constants';
 import { api } from '@eclipse-che/common';
 import * as mockClient from '@kubernetes/client-node';
 import { CustomObjectsApi } from '@kubernetes/client-node';
 import { IncomingMessage } from 'http';
 
-import {
-  devworkspaceGroup,
-  devworkspaceLatestVersion,
-  devworkspacePlural,
-} from '@/constants/devfile';
 import { DevWorkspaceApiService } from '@/devworkspaceClient/services/devWorkspaceApi';
 
 const namespace = 'user-che';

diff --git a/...ashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceClusterApi.spec.ts b/...ashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceClusterApi.spec.ts
@@ -11,14 +11,14 @@
  */
 
 import { V1alpha2DevWorkspace } from '@devfile/api';
-import * as mockClient from '@kubernetes/client-node';
-import { CustomObjectsApi } from '@kubernetes/client-node';
-
 import {
   devworkspaceGroup,
   devworkspaceLatestVersion,
   devworkspacePlural,
-} from '@/constants/devfile';
+} from '@devfile/api/constants/constants';
+import * as mockClient from '@kubernetes/client-node';
+import { CustomObjectsApi } from '@kubernetes/client-node';
+
 import {
   CheClusterCustomResource,
   CustomResourceDefinitionList,

diff --git a/...shboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts b/...shboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceTemplateApi.spec.ts
@@ -13,15 +13,15 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
 import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
-import { api } from '@eclipse-che/common';
-import * as mockClient from '@kubernetes/client-node';
-import { CustomObjectsApi } from '@kubernetes/client-node';
-
 import {
   devworkspacetemplateGroup,
   devworkspacetemplateLatestVersion,
   devworkspacetemplatePlural,
-} from '@/constants/devfile';
+} from '@devfile/api/constants/constants';
+import { api } from '@eclipse-che/common';
+import * as mockClient from '@kubernetes/client-node';
+import { CustomObjectsApi } from '@kubernetes/client-node';
+
 import {
   DevWorkspaceTemplateApiService,
   DevWorkspaceTemplateList,

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceApi.ts
@@ -11,16 +11,16 @@
  */
 
 import { V1alpha2DevWorkspace } from '@devfile/api';
+import {
+  devworkspaceGroup,
+  devworkspaceLatestVersion,
+  devworkspacePlural,
+} from '@devfile/api/constants/constants';
 import { api } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
 import { V1Status } from '@kubernetes/client-node';
 import http, { IncomingHttpHeaders } from 'http';
 
-import {
-  devworkspaceGroup,
-  devworkspaceLatestVersion,
-  devworkspacePlural,
-} from '@/constants/devfile';
 import { createError } from '@/devworkspaceClient/services/helpers/createError';
 import {
   CustomObjectAPI,

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceClusterApiService.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceClusterApiService.ts
@@ -11,16 +11,16 @@
  */
 
 import { V1alpha2DevWorkspace } from '@devfile/api';
+import {
+  devworkspaceGroup,
+  devworkspaceLatestVersion,
+  devworkspacePlural,
+} from '@devfile/api/constants/constants';
 import { api } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
 import { V1Status } from '@kubernetes/client-node';
 import http from 'http';
 
-import {
-  devworkspaceGroup,
-  devworkspaceLatestVersion,
-  devworkspacePlural,
-} from '@/constants/devfile';
 import { prepareCustomObjectWatch } from '@/devworkspaceClient/services/helpers/prepareCustomObjectWatch';
 import { ServerConfigApiService } from '@/devworkspaceClient/services/serverConfigApi';
 import { IDevWorkspaceClusterApi } from '@/devworkspaceClient/types';

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceTemplateApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceTemplateApi.ts
@@ -11,14 +11,14 @@
  */
 
 import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
-import { api } from '@eclipse-che/common';
-import * as k8s from '@kubernetes/client-node';
-
 import {
   devworkspacetemplateGroup,
   devworkspacetemplateLatestVersion,
   devworkspacetemplatePlural,
-} from '@/constants/devfile';
+} from '@devfile/api/constants/constants';
+import { api } from '@eclipse-che/common';
+import * as k8s from '@kubernetes/client-node';
+
 import { createError } from '@/devworkspaceClient/services/helpers/createError';
 import {
   CustomObjectAPI,

diff --git a/packages/dashboard-backend/webpack.config.common.js b/packages/dashboard-backend/webpack.config.common.js
@@ -44,6 +44,10 @@ module.exports = () => {
       alias: {
         // alias for absolute imports (see tsconfig.json)
         '@': path.resolve(__dirname, 'src/'),
+
+        // not everything we need is exported from the package
+        // so we need to alias the rest
+        '@devfile/api/constants/constants': path.resolve(__dirname, '../../node_modules/@devfile/api/constants/constants.ts'),
       },
     },
     resolveLoader: {},