From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id B61A01FF170 for ; Thu, 21 Aug 2025 10:43:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CD30A19DE8; Thu, 21 Aug 2025 10:43:08 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Thu, 21 Aug 2025 10:39:41 +0200 Message-ID: <20250821084229.1523597-21-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250821084229.1523597-1-d.csapak@proxmox.com> References: <20250821084229.1523597-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 v3 20/23] ui: pve wizard: connect: move connection logic to next button 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" and remove the explicit 'Connect' button Signed-off-by: Dominik Csapak --- ui/src/remotes/wizard_page_connect.rs | 45 ++++++++++----------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/ui/src/remotes/wizard_page_connect.rs b/ui/src/remotes/wizard_page_connect.rs index 879b4e7..d5d9708 100644 --- a/ui/src/remotes/wizard_page_connect.rs +++ b/ui/src/remotes/wizard_page_connect.rs @@ -6,9 +6,9 @@ use serde_json::json; use yew::html::IntoEventCallback; use yew::virtual_dom::{Key, VComp, VNode}; -use pwt::css::{AlignItems, FlexFit}; +use pwt::css::FlexFit; use pwt::widget::form::{Field, FormContext, FormContextObserver}; -use pwt::widget::{error_message, Button, Column, Container, InputPanel, Mask, Row}; +use pwt::widget::{error_message, Column, InputPanel, Mask}; use pwt::{prelude::*, AsyncPool}; use proxmox_yew_comp::{SchemaValidation, WizardPageRenderInfo}; @@ -113,6 +113,13 @@ impl Component for PdmWizardPageConnect { .add_listener(ctx.link().callback(|_| Msg::FormChange)); props.info.page_lock(true); + props.info.on_next({ + let link = ctx.link().clone(); + move |_| { + link.send_message(Msg::Connect); + false + } + }); Self { connect_info: None, @@ -137,6 +144,7 @@ impl Component for PdmWizardPageConnect { return ::update(self, ctx, Msg::Connect) } } + props.info.page_lock(!self.form_valid); } Msg::Connect => { let link = ctx.link().clone(); @@ -166,13 +174,16 @@ impl Component for PdmWizardPageConnect { form_ctx.write().reset_form(); } props.info.reset_remaining_valid_pages(); + if self.connect_info.is_some() { + props.info.go_to_next_page(); + } } } true } - fn view(&self, ctx: &Context) -> Html { - let props = ctx.props(); + fn view(&self, _ctx: &Context) -> Html { + let error = self.last_error.as_ref(); let input_panel = InputPanel::new() .class(FlexFit) // FIXME: input panel css style is not optimal here... @@ -192,33 +203,11 @@ impl Component for PdmWizardPageConnect { .placeholder(tr!("Server certificate SHA-256 fingerprint, required for self-signed certificates")) .schema(&CERT_FINGERPRINT_SHA256_SCHEMA), ); - let content = Column::new() .class(FlexFit) .with_child(input_panel) - .with_optional_child( - (props.remote_type == RemoteType::Pve).then_some( - Row::new() - .padding(2) - .gap(2) - .class(AlignItems::Center) - .with_optional_child( - self.last_error - .as_deref() - .map(|err| error_message(&err.to_string())), - ) - .with_flex_spacer() - .with_optional_child( - (self.last_error.is_none() && self.connect_info.is_some()) - .then_some(Container::new().with_child(tr!("Connection OK"))), - ) - .with_child( - Button::new("Connect") - .disabled(!self.form_valid) - .on_activate(ctx.link().callback(|_| Msg::Connect)), - ), - ), - ); + .with_optional_child(error.map(|err| error_message(&err.to_string()))); + Mask::new(content) .class(FlexFit) .visible(self.loading) -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel