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 AFC2B1FF15C for ; Fri, 17 Oct 2025 16:12:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09B33538D; Fri, 17 Oct 2025 16:12:32 +0200 (CEST) From: Christian Ebner To: pdm-devel@lists.proxmox.com Date: Fri, 17 Oct 2025 16:11:35 +0200 Message-ID: <20251017141137.845295-10-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: 1760710312066 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 09/11] ui: dashboard: use new node status component 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" Given the reusable component implementation to render status of PVE and PBS nodes, use it to create the PVE node status panel. Signed-off-by: Christian Ebner --- changes since version 1: - not present in previous version ui/src/dashboard/mod.rs | 112 +++++++++------------------------------- 1 file changed, 25 insertions(+), 87 deletions(-) diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs index f54c509..8a678af 100644 --- a/ui/src/dashboard/mod.rs +++ b/ui/src/dashboard/mod.rs @@ -10,7 +10,7 @@ use yew::{ Component, }; -use proxmox_yew_comp::{http_get, EditWindow, Status}; +use proxmox_yew_comp::{http_get, EditWindow}; use pwt::{ css::{AlignItems, FlexDirection, FlexFit, FlexWrap, JustifyContent}, prelude::*, @@ -25,16 +25,11 @@ use pwt::{ AsyncPool, }; -use pdm_api_types::{ - remotes::RemoteType, - resource::{NodeStatusCount, ResourcesStatus}, - TaskStatistics, -}; +use pdm_api_types::{remotes::RemoteType, resource::ResourcesStatus, TaskStatistics}; use pdm_client::types::TopEntity; -use pdm_search::{Search, SearchTerm}; use proxmox_client::ApiResponseData; -use crate::{pve::GuestType, remotes::AddWizard, search_provider::get_search_provider, RemoteList}; +use crate::{pve::GuestType, remotes::AddWizard, RemoteList}; mod top_entities; pub use top_entities::TopEntities; @@ -48,6 +43,9 @@ use remote_panel::RemotePanel; mod guest_panel; use guest_panel::GuestPanel; +mod node_status_panel; +use node_status_panel::NodeStatusPanel; + mod sdn_zone_panel; use sdn_zone_panel::SdnZonePanel; @@ -123,7 +121,6 @@ pub enum Msg { ForceReload, UpdateConfig(DashboardConfig), ConfigWindow(bool), - Search(Search), } struct StatisticsOptions { @@ -158,79 +155,28 @@ impl PdmDashboard { .into() } - fn create_node_panel(&self, ctx: &yew::Context, icon: &str, title: String) -> Panel { - let mut search_terms = vec![SearchTerm::new("node").category(Some("type"))]; - let (status_icon, text): (Fa, String) = match &self.status { - Some(status) => { - match status.pve_nodes { - NodeStatusCount { - online, - offline, - unknown, - } if offline > 0 => { - search_terms.push(SearchTerm::new("offline").category(Some("status"))); - ( - Status::Error.into(), - tr!( - "{0} of {1} nodes are offline", - offline, - online + offline + unknown, - ), - ) - } - NodeStatusCount { unknown, .. } if unknown > 0 => { - search_terms.push(SearchTerm::new("unknown").category(Some("status"))); - ( - Status::Warning.into(), - tr!("{0} nodes have an unknown status", unknown), - ) - } - // FIXME, get more detailed status about the failed remotes (name, type, error)? - NodeStatusCount { online, .. } if status.failed_remotes > 0 => ( - Status::Unknown.into(), - tr!("{0} of an unknown number of nodes online", online), - ), - NodeStatusCount { online, .. } => { - (Status::Success.into(), tr!("{0} nodes online", online)) - } - } - } - None => (Status::Unknown.into(), String::new()), + fn create_node_panel(&self, icon: &str, title: String) -> Panel { + let (nodes_status, failed_remotes) = match &self.status { + Some(status) => ( + Some(status.pve_nodes.clone()), + status + .failed_remotes_list + .iter() + .filter(|item| item.remote_type == RemoteType::Pve) + .count(), + ), + None => (None, 0), }; - - let loading = self.status.is_none(); - let search = Search::with_terms(search_terms); Panel::new() .flex(1.0) .width(300) .title(self.create_title_with_icon(icon, title)) .border(true) - .with_child( - Column::new() - .padding(4) - .class("pwt-pointer") - .onclick(ctx.link().callback({ - let search = search.clone(); - move |_| Msg::Search(search.clone()) - })) - .onkeydown(ctx.link().batch_callback({ - let search = search.clone(); - move |event: KeyboardEvent| match event.key().as_str() { - "Enter" | " " => Some(Msg::Search(search.clone())), - _ => None, - } - })) - .class(FlexFit) - .class(AlignItems::Center) - .class(JustifyContent::Center) - .gap(2) - .with_child(if loading { - html! {} - } else { - status_icon.large_4x().into() - }) - .with_optional_child((!loading).then_some(text)), - ) + .with_child(NodeStatusPanel::new( + RemoteType::Pve, + nodes_status, + failed_remotes, + )) } fn create_guest_panel(&self, guest_type: GuestType) -> Panel { @@ -501,12 +447,6 @@ impl Component for PdmDashboard { self.show_config_window = false; true } - Msg::Search(search_term) => { - if let Some(provider) = get_search_provider(ctx) { - provider.search(search_term.into()); - } - false - } } } @@ -563,11 +503,9 @@ impl Component for PdmDashboard { ) .with_child(RemotePanel::new(self.status.clone())), ) - .with_child(self.create_node_panel( - ctx, - "building", - tr!("Virtual Environment Nodes"), - )) + .with_child( + self.create_node_panel("building", tr!("Virtual Environment Nodes")), + ) .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