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 D95031FF15C for ; Fri, 28 Nov 2025 14:52:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 21F3C1BBFE; Fri, 28 Nov 2025 14:52:22 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Fri, 28 Nov 2025 14:51:03 +0100 Message-ID: <20251128135147.3132978-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 Subject: [pdm-devel] [PATCH datacenter-manager] ui: subscription_info: add subscription counts 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" count the subscriptions we know of and show them in a tabular style. the list is split between PVE and PBS. Signed-off-by: Dominik Csapak --- not super sure about the style and positioning, and when one has many different types of subscriptions, this can get rather large maybe it would be better as it's own panel? ui/src/dashboard/subscription_info.rs | 99 ++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 3 deletions(-) diff --git a/ui/src/dashboard/subscription_info.rs b/ui/src/dashboard/subscription_info.rs index 6c94b8ef..73c70c0c 100644 --- a/ui/src/dashboard/subscription_info.rs +++ b/ui/src/dashboard/subscription_info.rs @@ -1,3 +1,4 @@ +use std::collections::HashMap; use std::rc::Rc; use anyhow::Error; @@ -7,16 +8,19 @@ use yew::{ }; use proxmox_yew_comp::Status; -use pwt::prelude::*; use pwt::widget::{Button, Column, Container, Dialog, Fa, Panel, Row}; +use pwt::{css::AlignSelf, prelude::*}; use pwt::{ css::{AlignItems, FlexFit, JustifyContent, TextAlign}, state::SharedState, }; -use pdm_api_types::subscription::{RemoteSubscriptionState, RemoteSubscriptions}; +use pdm_api_types::remotes::RemoteType; +use pdm_api_types::subscription::{ + NodeSubscriptionInfo, RemoteSubscriptionState, RemoteSubscriptions, SubscriptionLevel, +}; -use crate::{dashboard::SubscriptionsList, LoadResult}; +use crate::{dashboard::SubscriptionsList, get_remote_list, LoadResult, RemoteList}; #[derive(Properties, PartialEq)] pub struct SubscriptionInfo { @@ -31,6 +35,92 @@ impl SubscriptionInfo { struct PdmSubscriptionInfo; +#[derive(Default)] +struct SubCount { + community: u32, + basic: u32, + standard: u32, + premium: u32, + none: u32, +} + +impl SubCount { + fn count_subs(&mut self, subscriptions: &HashMap>) { + for info in subscriptions.values().flatten() { + match info.level { + SubscriptionLevel::None => self.none += 1, + SubscriptionLevel::Unknown => {} + SubscriptionLevel::Community => self.community += 1, + SubscriptionLevel::Basic => self.basic += 1, + SubscriptionLevel::Standard => self.standard += 1, + SubscriptionLevel::Premium => self.premium += 1, + } + } + } + + fn total(&self) -> u32 { + self.community + self.basic + self.standard + self.none + } +} + +fn render_subscription_list(remotes: RemoteList, subs: &[RemoteSubscriptions]) -> Column { + let mut pve = SubCount::default(); + let mut pbs = SubCount::default(); + + for sub in subs { + if let Some(remote_type) = remotes + .iter() + .find_map(|remote| (remote.id == sub.remote).then_some(remote.ty)) + { + if let Some(hash) = sub.node_status.as_ref() { + match remote_type { + RemoteType::Pve => pve.count_subs(hash), + RemoteType::Pbs => pbs.count_subs(hash), + } + } + } + } + + fn render_row(count: u32, text: impl Into) -> Option { + (count > 0).then_some( + Row::new() + .padding_start(2) + .gap(2) + .with_child(Container::new().with_child(text)) + .with_flex_spacer() + .with_child(Container::new().with_child(count)), + ) + } + + fn render_product(count: SubCount, title: &str) -> Option { + (count.total() > 0).then_some( + Column::new() + .class(FlexFit) + .class(AlignSelf::Stretch) + .padding_x(4) + .padding_bottom(4) + .gap(1) + .with_child( + Row::new() + .gap(2) + .with_child(Container::new().with_child(title)) + .with_flex_spacer() + .with_child(Container::new().with_child(tr!("Subscriptions"))), + ) + .with_optional_child(render_row(count.community, "Community")) + .with_optional_child(render_row(count.basic, "Basic")) + .with_optional_child(render_row(count.standard, "Standard")) + .with_optional_child(render_row(count.premium, "Premium")) + .with_optional_child(render_row(count.none, tr!("None"))), + ) + } + + Column::new() + .class(AlignSelf::Stretch) + .with_optional_child(render_product(pve, "Proxmox VE")) + .with_optional_child(render_product(pbs, "Proxmox Backup Server")) +} + fn render_subscription_status(subs: &[RemoteSubscriptions]) -> Row { let mut none = 0; let mut mixed = 0; @@ -122,6 +212,9 @@ impl Component for PdmSubscriptionInfo { .as_ref() .map(|subs| render_subscription_status(subs)), ) + .with_optional_child(props.subs.as_ref().and_then(|subs| { + get_remote_list(ctx.link()).map(|remotes| render_subscription_list(remotes, subs)) + })) .into() } } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel