Resolves: MTV-3177 | NADs not showing on Mappings tab edit mode (kubev2v#1853)

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

Author: avivtur

src/plans/details/tabs/Mappings/components/PlanMappingsActionsBar/PlanMappingsActionsBar.tsx

@@ -15,7 +15,7 @@ import './PlanMappingsActionsBar.scss';
 type PlanMappingsActionsBarProps = {
   isLoading: boolean;
   dataChanged: boolean;
-  reset: () => void;
+  reset: (preserveUpdated?: boolean) => void;
   onUpdate: () => void;
 };
 
@@ -43,7 +43,9 @@ const PlanMappingsActionsBar: FC<PlanMappingsActionsBarProps> = ({
         <FlexItem>
           <Button
             variant={ButtonVariant.secondary}
-            onClick={reset}
+            onClick={() => {
+              reset();
+            }}
             data-testid="cancel-mappings-button"
           >
             {t('Cancel')}

src/plans/details/tabs/Mappings/utils/getLabeledAndAvailableMappings.ts

@@ -38,11 +38,11 @@ export const getLabeledAndAvailableMappings = ({
   updatedNetwork,
   updatedStorage,
 }: GetMappingsParams) => {
+  const labeledTargetNetworkMap = mapTargetNetworksIdsToLabels(targetNetworks, plan);
   const labeledNetworkMappings: Mapping[] = updatedNetwork.map((obj) => ({
     destination:
-      mapTargetNetworksIdsToLabels(targetNetworks, plan)[obj.destination.type] ??
-      obj.destination?.name ??
-      t('Not available'),
+      labeledTargetNetworkMap[obj.destination?.type] ??
+      `${obj.destination?.namespace}/${obj.destination?.name}`,
     source: mapSourceNetworksIdsToLabels(sourceNetworks)[obj.source.id ?? obj.source.type!],
   }));
 
@@ -64,9 +64,9 @@ export const getLabeledAndAvailableMappings = ({
     ),
   ).sort((netA, netB) => universalComparator(netA, netB, 'en'));
 
-  const availableNetworkTargets = Object.values(
-    mapTargetNetworksIdsToLabels(targetNetworks, plan),
-  ).sort((netA, netB) => universalComparator(netA, netB, 'en'));
+  const availableNetworkTargets = Object.values(labeledTargetNetworkMap).sort((netA, netB) =>
+    universalComparator(netA, netB, 'en'),
+  );
 
   const availableStorageSources = Object.values(
     mapSourceStoragesIdsToLabels(

src/plans/details/tabs/Mappings/utils/planMappingsHandlers.ts

@@ -55,7 +55,7 @@ export const createOnAddNetworkMapping = (
     newState.push(createReplacedNetworkMap(unused));
   }
 
-  return { canAddMore: Boolean(unused), newState };
+  return { canAddMore: newState.length < sources.length, newState };
 };
 
 export const createOnAddStorageMapping = (
@@ -72,7 +72,7 @@ export const createOnAddStorageMapping = (
     newState.push(createReplacedStorageMap(unused, target));
   }
 
-  return { canAddMore: Boolean(unused), newState };
+  return { canAddMore: newState.length < sources.length, newState };
 };
 
 export const createOnDeleteMapping = <