Resolves: MTV-3742 | Standartize plan mappings tab

Signed-off-by: Aviv Turgeman <[email protected]>

Author: avivtur

locales/en/plugin__forklift-console-plugin.json

@@ -212,7 +212,6 @@
   "Click on \"Create migration plan\".": "Click on \"Create migration plan\".",
   "Click the pencil for setting provider web UI link": "Click the pencil for setting provider web UI link",
   "Click the update credentials button to save your changes, button is disabled until a change is detected.": "Click the update credentials button to save your changes, button is disabled until a change is detected.",
-  "Click the update mappings button to save your changes, button is disabled until a change is detected.": "Click the update mappings button to save your changes, button is disabled until a change is detected.",
   "Click to select a different provider from the list.": "Click to select a different provider from the list.",
   "Click to unselect": "Click to unselect",
   "Close": "Close",
@@ -295,7 +294,6 @@
   "Defines the CPU limits allocated to the main container in the controller pod. The default value is 500 milliCPU.": "Defines the CPU limits allocated to the main container in the controller pod. The default value is 500 milliCPU.",
   "Delete": "Delete",
   "Delete {{model.label}}": "Delete {{model.label}}",
-  "Delete mapping": "Delete mapping",
   "Delete network map": "Delete network map",
   "Delete plan": "Delete plan",
   "Delete provider": "Delete provider",
@@ -339,7 +337,6 @@
   "Edit default transfer network": "Edit default transfer network",
   "Edit description": "Edit description",
   "Edit labels": "Edit labels",
-  "Edit mappings": "Edit mappings",
   "Edit migration plan target project": "Edit migration plan target project",
   "Edit migration plan transfer network": "Edit migration plan transfer network",
   "Edit network map": "Edit network map",
@@ -634,7 +631,6 @@
   "Network map is required.": "Network map is required.",
   "Network map name": "Network map name",
   "Network map YAML": "Network map YAML",
-  "Network map:": "Network map:",
   "Network maps": "Network maps",
   "Network maps ensure that the network configurations of your migrating virtual machines (VMs) are correctly translated and applied in the target environment.": "Network maps ensure that the network configurations of your migrating virtual machines (VMs) are correctly translated and applied in the target environment.",
   "Network name template": "Network name template",
@@ -658,7 +654,6 @@
   "No network mappings selected": "No network mappings selected",
   "No network maps found": "No network maps found",
   "No network maps found in project <1>{namespace}</1>.": "No network maps found in project <1>{namespace}</1>.",
-  "No networks in this category": "No networks in this category",
   "No node selectors defined": "No node selectors defined",
   "No options available": "No options available",
   "No owner": "No owner",
@@ -679,7 +674,6 @@
   "No storage maps found": "No storage maps found",
   "No storage maps found in project <1>{namespace}</1>.": "No storage maps found in project <1>{namespace}</1>.",
   "No storages available": "No storages available",
-  "No storages in this category": "No storages in this category",
   "No value for provider web UI link": "No value for provider web UI link",
   "No VMs have been selected": "No VMs have been selected",
   "Node": "Node",
@@ -688,7 +682,6 @@
   "Node labels": "Node labels",
   "Node selector enables constraining virtual machines scheduling to specific nodes, based on node labels. Adding labels below will  schedule virtual machines only on nodes which contain the specified labels.": "Node selector enables constraining virtual machines scheduling to specific nodes, based on node labels. Adding labels below will  schedule virtual machines only on nodes which contain the specified labels.",
   "None": "None",
-  "Not available": "Not available",
   "Not in": "Not in",
   "Not Ready": "Not Ready",
   "not started": "not started",
@@ -742,10 +735,8 @@
   "OpenStack token for authentication using a user name. [required]": "OpenStack token for authentication using a user name. [required]",
   "Operator": "Operator",
   "Other networks present on the source provider": "Other networks present on the source provider",
-  "Other networks present on the source provider ": "Other networks present on the source provider ",
   "Other settings (optional)": "Other settings (optional)",
   "Other storages present on the source provider": "Other storages present on the source provider",
-  "Other storages present on the source provider ": "Other storages present on the source provider ",
   "OvaPath": "OvaPath",
   "Overview": "Overview",
   "Owner": "Owner",
@@ -979,7 +970,6 @@
   "Storage map name": "Storage map name",
   "Storage map type": "Storage map type",
   "Storage map YAML": "Storage map YAML",
-  "Storage map:": "Storage map:",
   "Storage maps": "Storage maps",
   "Storage maps define how the storage of source VMs will be provisioned on the target cluster by linking source storage entities to target storage classes.": "Storage maps define how the storage of source VMs will be provisioned on the target cluster by linking source storage entities to target storage classes.",
   "Storage product": "Storage product",
@@ -1014,7 +1004,6 @@
   "The commercial product name or model of the storage system being used. This helps ensure the correct features and APIs will be used.": "The commercial product name or model of the storage system being used. This helps ensure the correct features and APIs will be used.",
   "The current certificate does not match the certificate fetched from URL. Manually validate the fingerprint before proceeding.": "The current certificate does not match the certificate fetched from URL. Manually validate the fingerprint before proceeding.",
   "The default setting is \"Providers default,\" which uses the default network configured for your source and target providers. You can select a specific NetworkAttachmentDefinition from the dropdown list if you want to use a dedicated network for migration data to improve performance or security.": "The default setting is \"Providers default,\" which uses the default network configured for your source and target providers. You can select a specific NetworkAttachmentDefinition from the dropdown list if you want to use a dedicated network for migration data to improve performance or security.",
-  "The edit mappings button is disabled if the plan started running and at least one virtual machine was migrated successfully or when the plan status does not enable editing.": "The edit mappings button is disabled if the plan started running and at least one virtual machine was migrated successfully or when the plan status does not enable editing.",
   "The Manager CA certificate unless it was replaced by a third-party certificate, in which case, enter the Manager Apache CA certificate.": "The Manager CA certificate unless it was replaced by a third-party certificate, in which case, enter the Manager Apache CA certificate.",
   "The mapping data from the inventory is not available, {{resourcesError}}.": "The mapping data from the inventory is not available, {{resourcesError}}.",
   "The password for the ESXi host admin": "The password for the ESXi host admin",
@@ -1044,10 +1033,8 @@
   "The provider name is required.": "The provider name is required.",
   "The repository or virtualization platform you want to migrate your virtual machines from into the OpenShift cluster.": "The repository or virtualization platform you want to migrate your virtual machines from into the OpenShift cluster.",
   "The Secret was not loaded. Try reloading the page or check if the secret exists. ": "The Secret was not loaded. Try reloading the page or check if the secret exists. ",
-  "The source mapping data from the inventory is not available: {{resourcesError}}.": "The source mapping data from the inventory is not available: {{resourcesError}}.",
   "The storage device or partition that contains the root filesystem. For example, naming a root device \"sdb2/boot/dev\" would mean to use the second partition on the first hard drive.": "The storage device or partition that contains the root filesystem. For example, naming a root device \"sdb2/boot/dev\" would mean to use the second partition on the first hard drive.",
   "The target project is the project, within your selected target provider, that your virtual machines will be migrated to. This is different from the project that your migration plan will be created in and where your provider was created.": "The target project is the project, within your selected target provider, that your virtual machines will be migrated to. This is different from the project that your migration plan will be created in and where your provider was created.",
-  "The target storage mapping data from the inventory is not available: {{resourcesError}}.": "The target storage mapping data from the inventory is not available: {{resourcesError}}.",
   "The uploaded file name extension should be .ova": "The uploaded file name extension should be .ova",
   "The URL is invalid. URL should include the schema, for example: https://example.com:6443.": "The URL is invalid. URL should include the schema, for example: https://example.com:6443.",
   "The URL is required. URL should include the schema and path, for example: https://rhv-host-example.com/ovirt-engine/api": "The URL is required. URL should include the schema and path, for example: https://rhv-host-example.com/ovirt-engine/api",
@@ -1100,7 +1087,6 @@
   "Unknown power state": "Unknown power state",
   "Unsupported provider type": "Unsupported provider type",
   "Update credentials": "Update credentials",
-  "Update mappings": "Update mappings",
   "Updated": "Updated",
   "updating the hooks will override the current configuration.": "updating the hooks will override the current configuration.",
   "updating the LUKS decryption keys will override the current configuration.": "updating the LUKS decryption keys will override the current configuration.",

src/networkMaps/create/utils/buildNetworkMappings.ts

@@ -111,7 +111,7 @@ const getDestinationNetName = (
   return DEFAULT_NETWORK;
 };
 
-export const buildFormNetworkMapping = (
+export const getNetworkMappingValues = (
   specMapping: V1beta1NetworkMapSpecMap[] | undefined,
   sourceProvider: V1beta1Provider | undefined,
   sourceNetworks: InventoryNetwork[] = [],

src/networkMaps/details/tabs/Details/NetworkMapDetailsTab.tsx

@@ -1,7 +1,7 @@
 import { type FC, useMemo } from 'react';
 import SectionHeading from 'src/components/headers/SectionHeading';
 import { useOpenShiftNetworks, useSourceNetworks } from 'src/modules/Providers/hooks/useNetworks';
-import { buildFormNetworkMapping } from 'src/networkMaps/create/utils/buildNetworkMappings';
+import { getNetworkMappingValues } from 'src/networkMaps/create/utils/buildNetworkMappings';
 import NetworkMapReviewTable from 'src/plans/create/steps/review/NetworkMapReviewTable';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
@@ -69,7 +69,7 @@ const NetworkMapDetailsTab: FC<NetworkMapDetailsTabProps> = ({ name, namespace }
 
   const currentMappings = useMemo(
     () =>
-      buildFormNetworkMapping(
+      getNetworkMappingValues(
         networkMap?.spec?.map,
         sourceProvider,
         sourceNetworks,

src/plans/create/hooks/useInitializeMappings.ts

@@ -5,7 +5,6 @@ import { isEmpty } from '@utils/helpers';
 
 import type { MappingFieldIds, MappingValue } from '../types';
 import { fillUnmappedSources } from '../utils/fillUnmappedSources';
-
 type UseInitializeMappingsParams<T extends Record<string, unknown>> = {
   isLoading: boolean;
   currentMap: T[] | undefined;
@@ -75,7 +74,7 @@ export const useInitializeMappings = <T extends Record<string, unknown>>({
         [fieldIds.targetField]: targetValue,
       };
 
-      setValue(fieldIds.mapField, [emptyMapping]);
+      setValue(fieldIds.mapField, [emptyMapping], { shouldDirty: true, shouldValidate: true });
       hasInitializedRef.current = true;
       return;
     }
@@ -95,11 +94,11 @@ export const useInitializeMappings = <T extends Record<string, unknown>>({
         unmappedSources,
       });
 
-      setValue(fieldIds.mapField, updatedMappings);
+      setValue(fieldIds.mapField, updatedMappings, { shouldDirty: true, shouldValidate: true });
 
       // Trigger validation to ensure form state is correct
       setTimeout(async () => {
-        await trigger(fieldIds.mapField);
+        await trigger();
       }, 0);
 
       unmappedSources.forEach((source) => {

src/plans/create/steps/network-map/constants.ts

@@ -1,8 +1,9 @@
+import { IgnoreNetwork } from 'src/plans/details/tabs/Mappings/utils/constants';
+
 import { DEFAULT_NETWORK } from '@utils/constants';
 import { t } from '@utils/i18n';
 
 import type { MappingValue } from '../../types';
-
 export enum NetworkMapFieldId {
   NetworkMap = 'networkMap',
   ExistingNetworkMap = 'existingNetworkMap',
@@ -29,6 +30,11 @@ export const defaultNetMapping: NetworkMapping = {
   [NetworkMapFieldId.TargetNetwork]: { name: DEFAULT_NETWORK },
 };
 
+export const ignoreNetMapping: NetworkMapping = {
+  [NetworkMapFieldId.SourceNetwork]: { name: '' },
+  [NetworkMapFieldId.TargetNetwork]: { name: IgnoreNetwork.Label },
+};
+
 export enum NetworkMapType {
   New = 'new',
   Existing = 'existing',

src/plans/create/steps/network-map/utils.ts

@@ -16,7 +16,6 @@ import { hasMultiplePodNetworkMappings } from '../../utils/hasMultiplePodNetwork
 import { getMapResourceLabel } from '../utils';
 
 import { defaultNetMapping, NetworkMapFieldId, type NetworkMapping } from './constants';
-
 type NetworkMappingId = `${NetworkMapFieldId.NetworkMap}.${number}.${keyof NetworkMapping}`;
 
 type ValidateNetworkMapParams = {

src/plans/create/steps/review/NetworkMapReviewTable.tsx

@@ -22,8 +22,8 @@ const NetworkMapReviewTable: FC<NetworkMapReviewTableProps> = ({ networkMap }) =
       <Table aria-label="Network map review table" variant={TableVariant.compact} borders>
         <Thead>
           <Tr>
-            <Th>{t('Source network')}</Th>
-            <Th>{t('Target network')}</Th>
+            <Th width={50}>{t('Source network')}</Th>
+            <Th width={50}>{t('Target network')}</Th>
           </Tr>
         </Thead>
 

src/plans/create/steps/review/StorageMapReviewTable.tsx

@@ -46,9 +46,13 @@ const StorageMapReviewTable: FC<StorageMapReviewTableProps> = ({ storageMap }) =
       <Table aria-label="Storage map review table" variant={TableVariant.compact} borders>
         <Thead>
           <Tr>
-            {hasOffloadStorage && <Th />}
-            <Th>{storageMapFieldLabels[CreatePlanStorageMapFieldId.SourceStorage]}</Th>
-            <Th>{storageMapFieldLabels[CreatePlanStorageMapFieldId.TargetStorage]}</Th>
+            {hasOffloadStorage && <Th width={10} />}
+            <Th width={hasOffloadStorage ? 45 : 50}>
+              {storageMapFieldLabels[CreatePlanStorageMapFieldId.SourceStorage]}
+            </Th>
+            <Th width={hasOffloadStorage ? 45 : 50}>
+              {storageMapFieldLabels[CreatePlanStorageMapFieldId.TargetStorage]}
+            </Th>
           </Tr>
         </Thead>
 

src/plans/create/utils/hasMultiplePodNetworkMappings.ts

@@ -27,3 +27,7 @@ export const hasMultiplePodNetworkMappings = (
     return mappedNetworks.length >= 2;
   });
 };
+
+export const hasPodNetworkMappings = (networkMap: NetworkMapping[]) => {
+  return networkMap.some(({ targetNetwork }) => targetNetwork?.name === DefaultNetworkLabel.Source);
+};

src/plans/details/hooks/usePlanPages.tsx

@@ -9,7 +9,6 @@ import PlanMappingsPage from '../tabs/Mappings/PlanMappingsPage';
 import PlanResourcesPage from '../tabs/Resources/PlanResourcesPage';
 import PlanVirtualMachinesPage from '../tabs/VirtualMachines/PlanVirtualMachinesPage';
 import PlanYAMLPage from '../tabs/YAML/PlanYAMLPage';
-
 const usePlanPages = (name: string, namespace: string) => {
   const { t } = useForkliftTranslation();