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 1566C1FF15C for ; Fri, 17 Oct 2025 16:12:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BF5A152E7; Fri, 17 Oct 2025 16:12:30 +0200 (CEST) From: Christian Ebner To: pdm-devel@lists.proxmox.com Date: Fri, 17 Oct 2025 16:11:36 +0200 Message-ID: <20251017141137.845295-11-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251017141137.845295-1-c.ebner@proxmox.com> References: <20251017141137.845295-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760710312282 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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 v2 10/11] ui: dashboard: extend node panel creation by remote type 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" Make the node panel instantiation logic reusable for the PBS remotes by passing the remote type as additional parameter, switching the rendered node status information based on that. Signed-off-by: Christian Ebner --- changes since version 1: - adapt to new refactored code ui/src/dashboard/mod.rs | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs index 8a678af..d90d56c 100644 --- a/ui/src/dashboard/mod.rs +++ b/ui/src/dashboard/mod.rs @@ -155,25 +155,30 @@ impl PdmDashboard { .into() } - fn create_node_panel(&self, icon: &str, title: String) -> Panel { + fn create_node_panel(&self, icon: &str, title: String, remote_type: RemoteType) -> Panel { let (nodes_status, failed_remotes) = match &self.status { - Some(status) => ( - Some(status.pve_nodes.clone()), - status + Some(status) => { + let nodes_status = match remote_type { + RemoteType::Pve => Some(status.pve_nodes.clone()), + RemoteType::Pbs => Some(status.pbs_nodes.clone()), + }; + let failed_remotes = status .failed_remotes_list .iter() - .filter(|item| item.remote_type == RemoteType::Pve) - .count(), - ), + .filter(|item| item.remote_type == remote_type) + .count(); + (nodes_status, failed_remotes) + } None => (None, 0), }; + Panel::new() .flex(1.0) .width(300) .title(self.create_title_with_icon(icon, title)) .border(true) .with_child(NodeStatusPanel::new( - RemoteType::Pve, + remote_type, nodes_status, failed_remotes, )) @@ -503,9 +508,11 @@ impl Component for PdmDashboard { ) .with_child(RemotePanel::new(self.status.clone())), ) - .with_child( - self.create_node_panel("building", tr!("Virtual Environment Nodes")), - ) + .with_child(self.create_node_panel( + "building", + tr!("Virtual Environment Nodes"), + RemoteType::Pve, + )) .with_child(self.create_guest_panel(GuestType::Qemu)) .with_child(self.create_guest_panel(GuestType::Lxc)) // FIXME: add PBS support -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel