From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pdm-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id EA0801FF15C for <inbox@lore.proxmox.com>; Fri, 16 May 2025 15:35:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB04ADA11; Fri, 16 May 2025 15:36:20 +0200 (CEST) From: Dominik Csapak <d.csapak@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Fri, 16 May 2025 15:36:05 +0200 Message-Id: <20250516133611.3499075-16-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250516133611.3499075-1-d.csapak@proxmox.com> References: <20250516133611.3499075-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 15/21] ui: pve wizard: info: remove manual scan button X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion <pdm-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/> List-Post: <mailto:pdm-devel@lists.proxmox.com> List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Datacenter Manager development discussion <pdm-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com> and scan the host when advancing in the wizard instead. This makes the panel a bit less cluttered. Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- ui/src/remotes/wizard_page_info.rs | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/ui/src/remotes/wizard_page_info.rs b/ui/src/remotes/wizard_page_info.rs index 04b0004..0d19ebf 100644 --- a/ui/src/remotes/wizard_page_info.rs +++ b/ui/src/remotes/wizard_page_info.rs @@ -188,6 +188,14 @@ impl Component for PdmWizardPageInfo { .form_ctx .add_listener(ctx.link().callback(|_| Msg::FormChange)); + props.info.on_next({ + let link = ctx.link().clone(); + move |_| { + link.send_message(Msg::Connect); + false + } + }); + Self { server_info: None, user_mode: true, @@ -223,6 +231,7 @@ impl Component for PdmWizardPageInfo { } else { self.credentials = None; } + props.info.page_lock(self.credentials.is_none()); } Msg::Connect => { let link = ctx.link().clone(); @@ -230,6 +239,7 @@ impl Component for PdmWizardPageInfo { let form_ctx = props.info.form_ctx.clone(); self.loading = true; self.last_error = None; + props.info.page_lock(true); if let Some(connection_info) = props.connect_info.clone() { self.async_pool.spawn(async move { @@ -242,19 +252,27 @@ impl Component for PdmWizardPageInfo { } Msg::ConnectResult(server_info) => { self.loading = false; + props.info.page_lock(false); match server_info { Ok(server_info) => { self.update_server_info(ctx, Some(server_info)); } Err(err) => { self.last_error = Some(err); + props.info.page_lock(true); } } if let Some(form_ctx) = props.info.lookup_form_context(&Key::from("nodes")) { - form_ctx.write().reset_form(); + let mut form = form_ctx.write(); + form.set_field_value("nodes", serde_json::Value::Null); + form.reset_form(); } props.info.reset_remaining_valid_pages(); + + if self.last_error.is_none() { + props.info.go_to_next_page(); + } } } true @@ -366,16 +384,6 @@ impl Component for PdmWizardPageInfo { self.last_error .as_deref() .map(|err| error_message(&err.to_string())), - ) - .with_flex_spacer() - .with_optional_child( - (self.last_error.is_none() && self.server_info.is_some()) - .then_some(Container::new().with_child(tr!("Scan OK"))), - ) - .with_child( - Button::new("Scan") - .disabled(self.credentials.is_none()) - .onclick(ctx.link().callback(|_| Msg::Connect)), ), ); Mask::new(content) -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel