public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager v4 19/23] ui: pve wizard: connect: factor out normalize_hostname
Date: Fri, 22 Aug 2025 10:32:37 +0200	[thread overview]
Message-ID: <20250822085409.1139639-20-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250822085409.1139639-1-d.csapak@proxmox.com>

we'll use this later again

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/remotes/wizard_page_connect.rs | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/ui/src/remotes/wizard_page_connect.rs b/ui/src/remotes/wizard_page_connect.rs
index f4d05db..879b4e7 100644
--- a/ui/src/remotes/wizard_page_connect.rs
+++ b/ui/src/remotes/wizard_page_connect.rs
@@ -65,15 +65,7 @@ pub struct ConnectParams {
 async fn connect(form_ctx: FormContext, remote_type: RemoteType) -> Result<ConnectParams, Error> {
     let data = form_ctx.get_submit_data();
     let mut data: ConnectParams = serde_json::from_value(data.clone())?;
-    if let Some(hostname) = data.hostname.strip_prefix("http://") {
-        data.hostname = hostname.to_string();
-    }
-    if let Some(hostname) = data.hostname.strip_prefix("https://") {
-        data.hostname = hostname.to_string();
-    }
-    if let Some(hostname) = data.hostname.strip_suffix("/") {
-        data.hostname = hostname.to_string();
-    }
+    data.hostname = normalize_hostname(data.hostname);
 
     let realms = match remote_type {
         RemoteType::Pve => list_realms(data.hostname.clone(), data.fingerprint.clone()).await?,
@@ -234,6 +226,20 @@ impl Component for PdmWizardPageConnect {
     }
 }
 
+fn normalize_hostname(hostname: String) -> String {
+    let mut result = hostname;
+    if let Some(hostname) = result.strip_prefix("http://") {
+        result = hostname.to_string();
+    }
+    if let Some(hostname) = result.strip_prefix("https://") {
+        result = hostname.to_string();
+    }
+    if let Some(hostname) = result.strip_suffix("/") {
+        result = hostname.to_string();
+    }
+    result
+}
+
 impl Into<VNode> for WizardPageConnect {
     fn into(self) -> VNode {
         let comp = VComp::new::<PdmWizardPageConnect>(Rc::new(self), None);
-- 
2.47.2



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel


  parent reply	other threads:[~2025-08-22  8:54 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-22  8:32 [pdm-devel] [PATCH datacenter-manager v4 00/23] improve remote wizard Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 01/23] server/ui: pve: change 'realm list' api call to GET Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 02/23] api types: RemoteType: put default port info to the type Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 03/23] server: connection: add probe_tls_connection helper Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 04/23] server: add probe-tls endpoint Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 05/23] server: pve api: extend 'scan' so it tls-probes the nodes Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 06/23] pdm-client: add scan_remote and probe_tls methods Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 07/23] ui: remotes: node url list: add placeholder and clear trigger Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 08/23] ui: remotes: node url list: make column header clearer Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 09/23] ui: remotes: node url list: handle changing default Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 10/23] ui: pve wizard: rename 'realm' variable to 'info' Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 11/23] ui: pve wizard: summary: add default text for fingerprint Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 12/23] ui: pve wizard: nodes: improve info text Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 13/23] ui: pve wizard: nodes: probe hosts to verify fingerprint settings Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 14/23] ui: pve wizard: info: use pdm_client for scanning Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 15/23] ui: pve wizard: info: detect hostname and fingerprint Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 16/23] ui: pve wizard: info: remove manual scan button Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 17/23] ui: widget: add pve realm selector Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 18/23] ui: pve wizard: info: use " Dominik Csapak
2025-08-22  8:32 ` Dominik Csapak [this message]
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 20/23] ui: pve wizard: connect: move connection logic to next button Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 21/23] ui: pve wizard: connect: reset later pages when form changes Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 22/23] ui: pve wizard: connect: use scan api endpoint instead of realms Dominik Csapak
2025-08-22  8:32 ` [pdm-devel] [PATCH datacenter-manager v4 23/23] ui: pve wizard: connect: add certificate confirmation dialog Dominik Csapak
2025-08-22 13:30 ` [pdm-devel] [PATCH datacenter-manager v4 00/23] improve remote wizard Lukas Wagner
2025-08-22 14:07 ` [pdm-devel] applied: " Lukas Wagner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250822085409.1139639-20-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pdm-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal