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 B86B71FF178 for ; Mon, 1 Dec 2025 11:39:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DD825188B9; Mon, 1 Dec 2025 11:40:19 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 1 Dec 2025 11:39:06 +0100 Message-ID: <20251201103917.1357369-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251201103917.1357369-1-d.csapak@proxmox.com> References: <20251201103917.1357369-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 4/8] ui: login: enable subscription check 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" 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 --- 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, _> = 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 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel