#1603 : Cannot revert to the preserved (original) IP if the user first enters a new IP and applies the changes

ui/src/features/migration/VmsSelectionStep.tsx

@@ -356,6 +356,13 @@ function VmsSelectionStep({
   const [bulkPreserveMac, setBulkPreserveMac] = useState<Record<string, Record<number, boolean>>>(
     {}
   )
+  const [bulkEditOverrides, setBulkEditOverrides] = useState<
+    Record<string, Record<number, { preserveIP: boolean; preserveMAC: boolean }>>
+  >({})
+  const [originalIPsPerVM, setOriginalIPsPerVM] = useState<Record<string, Record<number, string>>>(
+    {}
+  )
+  const [bulkCurrentIPs, setBulkCurrentIPs] = useState<Record<string, Record<number, string>>>({})
   const [bulkExistingIPs, setBulkExistingIPs] = useState<Record<string, Record<number, string>>>({})
   const [bulkValidationStatus, setBulkValidationStatus] = useState<
     Record<string, Record<number, 'empty' | 'valid' | 'invalid' | 'validating'>>
@@ -364,9 +371,34 @@ function VmsSelectionStep({
     Record<string, Record<number, string>>
   >({})
   const [assigningIPs, setAssigningIPs] = useState(false)
-  const [bulkEditOverrides, setBulkEditOverrides] = useState<
-    Record<string, Record<number, { preserveIP: boolean; preserveMAC: boolean }>>
-  >({})
+
+  useEffect(() => {
+    setOriginalIPsPerVM((prev) => {
+      const next = { ...prev }
+      vmsWithFlavor.forEach((vm) => {
+        if (!next[vm.name]) next[vm.name] = {}
+
+        if (vm.networkInterfaces && vm.networkInterfaces.length > 0) {
+          vm.networkInterfaces.forEach((nic, index) => {
+            if (next[vm.name][index] !== undefined) return
+            const discoveredIp = Array.isArray(nic.ipAddress)
+              ? nic.ipAddress.join(', ')
+              : nic.ipAddress || ''
+            if (discoveredIp.trim() !== '') {
+              next[vm.name][index] = discoveredIp
+            }
+          })
+        } else {
+          if (next[vm.name][0] !== undefined) return
+          const discoveredIp = vm.ipAddress && vm.ipAddress !== '—' ? vm.ipAddress : ''
+          if (discoveredIp.trim() !== '') {
+            next[vm.name][0] = discoveredIp
+          }
+        }
+      })
+      return next
+    })
+  }, [vmsWithFlavor])
 
   const hasBulkOverrideChanges = React.useMemo(() => {
     return Object.values(bulkEditOverrides).some((interfaces) =>
@@ -969,6 +1001,7 @@ function VmsSelectionStep({
     setBulkEditIPs({})
     setBulkPreserveIp({})
     setBulkPreserveMac({})
+    setBulkCurrentIPs({})
     setBulkEditOverrides({})
     setBulkValidationStatus({})
     setBulkValidationMessages({})
@@ -1146,15 +1179,12 @@ function VmsSelectionStep({
     Object.entries(bulkEditIPs).forEach(([vmName, interfaces]) => {
       Object.entries(interfaces).forEach(([interfaceIndexStr, ip]) => {
         const interfaceIndex = parseInt(interfaceIndexStr)
-        const preserveIp = getPreserveIpFlag(vmName, interfaceIndex)
-        const existingIp = getExistingIp(vmName, interfaceIndex)
+        const currentIp = bulkCurrentIPs?.[vmName]?.[interfaceIndex] || ''
         const typedIp = ip.trim()
 
         if (typedIp === '') return
 
-        if (preserveIp && existingIp.trim() !== '' && typedIp === existingIp.trim()) {
-          return
-        }
+        if (typedIp !== '' && typedIp === currentIp.trim()) return
 
         ipsToApply.push({ vmName, interfaceIndex, ip: typedIp })
       })
@@ -1369,6 +1399,21 @@ function VmsSelectionStep({
   }
 
   const handleApplyBulkIPs = async () => {
+    setOriginalIPsPerVM((prev) => {
+      const next = { ...prev }
+      Object.entries(bulkExistingIPs).forEach(([vmName, interfaces]) => {
+        if (!next[vmName]) next[vmName] = {}
+        Object.entries(interfaces || {}).forEach(([idxStr, ip]) => {
+          const idx = Number(idxStr)
+          if (next[vmName][idx] !== undefined) return
+          if (typeof ip === 'string' && ip.trim() !== '') {
+            next[vmName][idx] = ip
+          }
+        })
+      })
+      return next
+    })
+
     // Collect all IPs to apply with their VM and interface info
     const hasRequiredIps = validateRequiredIpsForPreserveEnabled()
     if (!hasRequiredIps) {
@@ -1558,6 +1603,7 @@ function VmsSelectionStep({
     const initialBulkEditIPs: Record<string, Record<number, string>> = {}
     const initialBulkPreserveIp: Record<string, Record<number, boolean>> = {}
     const initialBulkPreserveMac: Record<string, Record<number, boolean>> = {}
+    const initialBulkCurrentIPs: Record<string, Record<number, string>> = {}
     const initialBulkExistingIPs: Record<string, Record<number, string>> = {}
     const initialBulkEditOverrides: Record<
       string,
@@ -1577,6 +1623,7 @@ function VmsSelectionStep({
       initialBulkEditIPs[vmName] = {}
       initialBulkPreserveIp[vmName] = {}
       initialBulkPreserveMac[vmName] = {}
+      initialBulkCurrentIPs[vmName] = {}
       initialBulkExistingIPs[vmName] = {}
       initialBulkEditOverrides[vmName] = {}
       initialValidationStatus[vmName] = {}
@@ -1605,6 +1652,8 @@ function VmsSelectionStep({
           const isPoweredOff = vm.vmState !== 'running'
           const effectivePreserveIp = isPoweredOff ? false : initialPreserveIp
 
+          initialBulkEditIPs[vmName][index] = effectivePreserveIp ? existingIp : existingIp
+
           initialBulkPreserveIp[vmName][index] = effectivePreserveIp
           initialBulkPreserveMac[vmName][index] = initialPreserveMac
 
@@ -1613,7 +1662,9 @@ function VmsSelectionStep({
             preserveMAC: initialPreserveMac
           }
 
-          initialValidationStatus[vmName][index] = existingIp ? 'valid' : 'empty'
+          initialValidationStatus[vmName][index] = (effectivePreserveIp ? existingIp : existingIp)
+            ? 'valid'
+            : 'empty'
         })
       } else {
         const existingIp = extractFirstIPv4(
@@ -1628,14 +1679,19 @@ function VmsSelectionStep({
           preserveIP: initialBulkPreserveIp[vmName][0],
           preserveMAC: initialBulkPreserveMac[vmName][0]
         }
-        initialValidationStatus[vmName][0] = existingIp ? 'valid' : 'empty'
+        initialValidationStatus[vmName][0] = (
+          initialBulkPreserveIp[vmName][0] ? existingIp : existingIp
+        )
+          ? 'valid'
+          : 'empty'
       }
     })
 
     setBulkEditIPs(initialBulkEditIPs)
     setBulkPreserveIp(initialBulkPreserveIp)
     setBulkPreserveMac(initialBulkPreserveMac)
     setBulkExistingIPs(initialBulkExistingIPs)
+    setBulkCurrentIPs(initialBulkCurrentIPs)
     setBulkEditOverrides(initialBulkEditOverrides)
     setBulkValidationStatus(initialValidationStatus)
     setBulkValidationMessages({})