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 199391FF17C for ; Tue, 2 Dec 2025 17:40:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7F1F17D51; Tue, 2 Dec 2025 17:40:45 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Tue, 2 Dec 2025 17:39:59 +0100 Message-ID: <20251202163959.434098-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1764693566786 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 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. [tasks.rs] Subject: [pdm-devel] [PATCH datacenter-manager] ui: task list: look up task description for PBS tasks 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" Before this commit, PBS tasks would have their full UPID in the 'Description' column, which looks a bit odd. The actual task description definitions are still missing, these can be added later. Up until then, the description will now look like e.g. 'create-datastore xyz', which is definitely better than the plain UPID. Signed-off-by: Lukas Wagner --- ui/src/tasks.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ui/src/tasks.rs b/ui/src/tasks.rs index 41a8648d..0f9a9aa7 100644 --- a/ui/src/tasks.rs +++ b/ui/src/tasks.rs @@ -1,8 +1,7 @@ use proxmox_yew_comp::utils::{format_task_description, format_upid, register_task_description}; use pwt::tr; -use pdm_api_types::RemoteUpid; -use pdm_client::types::PveUpid; +use pdm_api_types::{NativeUpid, RemoteUpid}; use yew::virtual_dom::Key; pub fn register_pve_tasks() { @@ -112,10 +111,16 @@ pub fn register_pve_tasks() { /// If it's a [`RemoteUpid`], prefixes it with the remote name pub fn format_optional_remote_upid(upid: &str, include_remote: bool) -> String { if let Ok(remote_upid) = upid.parse::() { - let description = match remote_upid.upid().parse::() { - Ok(upid) => format_task_description(&upid.worker_type, upid.worker_id.as_deref()), + let description = match remote_upid.native_upid() { + Ok(NativeUpid::PveUpid(upid)) => { + format_task_description(&upid.worker_type, upid.worker_id.as_deref()) + } + Ok(NativeUpid::PbsUpid(upid)) => { + format_task_description(&upid.worker_type, upid.worker_id.as_deref()) + } Err(_) => format_upid(&remote_upid.upid()), }; + if include_remote { format!("{} - {}", remote_upid.remote(), description) } else { -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel