Resolves: MTV-3380 | fix comment from jpuzz0

Signed-off-by: Aviv Turgeman <aturgema@redhat.com>

Author: avivtur

src/components/AffinityModal/AffinityModal.tsx

@@ -1,12 +1,7 @@
 import { useState } from 'react';
 
 import ModalForm from '@components/ModalForm/ModalForm';
-import type {
-  K8sIoApiCoreV1Affinity,
-  K8sResourceCommon,
-  V1beta1PlanSpecConvertorAffinity,
-  V1beta1PlanSpecTargetAffinity,
-} from '@forklift-ui/types';
+import type { K8sIoApiCoreV1Affinity, K8sResourceCommon } from '@forklift-ui/types';
 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';
@@ -24,7 +19,7 @@ import AffinityList from './AffinityList';
 export type AffinityModalProps = {
   title?: string;
   onConfirm: (updatedAffinity: K8sIoApiCoreV1Affinity) => Promise<K8sResourceCommon>;
-  initialAffinity: V1beta1PlanSpecConvertorAffinity | V1beta1PlanSpecTargetAffinity | undefined;
+  initialAffinity: K8sIoApiCoreV1Affinity | undefined;
 };
 
 const AffinityModal: ModalComponent<AffinityModalProps> = ({
@@ -36,7 +31,7 @@ const AffinityModal: ModalComponent<AffinityModalProps> = ({
   const { t } = useForkliftTranslation();
 
   const [affinities, setAffinities] = useState<AffinityRowData[]>(
-    affinityToRowsData((initialAffinity as V1beta1PlanSpecTargetAffinity) ?? {}),
+    affinityToRowsData(initialAffinity ?? {}),
   );
   const [isEditing, setIsEditing] = useState(false);
   const [isCreating, setIsCreating] = useState(false);

src/components/AffinityModal/utils/affinityToRowsData.ts

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

src/components/AffinityViewDetailsItemContent/AffinityViewDetailsItemContent.tsx

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

src/components/AffinityViewDetailsItemContent/utils/getAffinityRules.ts

@@ -1,30 +1,22 @@
 import type {
-  V1beta1PlanSpecConvertorAffinity,
-  V1beta1PlanSpecTargetAffinity,
-  V1beta1PlanSpecTargetAffinityNodeAffinity,
-  V1beta1PlanSpecTargetAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution,
-  V1beta1PlanSpecTargetAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecutionNodeSelectorTerms,
-} from '@forklift-ui/types';
-import type {
+  K8sIoApiCoreV1Affinity,
+  K8sIoApiCoreV1NodeAffinity,
+  K8sIoApiCoreV1NodeSelectorTerm,
   K8sIoApiCoreV1PodAffinity,
   K8sIoApiCoreV1PodAffinityTerm,
   K8sIoApiCoreV1PodAntiAffinity,
+  K8sIoApiCoreV1PreferredSchedulingTerm,
   K8sIoApiCoreV1WeightedPodAffinityTerm,
 } from '@forklift-ui/types';
 
-type PlanAffinity = V1beta1PlanSpecConvertorAffinity | V1beta1PlanSpecTargetAffinity;
-
 enum AffinityCondition {
   preferred = 'preferredDuringSchedulingIgnoredDuringExecution',
   required = 'requiredDuringSchedulingIgnoredDuringExecution',
 }
 
 const getNodeAffinity = (
-  nodeAffinity: V1beta1PlanSpecTargetAffinityNodeAffinity | undefined,
-): (
-  | V1beta1PlanSpecTargetAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution
-  | V1beta1PlanSpecTargetAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecutionNodeSelectorTerms
-)[] => {
+  nodeAffinity: K8sIoApiCoreV1NodeAffinity | undefined,
+): (K8sIoApiCoreV1PreferredSchedulingTerm | K8sIoApiCoreV1NodeSelectorTerm)[] => {
   return [
     ...(nodeAffinity?.[AffinityCondition.preferred] ?? []),
     ...(nodeAffinity?.[AffinityCondition.required]?.nodeSelectorTerms ?? []),
@@ -41,16 +33,14 @@ const getPodAffinity = (
 };
 
 export const getAffinityRules = (
-  affinity: PlanAffinity | undefined,
+  affinity: K8sIoApiCoreV1Affinity | undefined,
 ): (
-  | V1beta1PlanSpecTargetAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution
+  | K8sIoApiCoreV1NodeSelectorTerm
   | K8sIoApiCoreV1PodAffinityTerm
-  | V1beta1PlanSpecTargetAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecutionNodeSelectorTerms
+  | K8sIoApiCoreV1PreferredSchedulingTerm
   | K8sIoApiCoreV1WeightedPodAffinityTerm
 )[] => {
-  const nodeAffinity = getNodeAffinity(
-    affinity?.nodeAffinity as V1beta1PlanSpecTargetAffinityNodeAffinity | undefined,
-  );
+  const nodeAffinity = getNodeAffinity(affinity?.nodeAffinity);
   const podAffinity = getPodAffinity(affinity?.podAffinity);
   const podAntiAffinity = getPodAffinity(affinity?.podAntiAffinity);
   return [...nodeAffinity, ...podAffinity, ...podAntiAffinity];

src/plans/details/tabs/Details/components/SettingsSection/components/ConvertorAffinity/ConvertorAffinityDetailsItem.tsx

@@ -1,12 +1,12 @@
 import type { FC } from 'react';
-import { DetailsItem } from 'src/components/DetailItems/DetailItem';
 import { isPlanEditable } from 'src/plans/details/components/PlanStatus/utils/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
 
 import AffinityModal, { type AffinityModalProps } from '@components/AffinityModal/AffinityModal';
 import AffinityViewDetailsItemContent from '@components/AffinityViewDetailsItemContent/AffinityViewDetailsItemContent';
+import { DetailsItem } from '@components/DetailItems/DetailItem';
 import type { K8sIoApiCoreV1Affinity, V1beta1Plan } from '@forklift-ui/types';
 import { useModal } from '@openshift-console/dynamic-plugin-sdk';
+import { useForkliftTranslation } from '@utils/i18n';
 import { DOC_MAIN_HELP_LINK } from '@utils/links';
 
 import type { EditableDetailsItemProps } from '../../../utils/types';
@@ -40,13 +40,17 @@ const ConvertorAffinityDetailsItem: FC<EditableDetailsItemProps> = ({
     <DetailsItem
       testId="convertor-affinity-rules-detail-item"
       title={t('Convertor pod affinity rules')}
-      content={<AffinityViewDetailsItemContent affinity={plan?.spec?.convertorAffinity} />}
+      content={
+        <AffinityViewDetailsItemContent
+          affinity={plan?.spec?.convertorAffinity as K8sIoApiCoreV1Affinity}
+        />
+      }
       helpContent={description}
       crumbs={['spec', 'convertorAffinity']}
       moreInfoLink={DOC_MAIN_HELP_LINK}
       onEdit={() => {
         launcher<AffinityModalProps>(AffinityModal, {
-          initialAffinity: plan?.spec?.convertorAffinity,
+          initialAffinity: plan?.spec?.convertorAffinity as K8sIoApiCoreV1Affinity,
           onConfirm,
           title: t('Edit convertor pod affinity rules'),
         });

src/plans/details/tabs/Details/components/SettingsSection/components/ConvertorLabels/ConvertorLabelsDetailsItem.tsx

@@ -1,13 +1,13 @@
 import type { FC } from 'react';
-import { DetailsItem } from 'src/components/DetailItems/DetailItem';
 import { isPlanEditable } from 'src/plans/details/components/PlanStatus/utils/utils';
-import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
+import { DetailsItem } from '@components/DetailItems/DetailItem';
 import LabelsModal, { type LabelsModalProps } from '@components/LabelsModal/LabelsModal';
 import LabelsViewDetailsItemContent from '@components/LabelsViewDetailsItemContent/LabelsViewDetailsItemContent';
 import type { V1beta1Plan } from '@forklift-ui/types';
 import { useModal } from '@openshift-console/dynamic-plugin-sdk';
 import { Stack, StackItem } from '@patternfly/react-core';
+import { ForkliftTrans, useForkliftTranslation } from '@utils/i18n';
 import { DOC_MAIN_HELP_LINK } from '@utils/links';
 
 import type { EditableDetailsItemProps } from '../../../utils/types';

src/plans/details/tabs/Details/components/SettingsSection/components/ConvertorNodeSelector/ConvertorNodeSelectorDetailsItem.tsx

@@ -1,8 +1,7 @@
 import type { FC } from 'react';
-import { DetailsItem } from 'src/components/DetailItems/DetailItem';
 import { isPlanEditable } from 'src/plans/details/components/PlanStatus/utils/utils';
-import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
+import { DetailsItem } from '@components/DetailItems/DetailItem';
 import NodeSelectorModal, {
   type NodeSelectorModalProps,
 } from '@components/NodeSelectorModal/NodeSelectorModal';
@@ -11,6 +10,8 @@ import type { V1beta1Plan } from '@forklift-ui/types';
 import { useModal } from '@openshift-console/dynamic-plugin-sdk';
 import { Stack, StackItem } from '@patternfly/react-core';
 import { isEmpty } from '@utils/helpers';
+import { ForkliftTrans, useForkliftTranslation } from '@utils/i18n';
+import { DOC_MAIN_HELP_LINK } from '@utils/links';
 
 import type { EditableDetailsItemProps } from '../../../utils/types';
 import { patchPlanSpec } from '../../utils/patchPlanSpec';
@@ -46,6 +47,7 @@ const ConvertorNodeSelectorDetailsItem: FC<EditableDetailsItemProps> = ({
       content={<NodeSelectorViewDetailsItemContent labels={plan?.spec?.convertorNodeSelector} />}
       helpContent={description}
       crumbs={['spec', 'convertorNodeSelector']}
+      moreInfoLink={DOC_MAIN_HELP_LINK}
       onEdit={() => {
         launcher<NodeSelectorModalProps>(NodeSelectorModal, {
           description: (

src/plans/details/tabs/Details/components/SettingsSection/components/TargetAffinity/TargetAffinityDetailsItem.tsx

@@ -33,13 +33,17 @@ const TargetAffinityDetailsItem: FC<EditableDetailsItemProps> = ({ canPatch, pla
     <DetailsItem
       testId="vm-target-affinity-rules-detail-item"
       title={t('VM target affinity rules')}
-      content={<AffinityViewDetailsItemContent affinity={plan?.spec?.targetAffinity} />}
+      content={
+        <AffinityViewDetailsItemContent
+          affinity={plan?.spec?.targetAffinity as K8sIoApiCoreV1Affinity}
+        />
+      }
       helpContent={TARGET_AFFINITY_DETAILS_ITEM_DESCRIPTION}
       crumbs={['spec', 'targetAffinity']}
       moreInfoLink={DOC_MAIN_HELP_LINK}
       onEdit={() => {
         launcher<AffinityModalProps>(AffinityModal, {
-          initialAffinity: plan?.spec?.targetAffinity,
+          initialAffinity: plan?.spec?.targetAffinity as K8sIoApiCoreV1Affinity,
           onConfirm,
           title: t('Edit VM target affinity rules'),
         });

src/plans/details/tabs/Details/components/SettingsSection/utils/patchPlanSpec.ts

@@ -15,7 +15,7 @@ export const patchPlanSpec = async <T>({
   path,
   plan,
 }: PatchPlanSpecParams<T>): Promise<V1beta1Plan> => {
-  const op = currentValue ? REPLACE : ADD;
+  const op = currentValue === undefined ? ADD : REPLACE;
 
   return k8sPatch({
     data: [{ op, path, value: newValue }],

testing/playwright/e2e/downstream/plans/plan-convertor-scheduling.spec.ts

@@ -14,7 +14,7 @@ const setupPlanDetailsPage = async (page: Page, testPlan: TestPlan | undefined)
   const { name: planName, namespace } = testPlan.metadata;
   await planDetailsPage.navigate(planName, namespace);
   await planDetailsPage.verifyPlanTitle(planName);
-  return { planDetailsPage, planName, namespace, testData: testPlan.testData };
+  return { planDetailsPage };
 };
 
 test.describe('Plan Details - Convertor Pod Labels', { tag: '@downstream' }, () => {