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 2AD441FF178 for ; Mon, 1 Dec 2025 11:39:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 881C2189AD; Mon, 1 Dec 2025 11:40:21 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 1 Dec 2025 11:39:09 +0100 Message-ID: <20251201103917.1357369-10-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 7/8] ui: refactor check_subscription into lib 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" so we can reuse the global subscription check logic elsewhere Signed-off-by: Dominik Csapak --- ui/src/lib.rs | 40 +++++++++++++++++++++++++++++++++- ui/src/main.rs | 59 ++++++++++---------------------------------------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/ui/src/lib.rs b/ui/src/lib.rs index 27a51084..e0959029 100644 --- a/ui/src/lib.rs +++ b/ui/src/lib.rs @@ -1,7 +1,7 @@ use js_sys::{Array, JsString, Object}; use pdm_api_types::remotes::RemoteType; use pdm_api_types::resource::{PveLxcResource, PveNetworkResource, PveQemuResource}; -use pdm_client::types::Resource; +use pdm_client::types::{RemoteSubscriptionState, RemoteSubscriptions, Resource}; use serde::{Deserialize, Serialize}; mod administration; @@ -234,3 +234,41 @@ pub(crate) fn locale_compare(first: String, second: &str, numeric: bool) -> std: .locale_compare(second, &Array::new(), &options) .cmp(&0) } + +/// Returns true if the global subscription checks succeeded +pub async fn check_subscription() -> bool { + let data: Result, _> = + proxmox_yew_comp::http_get("/resources/subscription", None).await; + + match data { + 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, + } +} diff --git a/ui/src/main.rs b/ui/src/main.rs index ebf427bf..7cb3660c 100644 --- a/ui/src/main.rs +++ b/ui/src/main.rs @@ -21,12 +21,10 @@ 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::{ - register_pve_tasks, MainMenu, RemoteList, RemoteListCacheEntry, SearchProvider, TopNavBar, - ViewListContext, + check_subscription, register_pve_tasks, MainMenu, RemoteList, RemoteListCacheEntry, + SearchProvider, TopNavBar, ViewListContext, }; type MsgRemoteList = Result; @@ -64,48 +62,6 @@ struct DatacenterManagerApp { async_pool: AsyncPool, } -async fn check_subscription() -> Msg { - let data: Result, _> = http_get("/resources/subscription", None).await; - - let show_alert = match data { - 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, - }; - - if show_alert { - Msg::ShowSubscriptionAlert - } else { - Msg::ConfirmSubscription - } -} - /* async fn get_fingerprint() -> Option { http_get("/nodes/localhost/status", None) @@ -122,8 +78,15 @@ impl DatacenterManagerApp { if self.subscription_confirmed { ctx.link().send_message(Msg::ConfirmSubscription); } else { - self.async_pool - .send_future(ctx.link().clone(), check_subscription()); + self.async_pool.send_future(ctx.link().clone(), async move { + let show_alert = check_subscription().await; + + if show_alert { + Msg::ShowSubscriptionAlert + } else { + Msg::ConfirmSubscription + } + }); } } else { ctx.link().send_message(Msg::ConfirmSubscription); -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel