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 38D3C1FF163 for ; Thu, 19 Dec 2024 12:01:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 881412159; Thu, 19 Dec 2024 12:01:48 +0100 (CET) From: Shannon Sterz To: pdm-devel@lists.proxmox.com Date: Thu, 19 Dec 2024 12:00:58 +0100 Message-Id: <20241219110059.166895-2-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241219110059.166895-1-s.sterz@proxmox.com> References: <20241219110059.166895-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.036 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 proxmox-yew-comp 2/2] confirm_button: use confirm dialog and always spawn a dialog 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" this uses the new `ConfirmDialog` component from pwt and now always spawns a dialog, even if no explicit confirm message was set. Signed-off-by: Shannon Sterz --- src/confirm_button.rs | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/confirm_button.rs b/src/confirm_button.rs index 95b2b6d..9406d4b 100644 --- a/src/confirm_button.rs +++ b/src/confirm_button.rs @@ -1,8 +1,8 @@ use yew::html::{IntoEventCallback, IntoPropValue}; +use pwt::prelude::*; use pwt::props::IntoOptionalInlineHtml; -use pwt::widget::{Button, Column, MessageBoxButtons}; -use pwt::{prelude::*, widget::MessageBox}; +use pwt::widget::{Button, Column, ConfirmDialog}; use pwt_macros::{builder, widget}; @@ -122,25 +122,15 @@ impl Component for ProxmoxConfirmButton { let props = ctx.props(); match msg { Msg::Request => { - if let Some(message) = &props.confirm_message { - if self.dialog.is_some() { - return false; - } - - let dialog = MessageBox::new(tr!("Confirm"), message.clone()) - .buttons(MessageBoxButtons::YesNo) - .on_close(ctx.link().callback(|confirm| { - if confirm { - Msg::Activate - } else { - Msg::CloseDialog - } - })); - - self.dialog = Some(dialog.into()); - } else { - ctx.link().send_message(Msg::Activate); + let mut dialog = ConfirmDialog::default() + .on_confirm(ctx.link().callback(|_| Msg::Activate)) + .on_close(ctx.link().callback(|_| Msg::CloseDialog)); + + if let Some(confirm_message) = &props.confirm_message { + dialog.set_confirm_message(confirm_message.clone()) } + + self.dialog = Some(dialog.into()); true } Msg::Activate => { -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel