From fefb7699fa3356ee126a15dbf25b4ef3681c57cd Mon Sep 17 00:00:00 2001
From: Jaime Idolpx <jaime@idolpx.com>
Date: Thu, 11 Jun 2026 22:16:25 -0400
Subject: [PATCH] feat(DeviceDetailOverlay, DevicesPage): enhance device
 handling with physical device support and improve navigation logic

---
 src/app/components/DeviceDetailOverlay.tsx | 11 ++++++++-
 src/app/components/DevicesPage.tsx         | 28 +++++++++++++++-------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/app/components/DeviceDetailOverlay.tsx b/src/app/components/DeviceDetailOverlay.tsx
index 1cbec90..04e1969 100644
--- a/src/app/components/DeviceDetailOverlay.tsx
+++ b/src/app/components/DeviceDetailOverlay.tsx
@@ -14,6 +14,8 @@ interface Device {
   enabled: boolean | number;
   url?: string;
   mode?: number;
+  physical?: boolean;
+  physicalModel?: string;
 }
 
 interface DeviceDetailOverlayProps {
@@ -249,9 +251,16 @@ export default function DeviceDetailOverlay({
               <button onClick={onClose} className="p-2 -m-2">
                 <X className="w-6 h-6" />
               </button>
-              <div className={`flex flex-col items-center gap-0.5 ${deviceData.enabled ? 'text-blue-600' : 'text-neutral-400'}`}>
+              <div className={`flex flex-col items-center gap-0.5 ${
+                device.physical ? 'text-green-600' : deviceData.enabled ? 'text-blue-600' : 'text-neutral-400'
+              }`}>
                 <span className="text-sm font-semibold leading-none">{device.number}</span>
                 {getDeviceIcon(device.type)}
+                {device.physical && (
+                  <span className="text-xs text-green-700 px-1 py-0.5 bg-green-50 border border-green-200 rounded leading-none">
+                    Physical
+                  </span>
+                )}
               </div>
               <button
                 onClick={() => setShowCommandMenu(!showCommandMenu)}
diff --git a/src/app/components/DevicesPage.tsx b/src/app/components/DevicesPage.tsx
index 351c805..bea98ae 100644
--- a/src/app/components/DevicesPage.tsx
+++ b/src/app/components/DevicesPage.tsx
@@ -158,7 +158,7 @@ export default function DevicesPage({ config, setConfig, openDeviceId, onClearOp
   // Auto-open the overlay when the parent passes a device ID
   useEffect(() => {
     if (!openDeviceId) return;
-    const idx = devices.findIndex(d => d.id === openDeviceId);
+    const idx = displayDevices.findIndex(d => d.id === openDeviceId);
     if (idx >= 0) setSelectedDeviceIndex(idx);
     onClearOpenDevice?.();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -195,8 +195,7 @@ export default function DevicesPage({ config, setConfig, openDeviceId, onClearOp
   };
 
   const handleDeviceClick = (dd: DisplayDevice) => {
-    if (dd.physical) return;
-    const idx = devices.findIndex(d => d.number === dd.number);
+    const idx = displayDevices.findIndex(d => d.id === dd.id);
     if (idx >= 0) setSelectedDeviceIndex(idx);
   };
 
@@ -206,7 +205,7 @@ export default function DevicesPage({ config, setConfig, openDeviceId, onClearOp
     if (selectedDeviceIndex === null) return;
     if (direction === 'prev' && selectedDeviceIndex > 0)
       setSelectedDeviceIndex(selectedDeviceIndex - 1);
-    else if (direction === 'next' && selectedDeviceIndex < devices.length - 1)
+    else if (direction === 'next' && selectedDeviceIndex < displayDevices.length - 1)
       setSelectedDeviceIndex(selectedDeviceIndex + 1);
   };
 
@@ -235,6 +234,19 @@ export default function DevicesPage({ config, setConfig, openDeviceId, onClearOp
     found.sort((a, b) => parseInt(a.number) - parseInt(b.number));
 
     setPhysicalDevices(found);
+
+    // Disable any virtual device that now has a physical device at the same address.
+    const newConfig = JSON.parse(JSON.stringify(config));
+    let disabledCount = 0;
+    for (const p of found) {
+      const virt = newConfig.devices?.iec?.[p.number];
+      if (virt && virt.enabled) {
+        virt.enabled = 0;
+        disabledCount++;
+      }
+    }
+    if (disabledCount > 0) setConfig(newConfig);
+
     setIsScanning(false);
     toast.dismiss(toastId);
     toast.success(`Found ${found.length} physical device${found.length !== 1 ? 's' : ''} on the bus`);
@@ -348,8 +360,7 @@ export default function DevicesPage({ config, setConfig, openDeviceId, onClearOp
             {/* Info — clickable for virtual devices */}
             <button
               onClick={() => handleDeviceClick(device)}
-              disabled={device.physical}
-              className="flex-1 min-w-0 text-left disabled:cursor-default"
+              className="flex-1 min-w-0 text-left"
             >
               <div className="flex items-center gap-2 flex-wrap">
                 <span className={!device.physical && !device.enabled ? 'text-neutral-400' : 'text-neutral-900'}>
@@ -401,16 +412,15 @@ export default function DevicesPage({ config, setConfig, openDeviceId, onClearOp
         ))}
       </div>
 
-      {/* DeviceDetailOverlay — virtual devices only */}
       {selectedDeviceIndex !== null && (
         <DeviceDetailOverlay
-          device={devices[selectedDeviceIndex]}
+          device={displayDevices[selectedDeviceIndex]}
           config={config}
           setConfig={setConfig}
           onClose={handleCloseOverlay}
           onNavigate={handleNavigate}
           hasPrev={selectedDeviceIndex > 0}
-          hasNext={selectedDeviceIndex < devices.length - 1}
+          hasNext={selectedDeviceIndex < displayDevices.length - 1}
         />
       )}