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 A77131FF163 for ; Thu, 19 Dec 2024 13:32:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DE534B17; Thu, 19 Dec 2024 13:32:55 +0100 (CET) Message-ID: Date: Thu, 19 Dec 2024 13:32:50 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Datacenter Manager development discussion , Shannon Sterz References: <20241219110059.166895-1-s.sterz@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20241219110059.166895-1-s.sterz@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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: Re: [pdm-devel] [PATCH datacenter-manager] ui: remotes: use ConfirmButton component instead of ConfirmDialog 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" content and functionality wise all 3 patches look good to me (and work fine in my testing) On 12/19/24 12:00, Shannon Sterz wrote: > Signed-off-by: Shannon Sterz > --- > ui/src/remotes/mod.rs | 26 +++++++++----------------- > 1 file changed, 9 insertions(+), 17 deletions(-) > > diff --git a/ui/src/remotes/mod.rs b/ui/src/remotes/mod.rs > index c9a4e43..9b9de06 100644 > --- a/ui/src/remotes/mod.rs > +++ b/ui/src/remotes/mod.rs > @@ -27,8 +27,6 @@ use anyhow::Error; > use edit_remote::EditRemote; > //use pwt::widget::form::{Field, FormContext, InputType}; > > -use pwt::widget::ConfirmDialog; > - > use pdm_api_types::remotes::Remote; > //use proxmox_schema::{property_string::PropertyString, ApiType}; > use proxmox_yew_comp::percent_encoding::percent_encode_component; > @@ -54,7 +52,9 @@ use pwt::widget::{ > //use pwt::widget::InputPanel; > > //use proxmox_yew_comp::EditWindow; > -use proxmox_yew_comp::{LoadableComponent, LoadableComponentContext, LoadableComponentMaster}; > +use proxmox_yew_comp::{ > + ConfirmButton, LoadableComponent, LoadableComponentContext, LoadableComponentMaster, > +}; > > use pdm_api_types::remotes::{NodeUrl, RemoteType}; > > @@ -120,7 +120,6 @@ impl RemoteConfigPanel { > pub enum ViewState { > Add(RemoteType), > Edit, > - ConfirmRemove, > } > > pub enum Msg { > @@ -220,10 +219,12 @@ impl LoadableComponent for PbsRemoteConfigPanel { > .disabled(disabled) > .onclick(link.change_view_callback(|_| Some(ViewState::Edit))), > ) > - .with_child(Button::new(tr!("Remove")).disabled(disabled).onclick({ > - let link = link.clone(); > - move |_| link.change_view(Some(ViewState::ConfirmRemove)) > - })) > + .with_child( > + ConfirmButton::new(tr!("Remove")) > + .confirm_message(tr!("Are you sure you want to remove this remote?")) > + .disabled(disabled) > + .on_activate(link.callback(|_| Msg::RemoveItem)), > + ) > .with_flex_spacer() > .with_child({ > let loading = ctx.loading(); > @@ -257,15 +258,6 @@ impl LoadableComponent for PbsRemoteConfigPanel { > .selection > .selected_key() > .map(|key| self.create_edit_dialog(ctx, key)), > - ViewState::ConfirmRemove => self.selection.selected_key().map(|key| { > - ConfirmDialog::new() > - .title(tr!("Confirm: Remove Remote")) > - .confirm_text(tr!("Remove")) > - .confirm_message(tr!("Are you sure you want to remove the remote '{0}' ?", key)) > - .on_confirm(ctx.link().callback(|_| Msg::RemoveItem)) > - .on_done(ctx.link().change_view_callback(|_| None)) > - .into() > - }), this hunk has a merge conflict with: https://lists.proxmox.com/pipermail/pdm-devel/2024-December/000012.html due to an accidental rustfmt hunk there > } > } > } _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel