From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CB6491FF178 for ; Mon, 1 Dec 2025 14:53:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1DE5C1DEA7; Mon, 1 Dec 2025 14:53:26 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 1 Dec 2025 14:53:08 +0100 Message-ID: <20251201135318.2983539-11-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251201135318.2983539-1-d.csapak@proxmox.com> References: <20251201135318.2983539-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 v2 8/9] 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 | 9 +++++++++ ui/src/main.rs | 28 ++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ui/src/lib.rs b/ui/src/lib.rs index 27a51084..d8225a42 100644 --- a/ui/src/lib.rs +++ b/ui/src/lib.rs @@ -3,6 +3,9 @@ use pdm_api_types::remotes::RemoteType; use pdm_api_types::resource::{PveLxcResource, PveNetworkResource, PveQemuResource}; use pdm_client::types::Resource; use serde::{Deserialize, Serialize}; +use serde_json::Value; + +use proxmox_yew_comp::http_get; mod administration; @@ -234,3 +237,9 @@ 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 = http_get("/nodes/localhost/subscription", None).await; + proxmox_yew_comp::subscription_is_active(&Some(data)) +} diff --git a/ui/src/main.rs b/ui/src/main.rs index 9cff3833..b7dd3ef1 100644 --- a/ui/src/main.rs +++ b/ui/src/main.rs @@ -1,6 +1,6 @@ use anyhow::Error; use gloo_timers::callback::Timeout; -use serde_json::{json, Value}; +use serde_json::json; use wasm_bindgen::JsCast; use web_sys::HtmlElement; @@ -23,8 +23,8 @@ use proxmox_yew_comp::{ //use pbs::MainMenu; 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; @@ -62,17 +62,6 @@ struct DatacenterManagerApp { async_pool: AsyncPool, } -async fn check_subscription() -> Msg { - let data: Result = http_get("/nodes/localhost/subscription", None).await; - - let is_active = proxmox_yew_comp::subscription_is_active(&Some(data)); - if !is_active { - Msg::ShowSubscriptionAlert - } else { - Msg::ConfirmSubscription - } -} - /* async fn get_fingerprint() -> Option { http_get("/nodes/localhost/status", None) @@ -89,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 is_active = check_subscription().await; + + if !is_active { + 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