Resolves: MTV-3738 | Address feedback

jpuzz0 · jpuzz0 · commit 0db80ec8b535 · 2025-12-09T09:26:55.000-05:00
Signed-off-by: Jeff Puzzo &lt;jpuzzo@redhat.com&gt;
diff --git a/locales/en/plugin__forklift-console-plugin.json b/locales/en/plugin__forklift-console-plugin.json
diff --git a/src/modules/Providers/utils/components/VDDKHelperText/VDDKHelperText.tsx b/src/modules/Providers/utils/components/VDDKHelperText/VDDKHelperText.tsx
@@ -10,7 +10,7 @@ export const VDDKHelperText: FC = () => (
     <p>VMware Virtual Disk Development Kit (VDDK) image.</p>
     <br />
     <p>
-      The Migration Toolkit for Virtualization (MTV) uses the VMware Virtual Disk Development Kit
+      The migration toolkit for virtualization (MTV) uses the VMware Virtual Disk Development Kit
       (VDDK) SDK to accelerate transferring virtual disks from VMware vSphere. Therefore, creating a
       VDDK image, although optional, is highly recommended. Using MTV without VDDK is not
       recommended and could result in significantly lower migration speeds
diff --git a/src/onlineHelp/tipsAndTricksDrawer/topics/KeyTerminologyHelpTopic.tsx b/src/onlineHelp/tipsAndTricksDrawer/topics/KeyTerminologyHelpTopic.tsx
@@ -65,7 +65,7 @@ const keyTerminologyHelpTopics: LearningExperienceSubTopic[] = [
           {
             id: 'disk-decryption-passphrases-definition',
             title: t(
-              'A list of passphrases for the Linux Unified Key Setup (LUKS)-encrypted devices for the VMs that you want to migrate. For each LUKS-encrypted device, Migration Toolkit for Virtualization (MTV) tries each passphrase until one unlocks the device.',
+              'A list of passphrases for the Linux Unified Key Setup (LUKS)-encrypted devices for the VMs that you want to migrate. For each LUKS-encrypted device, migration toolkit for virtualization (MTV) tries each passphrase until one unlocks the device.',
             ),
           },
         ],
diff --git a/src/onlineHelp/tipsAndTricksDrawer/topics/TroubleShootingHelpTopic.tsx b/src/onlineHelp/tipsAndTricksDrawer/topics/TroubleShootingHelpTopic.tsx
@@ -105,7 +105,7 @@ const troubleShootingHelpTopics: LearningExperienceSubTopic[] = [
           {
             id: 'forklift-controller-logs-capture',
             title: t(
-              'Forklift controller logs capture Migration Toolkit for Virtualization (MTV) related events.',
+              'Forklift controller logs capture migration toolkit for virtualization (MTV) related events.',
             ),
           },
         ],
diff --git a/src/overview/components/HeaderTitle.tsx b/src/overview/components/HeaderTitle.tsx
@@ -30,7 +30,7 @@ const HeaderTitle: FC<HeaderTitleProps> = ({ isDrawerOpen = false, setIsDrawerOp
       <PageSection hasBodyWrapper={false}>
         <Split hasGutter style={{ alignItems: 'baseline' }}>
           <SplitItem isFilled>
-            <Title headingLevel="h1">{t('Migration Toolkit for Virtualization')}</Title>
+            <Title headingLevel="h1">{t('migration toolkit for virtualization')}</Title>
           </SplitItem>
           {isDrawerOpen ? undefined : (
             <Button
diff --git a/src/overview/tabs/Health/cards/Controller/ControllerCard.tsx b/src/overview/tabs/Health/cards/Controller/ControllerCard.tsx
@@ -38,7 +38,7 @@ const ControllerCard: FC<ControllerCardProps> = ({ limit, obj }) => {
           <TabTitle
             title={t('Health')}
             helpContent={t(
-              'Health indicates the current status of the pods related to the Migration Toolkit for Virtualization, including whether any have failed. For more details, refer to the logs.',
+              'Health indicates the current status of the pods related to the migration toolkit for virtualization, including whether any have failed. For more details, refer to the logs.',
             )}
           />
         </CardTitle>
diff --git a/src/overview/tabs/Overview/cards/Welcome/WelcomeCard.tsx b/src/overview/tabs/Overview/cards/Welcome/WelcomeCard.tsx
@@ -80,7 +80,7 @@ const WelcomeCard: FC = () => {
                 <FlexItem>
                   <Content component="p" className="forklift-overview__welcome-text">
                     <ForkliftTrans>
-                      Migration Toolkit for Virtualization (MTV) migrates virtual machines at scale
+                      migration toolkit for virtualization (MTV) migrates virtual machines at scale
                       to{' '}
                       <Link to={kubevirtInstalled ? virtualizationOverviewURL : operatorHubURL}>
                         Red Hat OpenShift Virtualization
diff --git a/src/overview/tabs/Settings/components/SettingsEdit.tsx b/src/overview/tabs/Settings/components/SettingsEdit.tsx
@@ -69,7 +69,7 @@ const SettingsEdit: ModalComponent<SettingsEditProps> = ({ closeModal, controlle
       >
         <Form>
           {t(
-            'Settings are applied across all projects on the Migration Toolkit for Virtualization operator.',
+            'Settings are applied across all projects on the migration toolkit for virtualization operator.',
           )}
           <EditMaxVMInFlight />
           <EditControllerCPULimit />
diff --git a/src/overview/tabs/YAML/ForkliftControllerYAMLTab.tsx b/src/overview/tabs/YAML/ForkliftControllerYAMLTab.tsx
@@ -23,7 +23,7 @@ const ForkliftControllerYAMLTab: FC = () => {
         <TabTitle
           title={t('YAML')}
           helpContent={t(
-            'You can write configuration files for the Migration Toolkit for Virtualization using YAML, a human-readable data serialization language.',
+            'You can write configuration files for the migration toolkit for virtualization using YAML, a human-readable data serialization language.',
           )}
         />
       </CardTitle>
diff --git a/src/plans/create/steps/other-settings/DiskPassPhraseFieldTable.tsx b/src/plans/create/steps/other-settings/DiskPassPhraseFieldTable.tsx
@@ -46,7 +46,7 @@ const DiskPassPhraseFieldTable = () => {
 
                 <StackItem>
                   {t(
-                    'For each LUKS-encrypted device, Migration Toolkit for Virtualization (MTV) tries each passphrase until one unlocks the device.',
+                    'For each LUKS-encrypted device, migration toolkit for virtualization (MTV) tries each passphrase until one unlocks the device.',
                   )}
                 </StackItem>
 
diff --git a/src/plans/details/tabs/Details/components/SettingsSection/components/SetLUKSEncryptionPasswords/components/EditLUKSModalBody.tsx b/src/plans/details/tabs/Details/components/SettingsSection/components/SetLUKSEncryptionPasswords/components/EditLUKSModalBody.tsx
@@ -16,7 +16,7 @@ const EditLUKSModalBody: FC = () => (
         </StackItem>
 
         <StackItem>
-          For manual passphrases, Migration Toolkit for Virtualization (MTV) tries each passphrase
+          For manual passphrases, migration toolkit for virtualization (MTV) tries each passphrase
           until one unlocks the device.{' '}
           <ExternalLink isInline href={VIRT_V2V_HELP_LINK}>
             Learn more
diff --git a/src/providers/create-new/ProvidersCreatePage.tsx b/src/providers/create-new/ProvidersCreatePage.tsx
@@ -20,7 +20,7 @@ const ProvidersCreateFormPage: FC = () => {
 
           <p className="pf-v6-u-text-color-subtle">
             {t(
-              'Define the connection attributes the Migration Toolkit for Virtualization needs to interact with your source and target providers.',
+              'Define the connection attributes the migration toolkit for virtualization needs to interact with your source and target providers.',
             )}
           </p>
         </Stack>
diff --git a/src/providers/create-new/fields/CACertificateField.tsx b/src/providers/create-new/fields/CACertificateField.tsx
@@ -33,11 +33,11 @@ const CACertificateField: FC = () => {
             return true;
           }
 
-          if (!val || val.trim() === '') {
+          const trimmedValue = val?.trim() ?? '';
+          if (!trimmedValue) {
             return t('CA certificate is required when certificate validation is configured');
           }
 
-          const trimmedValue = val.trim();
           if (!validatePublicCert(trimmedValue)) {
             return t('The CA certificate is not valid.');
           }
diff --git a/src/providers/create-new/fields/CertificateValidationField.tsx b/src/providers/create-new/fields/CertificateValidationField.tsx
@@ -78,7 +78,7 @@ const CertificateValidationField: FC = () => {
                 <Stack hasGutter>
                   <StackItem>
                     {t(
-                      'Select Skip certificate validation to skip certificate verification, which proceeds with an insecure migration and then the certificate is not required.',
+                      'By skipping certificate validation, the migration will be insecure and a certificate is not required.',
                     )}
                   </StackItem>
                   <StackItem>
diff --git a/src/providers/create-new/fields/OpenShiftUrlField.tsx b/src/providers/create-new/fields/OpenShiftUrlField.tsx
@@ -23,11 +23,12 @@ const OpenShiftUrlField: FC = () => {
     rules: {
       validate: {
         validUrl: async (val: string | undefined) => {
-          if (!val || val.trim() === '') {
+          const trimmedValue = val?.trim() ?? '';
+
+          if (!trimmedValue) {
             return true;
           }
 
-          const trimmedValue = val.trim();
           if (!validateURL(trimmedValue)) {
             return t(
               'The URL is invalid. URL should include the schema, for example: https://example.com:6443.',
diff --git a/src/providers/create-new/fields/ServiceAccountTokenField.tsx b/src/providers/create-new/fields/ServiceAccountTokenField.tsx
@@ -25,11 +25,12 @@ const ServiceAccountTokenField: FC = () => {
       required: t('Service account bearer token is required when connecting to a remote cluster'),
       validate: {
         validToken: async (val: string | undefined) => {
-          if (!val || val.trim() === '') {
+          const trimmedValue = val?.trim() ?? '';
+
+          if (!trimmedValue) {
             return true;
           }
 
-          const trimmedValue = val.trim();
           if (!validateK8sToken(trimmedValue)) {
             return t('Invalid token, a valid Kubernetes service account token is required');
           }
diff --git a/src/providers/create-new/types.ts b/src/providers/create-new/types.ts
@@ -2,18 +2,29 @@ import type { FieldValues } from 'react-hook-form';
 
 import type { CertificateValidationMode, ProviderFormFieldId } from './fields/constants';
 
-export type CreateProviderFormData = FieldValues & {
-  [ProviderFormFieldId.CaCertificate]?: string;
-  [ProviderFormFieldId.CertificateValidation]?: CertificateValidationMode;
-  [ProviderFormFieldId.NfsDirectory]?: string;
-  [ProviderFormFieldId.OpenshiftUrl]?: string;
+type BaseFormData = {
   [ProviderFormFieldId.ProviderName]: string;
   [ProviderFormFieldId.ProviderProject]: string;
   [ProviderFormFieldId.ProviderType]: string | undefined;
-  [ProviderFormFieldId.ServiceAccountToken]?: string;
   [ProviderFormFieldId.ShowDefaultProjects]: boolean;
 };
 
+type OpenshiftFields = {
+  [ProviderFormFieldId.CaCertificate]?: string;
+  [ProviderFormFieldId.CertificateValidation]?: CertificateValidationMode;
+  [ProviderFormFieldId.OpenshiftUrl]?: string;
+  [ProviderFormFieldId.ServiceAccountToken]?: string;
+};
+
+type OvaFields = {
+  [ProviderFormFieldId.NfsDirectory]?: string;
+};
+
+export type OpenshiftFormData = BaseFormData & OpenshiftFields;
+export type OvaFormData = BaseFormData & OvaFields;
+
+export type CreateProviderFormData = FieldValues & BaseFormData & OpenshiftFields & OvaFields;
+
 export type CreateProviderFormContextProps = {
   providerNames: string[] | undefined;
   providerNamesLoaded: boolean;
diff --git a/src/providers/create-new/utils/buildOpenshiftProviderResources.ts b/src/providers/create-new/utils/buildOpenshiftProviderResources.ts
@@ -1,18 +1,20 @@
 import { encode } from 'js-base64';
+import { PROVIDER_TYPES } from 'src/providers/utils/constants';
 
 import type { IoK8sApiCoreV1Secret, V1beta1Provider } from '@kubev2v/types';
 
 import { CertificateValidationMode, ProviderFormFieldId } from '../fields/constants';
-import type { CreateProviderFormData } from '../types';
+import type { OpenshiftFormData } from '../types';
+
+import { buildProviderObject } from './buildProviderObject';
+import { buildSecretObject } from './buildSecretObject';
 
 type ProviderResources = {
   provider: V1beta1Provider;
   secret: IoK8sApiCoreV1Secret;
 };
 
-export const buildOpenshiftProviderResources = (
-  formData: CreateProviderFormData,
-): ProviderResources => {
+export const buildOpenshiftProviderResources = (formData: OpenshiftFormData): ProviderResources => {
   const namespace = formData[ProviderFormFieldId.ProviderProject];
   const providerName = formData[ProviderFormFieldId.ProviderName];
   const openshiftUrl = formData[ProviderFormFieldId.OpenshiftUrl];
@@ -23,22 +25,12 @@ export const buildOpenshiftProviderResources = (
   const skipCertValidation = certificateValidation === CertificateValidationMode.Skip;
   const url = openshiftUrl?.trim() ?? '';
 
-  const provider: V1beta1Provider = {
-    apiVersion: 'forklift.konveyor.io/v1beta1',
-    kind: 'Provider',
-    metadata: {
-      name: providerName,
-      namespace,
-    },
-    spec: {
-      secret: {
-        name: undefined,
-        namespace,
-      },
-      type: 'openshift',
-      url,
-    },
-  };
+  const provider = buildProviderObject({
+    name: providerName,
+    namespace,
+    type: PROVIDER_TYPES.openshift,
+    url,
+  });
 
   const secretData: Record<string, string> = {
     insecureSkipVerify: encode(skipCertValidation ? 'true' : 'false'),
@@ -50,15 +42,10 @@ export const buildOpenshiftProviderResources = (
     secretData.cacert = encode(caCertificate.trim());
   }
 
-  const secret: IoK8sApiCoreV1Secret = {
-    apiVersion: 'v1',
+  const secret = buildSecretObject({
     data: secretData,
-    kind: 'Secret',
-    metadata: {
-      namespace,
-    },
-    type: 'Opaque',
-  };
+    namespace,
+  });
 
   return { provider, secret };
 };
diff --git a/src/providers/create-new/utils/buildOvaProviderResources.ts b/src/providers/create-new/utils/buildOvaProviderResources.ts
@@ -1,43 +1,33 @@
+import { PROVIDER_TYPES } from 'src/providers/utils/constants';
+
 import type { IoK8sApiCoreV1Secret, V1beta1Provider } from '@kubev2v/types';
 
 import { ProviderFormFieldId } from '../fields/constants';
-import type { CreateProviderFormData } from '../types';
+import type { OvaFormData } from '../types';
+
+import { buildProviderObject } from './buildProviderObject';
+import { buildSecretObject } from './buildSecretObject';
 
 type ProviderResources = {
   provider: V1beta1Provider;
   secret: IoK8sApiCoreV1Secret;
 };
 
-export const buildOvaProviderResources = (formData: CreateProviderFormData): ProviderResources => {
+export const buildOvaProviderResources = (formData: OvaFormData): ProviderResources => {
   const namespace = formData[ProviderFormFieldId.ProviderProject];
   const providerName = formData[ProviderFormFieldId.ProviderName];
   const nfsDirectory = formData[ProviderFormFieldId.NfsDirectory] ?? '';
 
-  const provider: V1beta1Provider = {
-    apiVersion: 'forklift.konveyor.io/v1beta1',
-    kind: 'Provider',
-    metadata: {
-      name: providerName,
-      namespace,
-    },
-    spec: {
-      secret: {
-        name: undefined,
-        namespace,
-      },
-      type: 'ova',
-      url: nfsDirectory,
-    },
-  };
-
-  const secret: IoK8sApiCoreV1Secret = {
-    apiVersion: 'v1',
-    kind: 'Secret',
-    metadata: {
-      namespace,
-    },
-    type: 'Opaque',
-  };
+  const provider = buildProviderObject({
+    name: providerName,
+    namespace,
+    type: PROVIDER_TYPES.ova,
+    url: nfsDirectory,
+  });
+
+  const secret = buildSecretObject({
+    namespace,
+  });
 
   return { provider, secret };
 };
diff --git a/src/providers/create-new/utils/buildProviderObject.ts b/src/providers/create-new/utils/buildProviderObject.ts
@@ -0,0 +1,30 @@
+import type { V1beta1Provider } from '@kubev2v/types';
+
+type BuildProviderObjectParams = {
+  name: string;
+  namespace: string;
+  type: string;
+  url?: string;
+};
+
+export const buildProviderObject = ({
+  name,
+  namespace,
+  type,
+  url,
+}: BuildProviderObjectParams): V1beta1Provider => ({
+  apiVersion: 'forklift.konveyor.io/v1beta1',
+  kind: 'Provider',
+  metadata: {
+    name,
+    namespace,
+  },
+  spec: {
+    secret: {
+      name: undefined,
+      namespace,
+    },
+    type,
+    url,
+  },
+});
diff --git a/src/providers/create-new/utils/buildSecretObject.ts b/src/providers/create-new/utils/buildSecretObject.ts
@@ -0,0 +1,19 @@
+import type { IoK8sApiCoreV1Secret } from '@kubev2v/types';
+
+type BuildSecretObjectParams = {
+  data?: Record<string, string>;
+  namespace: string;
+};
+
+export const buildSecretObject = ({
+  data,
+  namespace,
+}: BuildSecretObjectParams): IoK8sApiCoreV1Secret => ({
+  apiVersion: 'v1',
+  kind: 'Secret',
+  metadata: {
+    namespace,
+  },
+  type: 'Opaque',
+  ...(data && { data }),
+});

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ const keyTerminologyHelpTopics: LearningExperienceSubTopic[] = [`
`65`	`65`	`{`
`66`	`66`	`id: 'disk-decryption-passphrases-definition',`
`67`	`67`	`title: t(`
`68`		`- 'A list of passphrases for the Linux Unified Key Setup (LUKS)-encrypted devices for the VMs that you want to migrate. For each LUKS-encrypted device, Migration Toolkit for Virtualization (MTV) tries each passphrase until one unlocks the device.',`
	`68`	`+ 'A list of passphrases for the Linux Unified Key Setup (LUKS)-encrypted devices for the VMs that you want to migrate. For each LUKS-encrypted device, migration toolkit for virtualization (MTV) tries each passphrase until one unlocks the device.',`
`69`	`69`	`),`
`70`	`70`	`},`
`71`	`71`	`],`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ const troubleShootingHelpTopics: LearningExperienceSubTopic[] = [`
`105`	`105`	`{`
`106`	`106`	`id: 'forklift-controller-logs-capture',`
`107`	`107`	`title: t(`
`108`		`- 'Forklift controller logs capture Migration Toolkit for Virtualization (MTV) related events.',`
	`108`	`+ 'Forklift controller logs capture migration toolkit for virtualization (MTV) related events.',`
`109`	`109`	`),`
`110`	`110`	`},`
`111`	`111`	`],`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ const SettingsEdit: ModalComponent<SettingsEditProps> = ({ closeModal, controlle`
`69`	`69`	`>`
`70`	`70`	`<Form>`
`71`	`71`	`{t(`
`72`		`- 'Settings are applied across all projects on the Migration Toolkit for Virtualization operator.',`
	`72`	`+ 'Settings are applied across all projects on the migration toolkit for virtualization operator.',`
`73`	`73`	`)}`
`74`	`74`	`<EditMaxVMInFlight />`
`75`	`75`	`<EditControllerCPULimit />`