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 CDF0A1FF178 for ; Mon, 1 Dec 2025 11:39:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3144D1880B; Mon, 1 Dec 2025 11:39:51 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 1 Dec 2025 11:39:02 +0100 Message-ID: <20251201103917.1357369-3-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.029 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 yew-comp 2/2] apt package manager: add optional subscription check on 'Refresh' button 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" but only if the 'subscription_url' is set on the component. Signed-off-by: Dominik Csapak --- src/apt_package_manager.rs | 63 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/src/apt_package_manager.rs b/src/apt_package_manager.rs index d01f275..78e82a0 100644 --- a/src/apt_package_manager.rs +++ b/src/apt_package_manager.rs @@ -5,6 +5,7 @@ use std::pin::Pin; use std::rc::Rc; use anyhow::Error; +use serde_json::Value; use yew::html::IntoEventCallback; use yew::html::IntoPropValue; @@ -17,8 +18,11 @@ use pwt::widget::data_table::{ DataTable, DataTableCellRenderArgs, DataTableColumn, DataTableHeader, DataTableHeaderGroup, }; use pwt::widget::{Button, Container, Toolbar, Tooltip}; +use pwt::AsyncPool; use crate::percent_encoding::percent_encode_component; +use crate::subscription_alert::subscription_is_active; +use crate::SubscriptionAlert; use crate::{ DataViewWindow, LoadableComponent, LoadableComponentContext, LoadableComponentMaster, XTermJs, }; @@ -56,6 +60,11 @@ pub struct AptPackageManager { #[prop_or_default] #[builder_cb(IntoEventCallback, into_event_callback, ())] pub on_upgrade: Option>, + + #[prop_or_default] + #[builder(IntoPropValue, into_prop_value)] + /// The base url for the subscription check + pub subscription_url: Option, } impl Default for AptPackageManager { @@ -142,12 +151,14 @@ fn update_list_to_tree(updates: &[APTUpdateInfo]) -> SlabTree { #[derive(Clone, PartialEq)] pub enum ViewState { ShowChangelog(String), + ShowSubscriptionPopup, } pub struct ProxmoxAptPackageManager { tree_store: TreeStore, selection: Selection, columns: Rc>>, + async_pool: AsyncPool, } impl LoadableComponent for ProxmoxAptPackageManager { @@ -164,9 +175,33 @@ impl LoadableComponent for ProxmoxAptPackageManager { tree_store, selection, columns, + async_pool: AsyncPool::new(), } } + fn update(&mut self, ctx: &LoadableComponentContext, _msg: Self::Message) -> bool { + let link = ctx.link().clone(); + let props = ctx.props(); + let url = props + .clone() + .subscription_url + .unwrap_or("/nodes/localhost/subscription".into()); + let task_base_url = props.task_base_url.clone(); + let command = format!("{}/update", props.base_url); + self.async_pool.spawn(async move { + let data = crate::http_get::(url.as_str(), None).await; + let is_active = subscription_is_active(&Some(data)); + + if is_active { + link.task_base_url(task_base_url); + link.start_task(&command, None, false); + } else { + link.change_view(Some(ViewState::ShowSubscriptionPopup)); + } + }); + true + } + fn load( &self, ctx: &LoadableComponentContext, @@ -211,13 +246,20 @@ impl LoadableComponent for ProxmoxAptPackageManager { .class("pwt-w-100") .class("pwt-overflow-hidden") .class("pwt-border-bottom") - .with_child(Button::new(tr!("Refresh")).onclick({ + .with_child(Button::new(tr!("Refresh")).on_activate({ let link = ctx.link(); - + let sub_check = props.subscription_url.is_some(); link.task_base_url(props.task_base_url.clone()); let command = format!("{}/update", props.base_url); - move |_| link.start_task(&command, None, false) + + move |_| { + if sub_check { + link.send_message(()); + } else { + link.start_task(&command, None, false); + } + } })) .with_child( Button::new(tr!("Upgrade")) @@ -263,6 +305,21 @@ impl LoadableComponent for ProxmoxAptPackageManager { ViewState::ShowChangelog(package) => { Some(self.create_show_changelog_dialog(ctx, package)) } + ViewState::ShowSubscriptionPopup => { + let link = ctx.link().clone(); + let props = ctx.props(); + let task_base_url = props.task_base_url.clone(); + let command = format!("{}/update", props.base_url); + Some( + SubscriptionAlert::new("notfound") + .on_close(move |_| { + link.change_view(None); + link.task_base_url(task_base_url.clone()); + link.start_task(&command, None, false); + }) + .into(), + ) + } } } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel