Merge pull request #1440 from sgratch/rephrase-labels-for-presereve-static-ips-setting

MTV-1743: Rephrase preserve static ip's labels for clarity

Author: sgratch

packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json

@@ -140,7 +140,7 @@
   "Disk counter": "Disk counter",
   "Disk decryption passphrases": "Disk decryption passphrases",
   "Disk transfer": "Disk transfer",
-  "Do not try to preserve the static IPs of virtual machines migrated from vSphere.": "Do not try to preserve the static IPs of virtual machines migrated from vSphere.",
+  "Do not preserve static IPs": "Do not preserve static IPs",
   "Domain": "Domain",
   "Domain name": "Domain name",
   "Drag and drop a file or upload one": "Drag and drop a file or upload one",
@@ -378,6 +378,7 @@
   "Preserve CPU model": "Preserve CPU model",
   "Preserve static IPs": "Preserve static IPs",
   "Preserve the CPU model and flags the VM runs with in its oVirt cluster.": "Preserve the CPU model and flags the VM runs with in its oVirt cluster.",
+  "Preserve the static IPs of the virtual machines migrated": "Preserve the static IPs of the virtual machines migrated",
   "Preserve the static IPs of virtual machines migrated from vSphere.": "Preserve the static IPs of virtual machines migrated from vSphere.",
   "Product": "Product",
   "Progress": "Progress",
@@ -567,7 +568,6 @@
   "Whether this is a warm migration": "Whether this is a warm migration",
   "Whether this is a warm migration.": "Whether this is a warm migration.",
   "Whether to preserve the CPU model": "Whether to preserve the CPU model",
-  "Whether to preserve the static IPs": "Whether to preserve the static IPs",
   "YAML": "YAML",
   "You can always bring this welcome card back into view by clicking 'Show the welcome card' in the page heading.": "You can always bring this welcome card back into view by clicking 'Show the welcome card' in the page heading.",
   "You can cancel virtual machines from a running migration plan.": "You can cancel virtual machines from a running migration plan.",

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

@@ -24,12 +24,12 @@ export const PreserveStaticIPsDetailsItem: React.FC<PlanDetailsItemProps> = ({
 
   const trueLabel = (
     <Label isCompact color={'green'}>
-      Preserve static IPs
+      {t('Preserve static IPs')}
     </Label>
   );
   const falseLabel = (
     <Label isCompact color={'blue'}>
-      Use system default
+      {t('Do not preserve static IPs')}
     </Label>
   );
 

packages/forklift-console-plugin/src/modules/Plans/views/details/components/SettingsSection/modals/EditPlanPreserveStaticIPs/EditPlanPreserveStaticIPs.tsx

@@ -13,7 +13,6 @@ import { Switch } from '@patternfly/react-core';
 
 const onConfirm: OnConfirmHookType = async ({ resource, model, newValue }) => {
   const plan = resource as V1beta1Plan;
-
   const resourceValue = plan?.spec?.preserveStaticIPs;
   const op = resourceValue ? 'replace' : 'add';
 
@@ -49,12 +48,10 @@ const PreserveStaticIPsInputFactory: () => ModalInputComponentType = () => {
 
     return (
       <Switch
-        id="simple-switch"
-        label={t('Preserve the static IPs of virtual machines migrated from vSphere.')}
-        labelOff={t(
-          'Do not try to preserve the static IPs of virtual machines migrated from vSphere.',
-        )}
+        id="preserve-static-ip-switch"
+        label={t('Preserve the static IPs of the virtual machines migrated')}
         isChecked={value === 'true'}
+        hasCheckIcon
         onChange={(e, v) => onChangeInternal(v, e)}
       />
     );
@@ -71,10 +68,9 @@ const EditPlanPreserveStaticIPs_: React.FC<EditPlanPreserveStaticIPsProps> = (pr
       {...props}
       jsonPath={(obj: V1beta1Plan) => (obj.spec.preserveStaticIPs ? 'true' : 'false')}
       title={props?.title || t('Set to preserve the static IPs')}
-      label={props?.label || t('Whether to preserve the static IPs')}
+      label={props?.label ?? ''}
       model={PlanModel}
       onConfirmHook={onConfirm}
-      body={t(`Preserve the static IPs of virtual machines migrated from vSphere.`)}
       InputComponent={PreserveStaticIPsInputFactory()}
     />
   );