Resolves: MTV-3544 | Enable disabled eslint rules (kubev2v#2078)

Signed-off-by: Jeffrey Phillips <[email protected]>

Author: jeff-phillips-18

eslint-rules-disabled.ts

@@ -14,14 +14,12 @@ import tseslint from 'typescript-eslint';
 import cspellConfigs from '@cspell/eslint-plugin/configs';
 import eslint from '@eslint/js';
 
-import disabledRules from './eslint-rules-disabled';
-
 const fileName = fileURLToPath(import.meta.url);
 const dirName = dirname(fileName);
 const CSPELL_WORD_LIST = join(dirName, 'cspell.wordlist.txt');
 import type { Linter } from 'eslint';
 
-export const createEslintConfig = (ideMode = false) =>
+export const createEslintConfig = () =>
   [
     {
       ignores: [
@@ -303,6 +301,11 @@ export const createEslintConfig = (ideMode = false) =>
         '@cspell/spellchecker': 'off',
         'no-console': 'off',
         'no-underscore-dangle': 'off',
+        '@typescript-eslint/no-unsafe-argument': 'off',
+        '@typescript-eslint/no-unsafe-assignment': 'off',
+        '@typescript-eslint/no-unsafe-call': 'off',
+        '@typescript-eslint/no-unsafe-member-access': 'off',
+        '@typescript-eslint/no-unsafe-return': 'off',
       },
     },
     // Testing directory specific rules
@@ -330,7 +333,6 @@ export const createEslintConfig = (ideMode = false) =>
       },
     },
     prettier,
-    ...(process.env.HUSKY_LINT_STAGED || ideMode ? [] : [disabledRules]),
   ] as Linter.Config[];
 
 export default createEslintConfig();

eslint.config.ts

@@ -1,2 +1,2 @@
 import { createEslintConfig } from './eslint.config';
-export default createEslintConfig(true);
+export default createEslintConfig();

eslint.ide.config.ts

@@ -108,12 +108,12 @@
     "@types/react": "^18.3.8",
     "@types/react-dom": "^18.3.0",
     "@types/react-router": "^5.1.20",
+    "@types/react-tagsinput": "^3.20.6",
     "@types/webpack-bundle-analyzer": "^4.7.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^7.1.2",
     "eslint": "^9.23.0",
     "eslint-config-prettier": "^10.1.1",
-    "eslint-define-config": "^2.1.0",
     "eslint-interactive": "^11.1.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-perfectionist": "^4.10.1",

package.json

@@ -1,7 +1,8 @@
 import { type Dispatch, type SetStateAction, useState } from 'react';
 
 import type { ModalComponent } from '@openshift-console/dynamic-plugin-sdk/lib/app/modal-support/ModalProvider';
-import { Button, ButtonVariant, Modal, ModalVariant } from '@patternfly/react-core';
+import { Button, ButtonVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import { useForkliftTranslation } from '@utils/i18n';
 
 import { useIDEntities } from './hooks/useIDEntities';

src/components/AffinityModal/AffinityEditModal.tsx

@@ -7,7 +7,7 @@ import { affinityColumns } from './utils/constants';
 import type { AffinityRowData } from './utils/types';
 import AddAffinityRuleButton from './AddAffinityRuleButton';
 import AffinityDescriptionText from './AffinityDescriptionText';
-import AffinityRow from './AffinityRow';
+import AffinityRow, { type AffinityRowDataProps } from './AffinityRow';
 
 type AffinityListProps = {
   affinities: AffinityRowData[];
@@ -28,14 +28,8 @@ const AffinityList: FC<AffinityListProps> = ({
       <StackItem>
         <AffinityDescriptionText />
       </StackItem>
-      <StackItem ata-testid="affinity-rules-list">
-        <VirtualizedTable<
-          AffinityRowData,
-          {
-            onDelete: (affinity: AffinityRowData) => void;
-            onEdit: (affinity: AffinityRowData) => void;
-          }
-        >
+      <StackItem data-testid="affinity-rules-list">
+        <VirtualizedTable<AffinityRowData, AffinityRowDataProps>
           columns={columns}
           data={affinities ?? []}
           loaded

src/components/AffinityModal/AffinityList.tsx

@@ -2,6 +2,7 @@ import { useState } from 'react';
 
 import ModalForm from '@components/ModalForm/ModalForm';
 import type { K8sIoApiCoreV1Affinity, K8sResourceCommon } from '@kubev2v/types';
+import type { V1beta1PlanSpecTargetAffinity } from '@kubev2v/types/dist/generated/forklift/models/V1beta1PlanSpecTargetAffinity';
 import type { ModalComponent } from '@openshift-console/dynamic-plugin-sdk/lib/app/modal-support/ModalProvider';
 import { ModalVariant } from '@patternfly/react-core';
 import { isEmpty } from '@utils/helpers';
@@ -19,7 +20,7 @@ import AffinityList from './AffinityList';
 export type AffinityModalProps = {
   title?: string;
   onConfirm: (updatedAffinity: K8sIoApiCoreV1Affinity) => Promise<K8sResourceCommon>;
-  initialAffinity: K8sIoApiCoreV1Affinity | undefined;
+  initialAffinity: V1beta1PlanSpecTargetAffinity | undefined;
 };
 
 const AffinityModal: ModalComponent<AffinityModalProps> = ({
@@ -98,7 +99,7 @@ const AffinityModal: ModalComponent<AffinityModalProps> = ({
     <ModalForm
       testId="affinity-modal"
       title={title ?? t('Affinity rules')}
-      onConfirm={async () => onConfirm(rowsDataToAffinity(affinities) ?? {}) ?? {}}
+      onConfirm={async () => onConfirm(rowsDataToAffinity(affinities) ?? {})}
       confirmLabel={t('Apply rules')}
       variant={ModalVariant.medium}
       {...rest}

src/components/AffinityModal/AffinityModal.tsx

@@ -10,6 +10,11 @@ import { AFFINITY_CONDITION_LABELS, AFFINITY_TYPE_LABELS } from './utils/constan
 import type { AffinityRowData } from './utils/types';
 import AffinityRowActionsDropdown from './AffinityRowActionsDropdown';
 
+export type AffinityRowDataProps = {
+  onDelete: (affinity: AffinityRowData) => void;
+  onEdit: (affinity: AffinityRowData) => void;
+};
+
 const AffinityRow: FC<
   RowProps<
     AffinityRowData,

src/components/AffinityModal/AffinityRow.tsx

@@ -1,10 +1,10 @@
 import type {
-  K8sIoApiCoreV1Affinity,
-  K8sIoApiCoreV1NodeAffinity,
   K8sIoApiCoreV1PodAffinity,
   K8sIoApiCoreV1PodAntiAffinity,
   K8sIoApimachineryPkgApisMetaV1LabelSelectorRequirement,
 } from '@kubev2v/types';
+import type { V1beta1PlanSpecTargetAffinity } from '@kubev2v/types/dist/generated/forklift/models/V1beta1PlanSpecTargetAffinity';
+import type { V1beta1PlanSpecTargetAffinityNodeAffinity } from '@kubev2v/types/src/generated/forklift/models/V1beta1PlanSpecTargetAffinityNodeAffinity';
 
 import { AffinityCondition, type AffinityRowData, AffinityType } from './types';
 
@@ -13,7 +13,7 @@ const setIDsToEntity = (
 ) => entity?.map((elm, index) => ({ ...elm, id: index }));
 
 const getNodeAffinityRows = (
-  nodeAffinity: K8sIoApiCoreV1NodeAffinity | undefined,
+  nodeAffinity: V1beta1PlanSpecTargetAffinityNodeAffinity | undefined,
 ): AffinityRowData[] => {
   const requiredTerms =
     nodeAffinity?.requiredDuringSchedulingIgnoredDuringExecution?.nodeSelectorTerms ?? [];
@@ -68,7 +68,7 @@ const getPodLikeAffinityRows = (
   return [...required, ...preferred] as AffinityRowData[];
 };
 
-export const affinityToRowsData = (affinity: K8sIoApiCoreV1Affinity): AffinityRowData[] => [
+export const affinityToRowsData = (affinity: V1beta1PlanSpecTargetAffinity): AffinityRowData[] => [
   ...getNodeAffinityRows(affinity?.nodeAffinity),
   ...getPodLikeAffinityRows(affinity?.podAffinity),
   ...getPodLikeAffinityRows(affinity?.podAntiAffinity, true),

src/components/AffinityModal/utils/affinityToRowsData.ts

@@ -1,13 +1,13 @@
 import type { FC } from 'react';
 
-import type { K8sIoApiCoreV1Affinity } from '@kubev2v/types';
+import type { V1beta1PlanSpecTargetAffinity } from '@kubev2v/types/dist/generated/forklift/models/V1beta1PlanSpecTargetAffinity';
 import { Label } from '@patternfly/react-core';
 import { useForkliftTranslation } from '@utils/i18n';
 
 import { getAffinityRules } from './utils/getAffinityRules';
 
 type AffinityViewDetailsItemContentProps = {
-  affinity: K8sIoApiCoreV1Affinity | undefined;
+  affinity: V1beta1PlanSpecTargetAffinity | undefined;
 };
 
 const AffinityViewDetailsItemContent: FC<AffinityViewDetailsItemContentProps> = ({ affinity }) => {