From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager v2 18/21] ui: pve wizard: connect: factor out normalize_hostname
Date: Mon, 18 Aug 2025 15:30:41 +0200 [thread overview]
Message-ID: <20250818133044.2816336-19-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250818133044.2816336-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.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-08-18 13:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-18 13:30 [pdm-devel] [PATCH datacenter-manager v2 00/21] improve remote wizard Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 01/21] server/ui: pve: change 'realm list' api call to GET Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 02/21] api types: RemoteType: put default port info to the type Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 03/21] server: connection: add probe_tls_connection helper Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 04/21] server/ui: pve api: extend 'scan' so it can probe the tls connection Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 05/21] pdm-client: add scan_remote and probe_tls methods Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 06/21] ui: remotes: node url list: add placeholder and clear trigger Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 07/21] ui: rmeotes: node url list: make column header clearer Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 08/21] ui: remotes: node url list: handle changing default Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 09/21] ui: pve wizard: rename 'realm' variable to 'info' Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 10/21] ui: pve wizard: summary: add default text for fingerprint Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 11/21] ui: pve wizard: nodes: improve info text Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 12/21] ui: pve wizard: nodes: probe hosts to verify fingerprint settings Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 13/21] ui: pve wizard: info: use pdm_client for scanning Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 14/21] ui: pve wizard: info: detect hostname and fingerprint Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 15/21] ui: pve wizard: info: remove manual scan button Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 16/21] ui: widget: add pve realm selector Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 17/21] ui: pve wizard: info: use " Dominik Csapak
2025-08-18 13:30 ` Dominik Csapak [this message]
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 19/21] ui: pve wizard: connect: move connection logic to next button Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 20/21] ui: pve wizard: connect: use scan api endpoint instead of realms Dominik Csapak
2025-08-18 13:30 ` [pdm-devel] [PATCH datacenter-manager v2 21/21] ui: pve wizard: connect: add certificate confirmation dialog Dominik Csapak
2025-08-19 12:14 ` [pdm-devel] [PATCH datacenter-manager v2 00/21] improve remote wizard Lukas Wagner
2025-08-21 8:48 ` [pdm-devel] superseded: " Dominik Csapak
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=20250818133044.2816336-19-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.