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 01DBE1FF178 for ; Mon, 1 Dec 2025 14:53:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BF3B91DE61; Mon, 1 Dec 2025 14:53:24 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 1 Dec 2025 14:53:09 +0100 Message-ID: <20251201135318.2983539-12-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 9/9] ui: remote updates: add subscription check on 'Refresh all' 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" in pve/pbs we do a check on refreshing too, so it's only fitting to do one here as well. Signed-off-by: Dominik Csapak --- ui/src/remotes/updates.rs | 48 +++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/ui/src/remotes/updates.rs b/ui/src/remotes/updates.rs index 020a2c4b..2237d310 100644 --- a/ui/src/remotes/updates.rs +++ b/ui/src/remotes/updates.rs @@ -19,7 +19,7 @@ use proxmox_deb_version; use proxmox_yew_comp::{ AptPackageManager, AptRepositories, ExistingProduct, LoadableComponent, - LoadableComponentContext, LoadableComponentMaster, + LoadableComponentContext, LoadableComponentMaster, SubscriptionAlert, }; use pwt::props::{CssBorderBuilder, CssPaddingBuilder, WidgetStyleBuilder}; use pwt::widget::{Button, Container, Panel, Tooltip}; @@ -35,7 +35,7 @@ use pwt::{ }, }; -use crate::{get_deep_url, get_deep_url_low_level, pdm_client}; +use crate::{check_subscription, get_deep_url, get_deep_url_low_level, pdm_client}; #[derive(PartialEq, Properties)] pub struct UpdateTree {} @@ -120,6 +120,7 @@ enum RemoteUpdateTreeMsg { LoadFinished(UpdateSummary), KeySelected(Option), RefreshAll, + CheckSubscription, } struct UpdateTreeComponent { @@ -303,10 +304,15 @@ fn build_store_from_response(update_summary: UpdateSummary) -> SlabTree) -> Self { let link = ctx.link(); @@ -343,6 +349,24 @@ impl LoadableComponent for UpdateTreeComponent { }) } + fn dialog_view( + &self, + ctx: &LoadableComponentContext, + view_state: &Self::ViewState, + ) -> Option { + let link = ctx.link().clone(); + match view_state { + ViewState::ShowSubscriptionAlert => Some( + SubscriptionAlert::new("notfound") + .on_close(move |_| { + link.change_view(None); + link.send_message(RemoteUpdateTreeMsg::RefreshAll); + }) + .into(), + ), + } + } + fn update(&mut self, ctx: &LoadableComponentContext, msg: Self::Message) -> bool { match msg { Self::Message::LoadFinished(updates) => { @@ -363,6 +387,18 @@ impl LoadableComponent for UpdateTreeComponent { return true; } } + Self::Message::CheckSubscription => { + let link = ctx.link(); + + link.clone().spawn(async move { + let is_active = check_subscription().await; + if !is_active { + link.change_view(Some(ViewState::ShowSubscriptionAlert)); + } else { + link.send_message(RemoteUpdateTreeMsg::RefreshAll); + } + }); + } Self::Message::RefreshAll => { let link = ctx.link(); @@ -407,7 +443,7 @@ impl UpdateTreeComponent { let refresh_all_button = Button::new(tr!("Refresh all")).on_activate({ let link = ctx.link().clone(); move |_| { - link.send_message(RemoteUpdateTreeMsg::RefreshAll); + link.send_message(RemoteUpdateTreeMsg::CheckSubscription); } }); @@ -667,7 +703,9 @@ fn render_version_column(tree_entry: &UpdateTreeEntry, expanded: bool) -> Html { let (icon, extra) = match remote_entry.mixed_versions { MixedVersions::None => ("", "".to_string()), MixedVersions::DifferentMajor => ("times-circle", tr!("major difference")), - MixedVersions::DifferentMinor => ("exclamation-triangle", tr!("substantial difference")), + MixedVersions::DifferentMinor => { + ("exclamation-triangle", tr!("substantial difference")) + } MixedVersions::DifferentPatch => ("info-circle", tr!("small difference")), }; let version_string = remote_entry.product_version.clone().unwrap_or_default(); -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel