From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 99BB11FF15C for ; Fri, 22 Aug 2025 10:54:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3DF07B53B; Fri, 22 Aug 2025 10:54:21 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Fri, 22 Aug 2025 10:32:33 +0200 Message-ID: <20250822085409.1139639-16-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250822085409.1139639-1-d.csapak@proxmox.com> References: <20250822085409.1139639-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH datacenter-manager v4 15/23] ui: pve wizard: info: detect hostname and fingerprint X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Instead of always inserting the initial host into the nodelist (which will always be duplicate since it will be also contained in the node list), try to match the hostname and or fingerprint with any of the given node, so we can deduplicate that. Signed-off-by: Dominik Csapak --- ui/src/remotes/wizard_page_info.rs | 37 ++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/ui/src/remotes/wizard_page_info.rs b/ui/src/remotes/wizard_page_info.rs index e2a4a3d..943a08f 100644 --- a/ui/src/remotes/wizard_page_info.rs +++ b/ui/src/remotes/wizard_page_info.rs @@ -104,13 +104,36 @@ async fn scan(connection_params: ConnectParams, form_ctx: FormContext) -> Result let mut result = crate::pdm_client() .pve_scan_remote(&hostname, fingerprint.as_deref(), &authid, &token) .await?; - result.nodes.insert( - 0, - PropertyString::new(NodeUrl { - hostname, - fingerprint, - }), - ); + + // try to deduplicate the entered info from the first page with the nodelist here + // either via the hostname or the fingerprint. if none matches the entered info will + // be an extra entry in the first position + let mut found_matching_host = false; + for node in result.nodes.iter_mut() { + if node.hostname == hostname { + if fingerprint.is_none() { + node.fingerprint = None; + } + found_matching_host = true; + continue; + } + if node.fingerprint.as_ref().map(|fp| fp.to_uppercase()) + == fingerprint.as_ref().map(|fp| fp.to_uppercase()) + { + found_matching_host = true; + node.hostname = hostname.clone(); + continue; + } + } + if !found_matching_host { + result.nodes.insert( + 0, + PropertyString::new(NodeUrl { + hostname, + fingerprint: fingerprint.map(|fp| fp.to_uppercase()), + }), + ); + } result.nodes.sort_by(|a, b| a.hostname.cmp(&b.hostname)); Ok(result) } -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel