fix: import constants from @devfile/api (#1280) (#1292)

Signed-off-by: Oleksii Orel <oorel@redhat.com> Co-authored-by: Oleksii Orel <oorel@redhat.com>
eclipse-che · Jan 14, 2025 · 6636a3f · 6636a3f
1 parent 7e58557
commit 6636a3f
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 28 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/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/__tests__/devWorkspaceApi.spec.ts
@@ -12,15 +12,15 @@
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
-import { api } from '@eclipse-che/common';
-import * as mockClient from '@kubernetes/client-node';
-import { CustomObjectsApi } from '@kubernetes/client-node';
+import { V1alpha2DevWorkspace } from '@devfile/api';
 import {
   devworkspaceGroup,
   devworkspaceLatestVersion,
   devworkspacePlural,
-  V1alpha2DevWorkspace,
-} from 'devfile-api';
+} 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 { DevWorkspaceApiService } from '@/devworkspaceClient/services/devWorkspaceApi';

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

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

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceApi.ts
@@ -10,15 +10,15 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { api } from '@eclipse-che/common';
-import * as k8s from '@kubernetes/client-node';
-import { V1Status } from '@kubernetes/client-node';
+import { V1alpha2DevWorkspace } from '@devfile/api';
 import {
   devworkspaceGroup,
   devworkspaceLatestVersion,
   devworkspacePlural,
-  V1alpha2DevWorkspace,
-} from 'devfile-api';
+} 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 { createError } from '@/devworkspaceClient/services/helpers/createError';

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceClusterApiService.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceClusterApiService.ts
@@ -10,15 +10,15 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { api } from '@eclipse-che/common';
-import * as k8s from '@kubernetes/client-node';
-import { V1Status } from '@kubernetes/client-node';
+import { V1alpha2DevWorkspace } from '@devfile/api';
 import {
   devworkspaceGroup,
   devworkspaceLatestVersion,
   devworkspacePlural,
-  V1alpha2DevWorkspace,
-} from 'devfile-api';
+} 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 { prepareCustomObjectWatch } from '@/devworkspaceClient/services/helpers/prepareCustomObjectWatch';

diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceTemplateApi.ts b/packages/dashboard-backend/src/devworkspaceClient/services/devWorkspaceTemplateApi.ts
@@ -10,14 +10,14 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { api } from '@eclipse-che/common';
-import * as k8s from '@kubernetes/client-node';
+import { V1alpha2DevWorkspaceTemplate } from '@devfile/api';
 import {
   devworkspacetemplateGroup,
   devworkspacetemplateLatestVersion,
   devworkspacetemplatePlural,
-  V1alpha2DevWorkspaceTemplate,
-} from 'devfile-api';
+} 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 {

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: {},