From dfc7694fb93d31ab009e9daaaf784cd97035cf50 Mon Sep 17 00:00:00 2001
From: Paul Payne <paul@payne.io>
Date: Tue, 4 Nov 2025 17:17:01 +0000
Subject: [PATCH] Refactor subnet discovery logic to allow auto-detection and
 improve error handling

---
 src/components/ClusterNodesComponent.tsx | 13 +++++++------
 src/hooks/useNodes.ts                    | 12 ++----------
 src/services/api/nodes.ts                | 14 +++++---------
 src/test/utils/nodeFormTestUtils.tsx     |  4 ----
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/components/ClusterNodesComponent.tsx b/src/components/ClusterNodesComponent.tsx
index b0972b4..032d04a 100644
--- a/src/components/ClusterNodesComponent.tsx
+++ b/src/components/ClusterNodesComponent.tsx
@@ -47,7 +47,7 @@ export function ClusterNodesComponent() {
     status: clusterStatus
   } = useCluster(currentInstance);
 
-  const [discoverSubnet, setDiscoverSubnet] = useState('192.168.8.0/24');
+  const [discoverSubnet, setDiscoverSubnet] = useState('');
   const [addNodeIp, setAddNodeIp] = useState('');
   const [discoverError, setDiscoverError] = useState<string | null>(null);
   const [detectError, setDetectError] = useState<string | null>(null);
@@ -92,9 +92,9 @@ export function ClusterNodesComponent() {
     if (prevDiscoveryActive === true && isActive === false && discoveryStatus) {
       const count = discoveryStatus.nodes_found?.length || 0;
       if (count === 0) {
-        setDiscoverSuccess(`Discovery complete! No nodes were found in the subnet.`);
+        setDiscoverSuccess(`Discovery complete! No nodes were found.`);
       } else {
-        setDiscoverSuccess(`Discovery complete! Found ${count} node${count !== 1 ? 's' : ''} in subnet.`);
+        setDiscoverSuccess(`Discovery complete! Found ${count} node${count !== 1 ? 's' : ''}.`);
       }
       setDiscoverError(null);
       refetch();
@@ -224,7 +224,8 @@ export function ClusterNodesComponent() {
   const handleDiscover = () => {
     setDiscoverError(null);
     setDiscoverSuccess(null);
-    discover(discoverSubnet);
+    // Pass subnet only if it's not empty, otherwise auto-detect
+    discover(discoverSubnet || undefined);
   };
 
 
@@ -421,7 +422,7 @@ export function ClusterNodesComponent() {
                 Discover Nodes on Network
               </h3>
               <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">
-                Scan a subnet to find nodes in maintenance mode
+                Scan a specific subnet or leave empty to auto-detect all local networks
               </p>
 
               <div className="flex gap-3 mb-4">
@@ -429,7 +430,7 @@ export function ClusterNodesComponent() {
                   type="text"
                   value={discoverSubnet}
                   onChange={(e) => setDiscoverSubnet(e.target.value)}
-                  placeholder="192.168.8.0/24"
+                  placeholder="192.168.1.0/24 (optional - leave empty to auto-detect)"
                   className="flex-1"
                 />
                 <Button
diff --git a/src/hooks/useNodes.ts b/src/hooks/useNodes.ts
index a4f6dcf..cc6e684 100644
--- a/src/hooks/useNodes.ts
+++ b/src/hooks/useNodes.ts
@@ -12,18 +12,14 @@ export function useNodes(instanceName: string | null | undefined) {
   });
 
   const discoverMutation = useMutation({
-    mutationFn: (subnet: string) => nodesApi.discover(instanceName!, subnet),
+    mutationFn: (subnet?: string) => nodesApi.discover(instanceName!, subnet),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['instances', instanceName, 'discovery'] });
     },
   });
 
   const detectMutation = useMutation({
-    mutationFn: (ip?: string) => nodesApi.detect(instanceName!, ip),
-  });
-
-  const autoDetectMutation = useMutation({
-    mutationFn: () => nodesApi.autoDetect(instanceName!),
+    mutationFn: (ip: string) => nodesApi.detect(instanceName!, ip),
   });
 
   const addMutation = useMutation({
@@ -88,10 +84,6 @@ export function useNodes(instanceName: string | null | undefined) {
     isDetecting: detectMutation.isPending,
     detectResult: detectMutation.data,
     detectError: detectMutation.error,
-    autoDetect: autoDetectMutation.mutate,
-    isAutoDetecting: autoDetectMutation.isPending,
-    autoDetectResult: autoDetectMutation.data,
-    autoDetectError: autoDetectMutation.error,
     getHardware: getHardwareMutation.mutateAsync,
     isGettingHardware: getHardwareMutation.isPending,
     getHardwareError: getHardwareMutation.error,
diff --git a/src/services/api/nodes.ts b/src/services/api/nodes.ts
index 37a7397..006b6e3 100644
--- a/src/services/api/nodes.ts
+++ b/src/services/api/nodes.ts
@@ -35,17 +35,13 @@ export const nodesApi = {
   },
 
   // Discovery
-  async discover(instanceName: string, subnet: string): Promise<OperationResponse> {
-    return apiClient.post(`/api/v1/instances/${instanceName}/nodes/discover`, { subnet });
+  async discover(instanceName: string, subnet?: string): Promise<OperationResponse> {
+    const body = subnet ? { subnet } : {};
+    return apiClient.post(`/api/v1/instances/${instanceName}/nodes/discover`, body);
   },
 
-  async detect(instanceName: string, ip?: string): Promise<OperationResponse> {
-    const body = ip ? { ip } : {};
-    return apiClient.post(`/api/v1/instances/${instanceName}/nodes/detect`, body);
-  },
-
-  async autoDetect(instanceName: string): Promise<{ networks: string[]; nodes: any[]; count: number }> {
-    return apiClient.post(`/api/v1/instances/${instanceName}/nodes/auto-detect`);
+  async detect(instanceName: string, ip: string): Promise<HardwareInfo> {
+    return apiClient.post(`/api/v1/instances/${instanceName}/nodes/detect`, { ip });
   },
 
   async discoveryStatus(instanceName: string): Promise<DiscoveryStatus> {
diff --git a/src/test/utils/nodeFormTestUtils.tsx b/src/test/utils/nodeFormTestUtils.tsx
index eae7552..99b860b 100644
--- a/src/test/utils/nodeFormTestUtils.tsx
+++ b/src/test/utils/nodeFormTestUtils.tsx
@@ -108,10 +108,6 @@ export function mockUseNodes(nodes: Node[] = []) {
     isDetecting: false,
     detectResult: undefined,
     detectError: null,
-    autoDetect: vi.fn(),
-    isAutoDetecting: false,
-    autoDetectResult: undefined,
-    autoDetectError: null,
     getHardware: vi.fn(),
     isGettingHardware: false,
     getHardwareError: null,