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 722291FF178 for ; Mon, 1 Dec 2025 14:53:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 53A261E081; Mon, 1 Dec 2025 14:53:55 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 1 Dec 2025 14:53:07 +0100 Message-ID: <20251201135318.2983539-10-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 7/9] 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 the local subscription check fails Signed-off-by: Dominik Csapak --- changes from v1: * use nodes/localhost endpoint instead of the dashboard one ui/src/main.rs | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/ui/src/main.rs b/ui/src/main.rs index 454a2927..9cff3833 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; +use serde_json::{json, Value}; use wasm_bindgen::JsCast; use web_sys::HtmlElement; @@ -21,7 +21,6 @@ use proxmox_yew_comp::{ }; //use pbs::MainMenu; -use pdm_api_types::subscription::{RemoteSubscriptionState, RemoteSubscriptions}; use pdm_api_types::views::ViewConfig; use pdm_ui::{ register_pve_tasks, MainMenu, RemoteList, RemoteListCacheEntry, SearchProvider, TopNavBar, @@ -64,16 +63,10 @@ struct DatacenterManagerApp { } async fn check_subscription() -> Msg { - let data: Result, _> = http_get("/resources/subscription", None).await; + let data: Result = http_get("/nodes/localhost/subscription", None).await; - let show_alert = match data { - Ok(list) => list - .into_iter() - .any(|info| info.state == RemoteSubscriptionState::None), - Err(_) => false, - }; - - if show_alert { + let is_active = proxmox_yew_comp::subscription_is_active(&Some(data)); + if !is_active { Msg::ShowSubscriptionAlert } else { Msg::ConfirmSubscription @@ -246,11 +239,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