[pdm-devel] [PATCH datacenter-manager 4/8] ui: login: enable subscription check
Dominik Csapak
d.csapak at proxmox.com
Mon Dec 1 11:39:06 CET 2025
show popup when:
* amount of remotes <= 5 => when any remote does not have a valid subscription
* amount of remotes >5 => when more than 1 pve or pbs remotes don't have
a subscription
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
ui/src/main.rs | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/ui/src/main.rs b/ui/src/main.rs
index 454a2927..ebf427bf 100644
--- a/ui/src/main.rs
+++ b/ui/src/main.rs
@@ -21,6 +21,7 @@ use proxmox_yew_comp::{
};
//use pbs::MainMenu;
+use pdm_api_types::remotes::RemoteType;
use pdm_api_types::subscription::{RemoteSubscriptionState, RemoteSubscriptions};
use pdm_api_types::views::ViewConfig;
use pdm_ui::{
@@ -67,9 +68,34 @@ async fn check_subscription() -> Msg {
let data: Result<Vec<RemoteSubscriptions>, _> = http_get("/resources/subscription", None).await;
let show_alert = match data {
- Ok(list) => list
- .into_iter()
- .any(|info| info.state == RemoteSubscriptionState::None),
+ Ok(list) => {
+ let mut pve_none = 0;
+ let mut pve_total = 0;
+ let mut pbs_none = 0;
+ let mut pbs_total = 0;
+
+ for info in list {
+ match info.remote_type {
+ RemoteType::Pve => {
+ pve_total += 1;
+ if info.state == RemoteSubscriptionState::None {
+ pve_none += 1
+ }
+ }
+ RemoteType::Pbs => {
+ pbs_total += 1;
+ if info.state == RemoteSubscriptionState::None {
+ pbs_none += 1
+ }
+ }
+ }
+ }
+ if pve_total + pbs_total <= 5 {
+ pve_none + pbs_none > 0
+ } else {
+ pve_none > 1 || pbs_none > 1
+ }
+ }
Err(_) => false,
};
@@ -246,11 +272,8 @@ impl Component for DatacenterManagerApp {
true
}
Msg::ShowSubscriptionAlert => {
- // Disable for alpha and rework for a beta or stable version to avoid friction if a
- // few unsubscribed test instances are present in another subscribed (big) setup.
- // self.show_subscription_alert = Some(true);
- self.subscription_confirmed = true;
- self.show_subscription_alert = Some(false);
+ self.subscription_confirmed = false;
+ self.show_subscription_alert = Some(true);
true
}
Msg::Logout => {
--
2.47.3
More information about the pdm-devel
mailing list