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 4D90B1FF16B for ; Tue, 26 Aug 2025 12:22:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C3D372F22E; Tue, 26 Aug 2025 12:23:03 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Tue, 26 Aug 2025 12:15:18 +0200 Message-ID: <20250826102229.2271453-9-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250826102229.2271453-1-d.csapak@proxmox.com> References: <20250826102229.2271453-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 v4 8/8] ui: dashboard: make task summary time range configurable 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 the browsers local storage. We already have now an interface to configure this, so use it to store the timeframe to check for tasks Signed-off-by: Dominik Csapak --- changes from v3: * deduplicate hours/since calculation * remove hours/since from the StatisticsOptions since it's saved in the dashboard_config ui/src/dashboard/mod.rs | 56 ++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs index 502332a..cc62870 100644 --- a/ui/src/dashboard/mod.rs +++ b/ui/src/dashboard/mod.rs @@ -59,6 +59,9 @@ pub const DEFAULT_MAX_AGE_S: u64 = 60; /// The default refresh interval pub const DEFAULT_REFRESH_INTERVAL_S: u64 = DEFAULT_MAX_AGE_S / 2; +/// The default hours to show for task summaries +pub const DEFAULT_TASK_SUMMARY_HOURS: u32 = 24; + #[derive(Properties, PartialEq)] pub struct Dashboard {} @@ -81,6 +84,8 @@ pub struct DashboardConfig { refresh_interval: Option, #[serde(skip_serializing_if = "Option::is_none")] max_age: Option, + #[serde(skip_serializing_if = "Option::is_none")] + task_last_hours: Option, } pub type LoadingResult = ( @@ -99,8 +104,6 @@ pub enum Msg { } struct StatisticsOptions { - hours: u32, - since: i64, data: Option, error: Option, } @@ -194,13 +197,10 @@ impl PdmDashboard { statistics: &StatisticsOptions, remotes: Option, ) -> Panel { + let (hours, since) = Self::get_task_options(&self.config); let title = match remotes { - Some(count) => tr!( - "Task Summary for Top {0} Remotes (Last {1}h)", - count, - statistics.hours - ), - None => tr!("Task Summary by Category (Last {0}h)", statistics.hours), + Some(count) => tr!("Task Summary for Top {0} Remotes (Last {1}h)", count, hours), + None => tr!("Task Summary by Category (Last {0}h)", hours), }; Panel::new() .flex(1.0) @@ -215,7 +215,7 @@ impl PdmDashboard { statistics .data .clone() - .map(|data| TaskSummary::new(data, statistics.since, remotes)), + .map(|data| TaskSummary::new(data, since, remotes)), ) .with_optional_child( (statistics.error.is_none() && statistics.data.is_none()) @@ -257,6 +257,7 @@ impl PdmDashboard { fn reload(&mut self, ctx: &yew::Context) { let link = ctx.link().clone(); let max_age = self.config.max_age.unwrap_or(DEFAULT_MAX_AGE_S); + let (_, since) = Self::get_task_options(&self.config); self.load_finished_time = None; self.async_pool.spawn(async move { @@ -265,7 +266,6 @@ impl PdmDashboard { let top_entities_future = client.get_top_entities(); let status_future = http_get("/resources/status", Some(json!({"max-age": max_age}))); - let since = (Date::now() / 1000.0) as i64 - (24 * 60 * 60); let params = Some(json!({ "since": since, "limit": 0, @@ -284,6 +284,12 @@ impl PdmDashboard { ))); }); } + + fn get_task_options(config: &PersistentState) -> (u32, i64) { + let hours = config.task_last_hours.unwrap_or(DEFAULT_TASK_SUMMARY_HOURS); + let since = (Date::now() / 1000.0) as i64 - (hours * 60 * 60) as i64; + (hours, since) + } } impl Component for PdmDashboard { @@ -291,7 +297,8 @@ impl Component for PdmDashboard { type Properties = Dashboard; fn create(ctx: &yew::Context) -> Self { - let config = PersistentState::new(StorageLocation::local("dashboard-config")); + let config: PersistentState = + PersistentState::new(StorageLocation::local("dashboard-config")); let async_pool = AsyncPool::new(); let (remote_list, _context_listener) = ctx @@ -299,20 +306,15 @@ impl Component for PdmDashboard { .context(ctx.link().callback(Msg::RemoteListChanged)) .expect("No Remote list context provided"); - let since = (Date::now() / 1000.0) as i64 - (24 * 60 * 60); - let statistics = StatisticsOptions { - hours: 24, - since, - data: None, - error: None, - }; - let mut this = Self { status: ResourcesStatus::default(), last_error: None, top_entities: None, last_top_entities_error: None, - statistics, + statistics: StatisticsOptions { + data: None, + error: None, + }, loading: true, load_finished_time: None, remote_list, @@ -374,7 +376,14 @@ impl Component for PdmDashboard { true } Msg::UpdateConfig(dashboard_config) => { + let (old_hours, _) = Self::get_task_options(&self.config); self.config.update(dashboard_config); + let (new_hours, _) = Self::get_task_options(&self.config); + + if old_hours != new_hours { + self.reload(ctx); + } + self.show_config_window = false; true } @@ -592,6 +601,13 @@ impl Component for PdmDashboard { DisplayField::new() .key("max-age-explanation") .value(tr!("If a response from a remote is older than 'Max Age', it will be updated on the next refresh."))) + .with_field( + tr!("Task Summary Time Range (last hours)"), + Number::new() + .name("task-last-hours") + .min(0u64) + .placeholder(DEFAULT_TASK_SUMMARY_HOURS.to_string()), + ) .into() }) .on_close(ctx.link().callback(|_| Msg::ConfigWindow(false))) -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel