Merge pull request #963 from yaacov/clean-legacy

🐾 Remove legacy requirements

package.json

@@ -6,10 +6,15 @@
   "private": true,
   "repository": "https://github.com/kubev2v/forklift-console-plugin.git",
   "workspaces": [
-    "packages/*"
+    "packages/eslint-plugin",
+    "packages/build",
+    "packages/webpack",
+    "packages/types",
+    "packages/common",
+    "packages/forklift-console-plugin"
   ],
   "config": {
-    "libs": "-w @kubev2v/webpack -w @kubev2v/types -w @kubev2v/legacy -w @kubev2v/common -w @kubev2v/mocks"
+    "libs": "-w @kubev2v/webpack -w @kubev2v/types -w @kubev2v/common"
   },
   "scripts": {
     "clean": "rm -rf ./dist ./coverage && npm run clean -ws --if-present",

packages/common/package.json

@@ -34,10 +34,11 @@
     "@patternfly/react-core": "4.276.6",
     "@patternfly/react-table": "4.112.39",
     "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "react-i18next": "^11.7.3",
     "react-query": "^3.39.2",
-    "react-router": "5.2.0",
-    "react-router-dom": "5.2.0"
+    "react-router": "5.3.x",
+    "react-router-dom": "5.3.x"
   },
   "devDependencies": {
     "@storybook/addon-essentials": "^7.0.14",
@@ -51,8 +52,6 @@
     "@storybook/testing-library": "^0.0.14-next.2",
     "eslint-plugin-storybook": "^0.6.12",
     "prop-types": "^15.8.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
     "sass": "^1.63.3",
     "storybook": "^7.0.14"
   }

packages/forklift-console-plugin/jest.config.ts

@@ -17,9 +17,7 @@ const moduleNameMapper = {
   }),
 
   // Mappings for monorepo packages
-  '@kubev2v/legacy/(.*)$': '<rootDir>/../legacy/dist/$1',
   '@kubev2v/common/(.*)$': '<rootDir>/../common/dist/$1',
-  '@kubev2v/mocks/(.*)$': '<rootDir>/../mocks/dist/$1',
   '@kubev2v/types/(.*)$': '<rootDir>/../types/dist/$1',
 };
 

packages/forklift-console-plugin/package.json

@@ -15,7 +15,7 @@
     "i18n": "i18next \"./src/**/*.{js,jsx,ts,tsx}\" [-oc] -c ./i18next-parser.config.mjs",
     "build": "NODE_ENV=production webpack",
     "build:dev": "webpack --progress",
-    "start": "msw init ./dist --save; NODE_ENV=development webpack serve",
+    "start": "NODE_ENV=development webpack serve",
     "lint": "eslint . && stylelint \"src/**/*.css\" --allow-empty-input",
     "lint:fix": "eslint . --fix && stylelint \"src/**/*.css\" --allow-empty-input --fix",
     "test": "TZ=UTC jest",
@@ -24,14 +24,11 @@
   },
   "dependencies": {
     "@kubev2v/common": "*",
-    "@kubev2v/legacy": "*",
-    "@migtools/lib-ui": "8.4.1",
     "@types/jsrsasign": "10.5.12",
     "immer": "^10.0.3",
     "jsonpath": "^1.1.1",
     "jsrsasign": "11.1.0",
     "luxon": "^3.3.0",
-    "msw": "^1.2.3",
     "streamsaver": "^2.0.6",
     "use-immer": "^0.9.0",
     "uuid": "^9.0.1"
@@ -41,15 +38,14 @@
     "@openshift/dynamic-plugin-sdk": "3.0.0",
     "@patternfly/react-core": "4.276.6",
     "@patternfly/react-table": "4.112.39",
-    "@patternfly/react-charts": "6.94.18",
+    "@patternfly/react-charts": "7.2.1",
     "react-dom": "^17.0.1",
     "react": "^17.0.1",
     "react-i18next": "^11.7.3",
-    "react-router": "5.2.0",
-    "react-router-dom": "5.2.0"
+    "react-router": "5.3.x",
+    "react-router-dom": "5.3.x"
   },
   "devDependencies": {
-    "@kubev2v/mocks": "*",
     "@kubev2v/types": "*",
     "@kubev2v/webpack": "*",
     "@openshift-console/dynamic-plugin-sdk-webpack": "0.0.9",
@@ -67,8 +63,5 @@
     "webpack": "^5.79.0",
     "webpack-cli": "^5.0.2",
     "webpack-dev-server": "^4.15.1"
-  },
-  "msw": {
-    "workerDirectory": "dist"
   }
 }

packages/forklift-console-plugin/plugin-extensions.ts

@@ -1,16 +1,13 @@
 import type { EncodedExtension } from '@openshift/dynamic-plugin-sdk';
 import type { NavSection } from '@openshift-console/dynamic-plugin-sdk';
 
-import { extensions as mockConsoleExtensions } from './src/__mock-console-extension/dynamic-plugin';
 import { extensions as networkMapExtensions } from './src/modules/NetworkMaps/dynamic-plugin';
 import { extensions as overviewExtensions } from './src/modules/Overview/dynamic-plugin';
 import { extensions as planExtensions } from './src/modules/Plans/dynamic-plugin';
 import { extensions as providerExtensions } from './src/modules/Providers/dynamic-plugin';
 import { extensions as storageMapExtensions } from './src/modules/StorageMaps/dynamic-plugin';
 
 const extensions: EncodedExtension[] = [
-  ...mockConsoleExtensions,
-
   {
     type: 'console.navigation/section',
     properties: {

packages/forklift-console-plugin/plugin-metadata.ts

@@ -1,6 +1,5 @@
 import type { ConsolePluginMetadata } from '@openshift-console/dynamic-plugin-sdk-webpack/lib/schema/plugin-package';
 
-import { exposedModules as mockExtensionModules } from './src/__mock-console-extension/dynamic-plugin';
 import { exposedModules as networkMapModules } from './src/modules/NetworkMaps/dynamic-plugin';
 import { exposedModules as overviewModules } from './src/modules/Overview/dynamic-plugin';
 import { exposedModules as planModules } from './src/modules/Plans/dynamic-plugin';
@@ -15,16 +14,12 @@ const pluginMetadata: ConsolePluginMetadata = {
   description:
     'Forklift is a suite of migration tools that facilitate the migration of VM workloads to KubeVirt.',
   exposedModules: {
-    ...mockExtensionModules,
     ...overviewModules,
     ...providerModules,
     ...planModules,
     ...networkMapModules,
     ...storageMapModules,
   },
-  dependencies: {
-    '@console/pluginAPI': '>=4.11',
-  },
 };
 
 export default pluginMetadata;

packages/forklift-console-plugin/src/modules/NetworkMaps/views/list/components/ProviderLinkCell.tsx

@@ -6,7 +6,7 @@ import { ProviderModelGroupVersionKind } from '@kubev2v/types';
 import { CellProps } from './CellProps';
 
 export const ProviderLinkCell: React.FC<CellProps> = ({ data, fieldId }) => {
-  const provider = data.obj.spec.provider[fieldId];
+  const provider = data.obj?.spec?.provider?.[fieldId];
   const { name, namespace } = provider || {};
 
   if (!provider) {

packages/forklift-console-plugin/src/modules/Overview/hooks/useProvidersInventoryIsLive.ts

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
-import { getInventoryApiUrl } from 'legacy/src/queries/helpers';
+import { getInventoryApiUrl } from 'src/modules/Providers/utils';
 
 import { consoleFetchJSON } from '@openshift-console/dynamic-plugin-sdk';