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 9AEE61FF16B for ; Fri, 10 Oct 2025 14:09:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 516431348D; Fri, 10 Oct 2025 14:09:43 +0200 (CEST) Message-ID: Date: Fri, 10 Oct 2025 14:09:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Datacenter Manager development discussion , Shannon Sterz References: <20251003142108.352525-1-s.sterz@proxmox.com> <20251003142108.352525-5-s.sterz@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20251003142108.352525-5-s.sterz@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760098115256 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mozilla.org, utils.rs] Subject: Re: [pdm-devel] [PATCH yew-comp 1/2] utils/tfa add recover/token panel: add copy_text_to_clipboard function 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" looks good to me, consider Reviewed-by: Dominik Csapak On 10/3/25 4:20 PM, Shannon Sterz wrote: > this also adapts all use sites of `copy_to_clipboard` to use this new > function instead and marks the old function as deprecated. > `copy_to_clipboard` is based on the `document.execCommand()` method > that is deprecated and might not be supported in the future [1]. > > `copy_text_to_clipboard` is based on the new `Clipboard` API that is > now in baseline and, thus, widely available. it should also be > somewhat more ergonomic to use. users don't need to handle a `NodeRef` > in multiple places, but can just pass text to be copied to the > function directly. > > this requires the web_sys features `Clipboard` and `Navigator`. > > [1]: > https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand > [2]: > https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/writeText > > Signed-off-by: Shannon Sterz > --- > Cargo.toml | 2 ++ > src/tfa/tfa_add_recovery.rs | 17 ++++++----------- > src/token_panel.rs | 16 +++++++++------- > src/utils.rs | 22 ++++++++++++++++++++++ > 4 files changed, 39 insertions(+), 18 deletions(-) > > diff --git a/Cargo.toml b/Cargo.toml > index 9abb8d3..9fe242f 100644 > --- a/Cargo.toml > +++ b/Cargo.toml > @@ -18,6 +18,7 @@ web-sys = { version = "0.3", features = [ > "AbortController", > "AbortSignal", > "Attr", > + "Clipboard", > "Crypto", > "Document", > "DomParser", > @@ -26,6 +27,7 @@ web-sys = { version = "0.3", features = [ > "HtmlDocument", > "HtmlElement", > "NamedNodeMap", > + "Navigator", > "Node", > "Range", > "ReadableStreamDefaultReader", > diff --git a/src/tfa/tfa_add_recovery.rs b/src/tfa/tfa_add_recovery.rs > index b24e73c..7c0e9d6 100644 > --- a/src/tfa/tfa_add_recovery.rs > +++ b/src/tfa/tfa_add_recovery.rs > @@ -14,7 +14,7 @@ use crate::percent_encoding::percent_encode_component; > > use pwt_macros::builder; > > -use crate::utils::copy_to_clipboard; > +use crate::utils::copy_text_to_clipboard; > use crate::{AuthidSelector, EditWindow}; > > #[derive(Debug, Deserialize)] > @@ -81,7 +81,6 @@ pub enum Msg { > #[doc(hidden)] > pub struct ProxmoxTfaAddRecovery { > recovery_keys: Option, > - container_ref: NodeRef, > print_counter: usize, > print_portal: Option, > } > @@ -107,14 +106,15 @@ fn render_input_form(_form_ctx: FormContext) -> Html { > impl ProxmoxTfaAddRecovery { > fn recovery_keys_dialog(&self, ctx: &Context, data: &RecoveryKeyInfo) -> Html { > use std::fmt::Write; > - let text: String = data > + let text: AttrValue = data > .keys > .iter() > .enumerate() > .fold(String::new(), |mut acc, (i, key)| { > let _ = writeln!(acc, "{i}: {key}\n"); > acc > - }); > + }) > + .into(); > > Dialog::new(tr!("Recovery Keys for user '{}'", data.userid)) > .on_close(ctx.props().on_close.clone()) > @@ -128,8 +128,7 @@ impl ProxmoxTfaAddRecovery { > .class("pwt-font-monospace") > .padding(2) > .border(true) > - .with_child(text) > - .into_html_with_ref(self.container_ref.clone()), > + .with_child(text.clone()), > ) > .with_child( > Container::new() > @@ -147,10 +146,7 @@ impl ProxmoxTfaAddRecovery { > Button::new(tr!("Copy Recovery Keys")) > .icon_class("fa fa-clipboard") > .class("pwt-scheme-primary") > - .onclick({ > - let container_ref = self.container_ref.clone(); > - move |_| copy_to_clipboard(&container_ref) > - }), > + .on_activate(move |_| copy_text_to_clipboard(&text)), > ) > .with_child( > Button::new(tr!("Print Recovery Keys")) > @@ -172,7 +168,6 @@ impl Component for ProxmoxTfaAddRecovery { > fn create(_ctx: &Context) -> Self { > Self { > recovery_keys: None, > - container_ref: NodeRef::default(), > print_portal: None, > print_counter: 0, > } > diff --git a/src/token_panel.rs b/src/token_panel.rs > index c70adb2..c027a32 100644 > --- a/src/token_panel.rs > +++ b/src/token_panel.rs > @@ -17,7 +17,9 @@ use pwt::widget::form::{Checkbox, DisplayField, Field, FormContext, InputType}; > use pwt::widget::{Button, Column, Container, Dialog, InputPanel, Toolbar}; > > use crate::percent_encoding::percent_encode_component; > -use crate::utils::{copy_to_clipboard, epoch_to_input_value, render_boolean, render_epoch_short}; > +use crate::utils::{ > + copy_text_to_clipboard, epoch_to_input_value, render_boolean, render_epoch_short, > +}; > use crate::{ > AuthidSelector, ConfirmButton, EditWindow, LoadableComponent, LoadableComponentContext, > LoadableComponentLink, LoadableComponentMaster, PermissionPanel, > @@ -121,7 +123,6 @@ enum Msg { > struct ProxmoxTokenView { > selection: Selection, > store: Store, > - secret_node_ref: NodeRef, > columns: Rc>>, > } > > @@ -149,7 +150,6 @@ impl LoadableComponent for ProxmoxTokenView { > Self { > selection, > store, > - secret_node_ref: NodeRef::default(), > columns: columns(), > } > } > @@ -351,8 +351,7 @@ impl ProxmoxTokenView { > .style("opacity", "0") > .with_child(AttrValue::from( > secret["value"].as_str().unwrap_or("").to_owned(), > - )) > - .into_html_with_ref(self.secret_node_ref.clone()), > + )), > ) > .with_child( > Container::new() > @@ -373,8 +372,11 @@ impl ProxmoxTokenView { > .icon_class("fa fa-clipboard") > .class("pwt-scheme-primary") > .on_activate({ > - let copy_ref = self.secret_node_ref.clone(); > - move |_| copy_to_clipboard(©_ref) > + move |_| { > + copy_text_to_clipboard( > + secret["value"].as_str().unwrap_or(""), > + ) > + } > }), > ), > ), > diff --git a/src/utils.rs b/src/utils.rs > index 79b7ad7..23794b9 100644 > --- a/src/utils.rs > +++ b/src/utils.rs > @@ -2,6 +2,7 @@ use std::collections::HashMap; > use std::fmt::Display; > use std::sync::Mutex; > > +use pwt::convert_js_error; > use serde_json::Value; > use wasm_bindgen::JsCast; > use yew::prelude::*; > @@ -338,6 +339,9 @@ pub fn json_array_to_flat_string(list: &[Value]) -> String { > list.join(" ") > } > > +#[deprecated( > + note = "This relies on the deprecated `execCommand` method. Please use `utils::copy_text_to_clipboard` instead." > +)] > pub fn copy_to_clipboard(node_ref: &NodeRef) { > if let Some(el) = node_ref.cast::() { > let window = gloo_utils::window(); > @@ -356,6 +360,24 @@ pub fn copy_to_clipboard(node_ref: &NodeRef) { > } > } > > +pub fn copy_text_to_clipboard(text: &str) { > + let text = text.to_owned(); > + > + wasm_bindgen_futures::spawn_local(async move { > + let future: wasm_bindgen_futures::JsFuture = gloo_utils::window() > + .navigator() > + .clipboard() > + .write_text(&text) > + .into(); > + > + let res = future.await.map_err(convert_js_error); > + > + if let Err(e) = res { > + log::error!("could not copy to clipboard: {e:#}"); > + } > + }); > +} > + > /// Set the browser window.location.href > pub fn set_location_href(href: &str) { > let window = gloo_utils::window(); _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel