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 86D1A1FF183 for ; Wed, 3 Dec 2025 15:34:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3A916CA37; Wed, 3 Dec 2025 15:35:13 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Wed, 3 Dec 2025 15:34:32 +0100 Message-ID: <20251203143439.3595966-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251203143439.3595966-1-d.csapak@proxmox.com> References: <20251203143439.3595966-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 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 2/2] ui: subscription: use 'force-load' parameter 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" on the first login, use 'force-load': true to let the backend refresh all remotes whose information is older than 24 hours or never had any info. The remaining checks (e.g. refresh for updates, views, etc.) use the (now) default caching behavior. Signed-off-by: Dominik Csapak --- ui/src/lib.rs | 10 +++++++--- ui/src/main.rs | 2 +- ui/src/remotes/updates.rs | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ui/src/lib.rs b/ui/src/lib.rs index 1aac7571..f9d4cbfd 100644 --- a/ui/src/lib.rs +++ b/ui/src/lib.rs @@ -9,7 +9,7 @@ use pwt::props::ContainerBuilder; use pwt::tr; use pwt::widget::{AlertDialog, Container}; use serde::{Deserialize, Serialize}; -use serde_json::Value; +use serde_json::{json, Value}; use proxmox_yew_comp::http_get; @@ -249,8 +249,12 @@ pub(crate) fn locale_compare(first: String, second: &str, numeric: bool) -> std: /// NOTE: This should be only used for PDM itself, or for when it's checked for a PDM specific /// feature, i.e., one that's not just relayed 1:1 to a specific remote node, as for that one should /// use the remote-specific check. -pub async fn check_pdm_subscription() -> bool { - let data: Result = http_get("/nodes/localhost/subscription", None).await; +pub async fn check_pdm_subscription(force: bool) -> bool { + let data: Result = http_get( + "/nodes/localhost/subscription", + Some(json!({"force-load": force})), + ) + .await; let mut is_active = proxmox_yew_comp::subscription_is_active(Some(&data)); if !is_active { if let Ok(Ok(info)) = data.map(serde_json::from_value::) { diff --git a/ui/src/main.rs b/ui/src/main.rs index 5f859dbc..a7a474b7 100644 --- a/ui/src/main.rs +++ b/ui/src/main.rs @@ -79,7 +79,7 @@ impl DatacenterManagerApp { ctx.link().send_message(Msg::ConfirmSubscription); } else { self.async_pool.send_future(ctx.link().clone(), async move { - let is_active = check_pdm_subscription().await; + let is_active = check_pdm_subscription(true).await; if !is_active { Msg::ShowSubscriptionAlert diff --git a/ui/src/remotes/updates.rs b/ui/src/remotes/updates.rs index 12eaec87..d1d60910 100644 --- a/ui/src/remotes/updates.rs +++ b/ui/src/remotes/updates.rs @@ -394,7 +394,7 @@ impl LoadableComponent for UpdateTreeComponent { link.clone().spawn(async move { // Use the PDM subscription check for the global refresh all. - let is_active = check_pdm_subscription().await; + let is_active = check_pdm_subscription(false).await; if !is_active { link.change_view(Some(ViewState::ShowSubscriptionAlert)); } else { -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel