Merge pull request #1299 from yaacov/update-index-files

🧼 Update index files in plugin code

.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 dist/
+distlib/
 coverage/
 tmp/
 yarn-error.log

package.json

@@ -49,6 +49,7 @@
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-typescript": "^11.0.0",
+    "@rollup/plugin-url": "^8.0.2",
     "@rollup/pluginutils": "^5.0.2",
     "@testing-library/cypress": "^9.0.0",
     "@testing-library/jest-dom": "^5.16.5",

packages/eslint-plugin/cspell.wordlist.txt

@@ -84,3 +84,4 @@ inputgroup
 pvc
 pvcs
 LUKS
+distlib

packages/forklift-console-plugin/package.json

@@ -9,12 +9,18 @@
     "url": "https://github.com/kubev2v/forklift-console-plugin.git",
     "directory": "packages/forklift-console-plugin"
   },
+  "files": [
+    "./distlib/*"
+  ],
+  "main": "./distlib/index.js",
+  "types": "./distlib/index.d.ts",
   "scripts": {
-    "clean": "rm -rf ./dist ./coverage tsconfig.tsbuildinfo",
+    "clean": "rm -rf ./dist ./distlib ./coverage tsconfig.tsbuildinfo",
     "clean:all": "npm run clean -- ./node_modules ./.rollup.cache",
     "i18n": "i18next \"./src/**/*.{js,jsx,ts,tsx}\" [-oc] -c ./i18next-parser.config.mjs",
     "build": "NODE_ENV=production webpack",
     "start": "NODE_ENV=development webpack serve",
+    "buildlib": "rollup -c --bundleConfigAsCjs",
     "lint": "eslint . && stylelint \"src/**/*.css\" --allow-empty-input",
     "lint:fix": "eslint . --fix && stylelint \"src/**/*.css\" --allow-empty-input --fix",
     "test": "TZ=UTC jest",
@@ -23,7 +29,9 @@
   },
   "dependencies": {
     "@kubev2v/common": "*",
+    "@kubev2v/types": "0.0.19",
     "@types/jsrsasign": "10.5.12",
+    "js-base64": "^3.7.7",
     "immer": "^10.0.3",
     "jsonpath": "^1.1.1",
     "jsrsasign": "11.1.0",
@@ -37,14 +45,15 @@
     "@patternfly/react-core": "4.276.6",
     "@patternfly/react-table": "4.112.39",
     "@patternfly/react-icons": "5.2.1",
+    "@patternfly/react-tokens": "^5.3.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-i18next": "^11.7.3",
+    "react-linkify": "^1.0.0-alpha",
     "react-router": "5.3.x",
     "react-router-dom": "5.3.x"
   },
   "devDependencies": {
-    "@kubev2v/types": "0.0.19",
     "@kubev2v/webpack": "*",
     "@openshift-console/dynamic-plugin-sdk-webpack": "0.0.11",
     "@types/react": "^17.0.1",
@@ -55,7 +64,6 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
     "mini-svg-data-uri": "^1.4.4",
-    "react-linkify": "^1.0.0-alpha",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.6",
     "ts-loader": "^9.3.1",

packages/forklift-console-plugin/rollup.config.js

@@ -0,0 +1,43 @@
+/* eslint-env node */
+import css from 'rollup-plugin-import-css';
+
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
+import typescript from '@rollup/plugin-typescript';
+import url from '@rollup/plugin-url';
+
+import pkg from './package.json';
+
+const getExternalModules = ({ dependencies, peerDependencies }) =>
+  Array.from(new Set([...Object.keys(dependencies ?? {}), ...Object.keys(peerDependencies ?? {})]));
+
+const externalModules = getExternalModules(pkg);
+
+export default {
+  input: './src/index.ts',
+  output: {
+    file: 'distlib/index.js',
+    format: 'esm',
+    sourcemap: true,
+  },
+  external: externalModules.map((m) => new RegExp(`^${m}(\\/.+)*$`)),
+  plugins: [
+    url({
+      include: ['**/*.svg'],
+      limit: 0,
+      fileName: '[name][hash][extname]',
+    }),
+    commonjs(),
+    json({
+      compact: true,
+      preferConst: true,
+    }),
+    css({
+      output: 'index.css',
+    }),
+    typescript({
+      tsconfig: './tsconfig.json',
+      jsx: 'react',
+    }),
+  ],
+};

packages/forklift-console-plugin/src/index.ts

@@ -0,0 +1,4 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './modules';
+export * from './utils';
+// @endindex

packages/forklift-console-plugin/src/modules/Hooks/index.ts

@@ -0,0 +1,3 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './dynamic-plugin';
+// @endindex

packages/forklift-console-plugin/src/modules/Migrations/index.ts

@@ -0,0 +1,3 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './dynamic-plugin';
+// @endindex

packages/forklift-console-plugin/src/modules/NetworkMaps/index.ts

@@ -0,0 +1,7 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './actions';
+export * from './componenets';
+export * from './utils';
+export * from './views';
+export * from './yamlTemplates';
+// @endindex

packages/forklift-console-plugin/src/modules/NetworkMaps/views/index.ts

@@ -0,0 +1,4 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './details';
+export * from './list';
+// @endindex

packages/forklift-console-plugin/src/modules/Overview/index.ts

@@ -1,5 +1,4 @@
 // @index(['./*', /style/g], f => `export * from '${f.path}';`)
-export * from './dynamic-plugin';
 export * from './hooks';
 export * from './modal';
 export * from './views';

packages/forklift-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/WelcomeCard.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-import automationIcon from 'src/modules/Overview/images/automation.svg';
+import automationIcon from '../../../../../images/automation.svg';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { V1beta1ForkliftController } from '@kubev2v/types';

packages/forklift-console-plugin/src/modules/Plans/actions/PlanActionsDropdownItems.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { DropdownItemLink } from 'src/components/actions/DropdownItemLink';
 import { useModal } from 'src/modules/Providers/modals';
-import { getResourceUrl } from 'src/modules/Providers/utils';
+import { getResourceUrl } from 'src/modules/Providers/utils/helpers';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import { PlanModel, PlanModelRef } from '@kubev2v/types';

packages/forklift-console-plugin/src/modules/Plans/componenets/PlansEmptyState.tsx → packages/forklift-console-plugin/src/modules/Plans/components/PlansEmptyState.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import ForkliftEmptyState from 'src/components/empty-states/ForkliftEmptyState';
-import digitalTransformation from 'src/modules/Overview/images/digitalTransormation.svg';
 import { getResourceUrl } from 'src/modules/Providers/utils';
 import { useHasSufficientProviders } from 'src/utils/fetch';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
@@ -10,13 +9,15 @@ import { ExternalLink } from '@kubev2v/common';
 import { ProviderModelRef } from '@kubev2v/types';
 import { Button, Flex, FlexItem } from '@patternfly/react-core';
 
+import digitalTransformation from '../..//Overview/images/digitalTransormation.svg';
+
 import PlansAddButton from './PlansAddButton';
 
 const HELP_LINK_HREF =
   'https://docs.redhat.com/en/documentation/migration_toolkit_for_virtualization/';
 
 const AutomationIcon = () => (
-  <img src={digitalTransformation} className="forklift-empty-state__icon" />
+  <img alt="automation icon" src={digitalTransformation} className="forklift-empty-state__icon" />
 );
 
 const PlansEmptyState: React.FC<{ namespace: string }> = ({ namespace }) => {

packages/forklift-console-plugin/src/modules/Plans/index.ts

@@ -0,0 +1,7 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './actions';
+export * from './components';
+export * from './hooks';
+export * from './modals';
+export * from './views';
+// @endindex

packages/forklift-console-plugin/src/modules/Plans/modals/DuplicateModal.tsx

@@ -2,7 +2,8 @@ import React, { ReactNode, useCallback, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useToggle } from 'src/modules/Providers/hooks';
 import { AlertMessageForModals, useModal } from 'src/modules/Providers/modals';
-import { validateK8sName, Validation } from 'src/modules/Providers/utils';
+import { Validation } from 'src/modules/Providers/utils/types';
+import { validateK8sName } from 'src/modules/Providers/utils/validators';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { FormGroupWithHelpText } from '@kubev2v/common';
@@ -22,7 +23,7 @@ import { k8sCreate, k8sPatch } from '@openshift-console/dynamic-plugin-sdk';
 import { K8sModel, useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { Button, Form, Modal, ModalVariant, TextInput } from '@patternfly/react-core';
 
-import { Suspend } from '../views/details/components';
+import { Suspend } from '../views/details/components/Suspend';
 
 /**
  * Props for the DeleteModal component

packages/forklift-console-plugin/src/modules/Plans/views/details/components/ProvidersSection/ProvidersSection.tsx

@@ -1,6 +1,6 @@
 import React, { useReducer } from 'react';
-import { Suspend } from 'src/modules/Plans/views/details/components';
-import { DetailsItem } from 'src/modules/Providers/utils';
+import { Suspend } from 'src/modules/Plans/views/details/components/Suspend';
+import { DetailsItem } from 'src/modules/Providers/utils/components/DetailsPage';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import { ProviderModelGroupVersionKind, V1beta1Plan, V1beta1Provider } from '@kubev2v/types';

packages/forklift-console-plugin/src/modules/Plans/views/index.ts

@@ -0,0 +1,5 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './create';
+export * from './details';
+export * from './list';
+// @endindex

packages/forklift-console-plugin/src/modules/Plans/views/list/PlansListPage.tsx

@@ -9,8 +9,8 @@ import { PlanModel, PlanModelGroupVersionKind, V1beta1Plan } from '@kubev2v/type
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { HelperText, HelperTextItem } from '@patternfly/react-core';
 
-import { PlansAddButton } from '../../componenets';
-import PlansEmptyState from '../../componenets/PlansEmptyState';
+import { PlansAddButton } from '../../components';
+import PlansEmptyState from '../../components/PlansEmptyState';
 import { getPlanPhase, PlanData, planPhases } from '../../utils';
 
 import PlanRow from './PlanRow';

packages/forklift-console-plugin/src/modules/Providers/hooks/useProvidersInventoryList.ts

@@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from 'react';
 import { ProviderInventory, ProvidersInventoryList } from '@kubev2v/types';
 import { consoleFetchJSON } from '@openshift-console/dynamic-plugin-sdk';
 
-import { getInventoryApiUrl, hasObjectChangedInGivenFields } from '../utils';
+import { getInventoryApiUrl, hasObjectChangedInGivenFields } from '../utils/helpers';
 
 import { DEFAULT_FIELDS_TO_COMPARE } from './utils';
 

packages/forklift-console-plugin/src/modules/Providers/hooks/useTlsCertificate.ts

@@ -3,7 +3,7 @@ import { KJUR, pemtohex, X509, zulutodate } from 'jsrsasign';
 
 import { consoleFetch } from '@openshift-console/dynamic-plugin-sdk';
 
-import { getServicesApiUrl } from '../utils';
+import { getServicesApiUrl } from '../utils/helpers';
 
 /**
  * @param value PEM encoded certificate

packages/forklift-console-plugin/src/modules/Providers/images/index.ts

@@ -0,0 +1,4 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './cloudNative.svg';
+export * from './modernizeMigration.svg';
+// @endindex

packages/forklift-console-plugin/src/modules/Providers/index.ts

@@ -0,0 +1,8 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './actions';
+export * from './hooks';
+export * from './images';
+export * from './modals';
+export * from './utils';
+export * from './views';
+// @endindex

packages/forklift-console-plugin/src/modules/Providers/modals/DeleteModal/DeleteModal.tsx

@@ -11,7 +11,7 @@ import {
 import { Button, Modal, ModalVariant } from '@patternfly/react-core';
 
 import { useToggle } from '../../hooks';
-import { getResourceUrl } from '../../utils';
+import { getResourceUrl } from '../../utils/helpers';
 import { AlertMessageForModals, ItemIsOwnedAlert } from '../components';
 import { useModal } from '../ModalHOC';
 

packages/forklift-console-plugin/src/modules/Providers/modals/EditModal/EditModal.tsx

@@ -7,7 +7,8 @@ import { Button, Form, Modal, ModalVariant, Popover, TextInput } from '@patternf
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 
 import { useToggle } from '../../hooks';
-import { getValueByJsonPath, ValidationMsg } from '../../utils';
+import { getValueByJsonPath } from '../../utils/helpers';
+import { ValidationMsg } from '../../utils/validators';
 import { AlertMessageForModals, ItemIsOwnedAlert } from '../components';
 import { useModal } from '../ModalHOC';
 

packages/forklift-console-plugin/src/modules/Providers/modals/EditModal/utils/defaultOnConfirm.ts

@@ -1,4 +1,4 @@
-import { getValueByJsonPath, jsonPathToPatch } from 'src/modules/Providers/utils';
+import { getValueByJsonPath, jsonPathToPatch } from 'src/modules/Providers/utils/helpers';
 
 import { k8sPatch, K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
 

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderUI/OpenshiftEditUIModal.tsx

@@ -4,7 +4,7 @@ import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
 
-import { validateOpenshiftUILink } from '../../utils';
+import { validateOpenshiftUILink } from '../../utils/validators';
 import { EditModal } from '../EditModal';
 
 import { patchProviderUI } from './utils/patchProviderUI';

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderUI/OpenstackEditUIModal.tsx

@@ -4,7 +4,7 @@ import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
 
-import { validateOpenstackUILink } from '../../utils';
+import { validateOpenstackUILink } from '../../utils/validators';
 import { EditModal } from '../EditModal';
 
 import { patchProviderUI } from './utils/patchProviderUI';

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderUI/OvirtEditUIModal.tsx

@@ -4,7 +4,7 @@ import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
 
-import { validateOvirtUILink } from '../../utils';
+import { validateOvirtUILink } from '../../utils/validators';
 import { EditModal } from '../EditModal';
 
 import { patchProviderUI } from './utils/patchProviderUI';

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderUI/VSphereEditUIModal.tsx

@@ -4,7 +4,7 @@ import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
 
-import { validateVSphereUILink } from '../../utils';
+import { validateVSphereUILink } from '../../utils/validators';
 import { EditModal } from '../EditModal';
 
 import { patchProviderUI } from './utils/patchProviderUI';

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OvirtEditURLModal.tsx

@@ -4,7 +4,7 @@ import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
 
-import { validateOvirtURL } from '../../utils';
+import { validateOvirtURL } from '../../utils/validators';
 import { EditModal } from '../EditModal';
 
 import { patchProviderURL } from './utils/patchProviderURL';

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx

@@ -4,7 +4,7 @@ import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
 
-import { validateEsxiURL, validateVCenterURL } from '../../utils';
+import { validateEsxiURL, validateVCenterURL } from '../../utils/validators';
 import { EditModal, ValidationHookType } from '../EditModal';
 
 import { patchProviderURL } from './utils/patchProviderURL';

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx

@@ -5,7 +5,7 @@ import { Modify, ProviderModel, V1beta1Provider } from '@kubev2v/types';
 import { K8sModel } from '@openshift-console/dynamic-plugin-sdk';
 import { Checkbox, Hint, HintBody, TextInput } from '@patternfly/react-core';
 
-import { VDDKHelperTextShort } from '../../utils';
+import { VDDKHelperTextShort } from '../../utils/components/VDDKHelperText';
 import { validateVDDKImage } from '../../utils/validators';
 import { EditModal, EditModalProps } from '../EditModal';
 

packages/forklift-console-plugin/src/modules/Providers/utils/components/DetailsPage/PageHeadings.tsx

@@ -1,7 +1,7 @@
 import React, { ReactNode } from 'react';
 import { TFunction } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import { getResourceUrl } from 'src/modules/Providers/utils';
+import { getResourceUrl } from 'src/modules/Providers/utils/helpers';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import {

packages/forklift-console-plugin/src/modules/Providers/views/list/ProvidersListPage.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import StandardPage from 'src/components/page/StandardPage';
-import modernizeMigration from 'src/modules/Providers/images/modernizeMigration.svg';
+import modernizeMigration from '../../images/modernizeMigration.svg';
 import { ProviderData, SOURCE_ONLY_PROVIDER_TYPES } from 'src/modules/Providers/utils';
 import { PROVIDER_STATUS, PROVIDERS } from 'src/utils/enums';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';

packages/forklift-console-plugin/src/modules/StorageMaps/index.ts

@@ -0,0 +1,7 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './actions';
+export * from './componenets';
+export * from './utils';
+export * from './views';
+export * from './yamlTemplates';
+// @endindex

packages/forklift-console-plugin/src/modules/StorageMaps/views/index.ts

@@ -0,0 +1,4 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './details';
+export * from './list';
+// @endindex