Re: [pdm-devel] [PATCH datacenter-manager v3 8/8] ui: dashboard: make task summary time range configurable

[Stefan Hanreich <s.hanreich@proxmox.com>]

On 8/25/25 10:11 AM, Dominik Csapak wrote:
> 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 <d.csapak@proxmox.com>
> ---
>  ui/src/dashboard/mod.rs | 34 ++++++++++++++++++++++++++++++----
>  1 file changed, 30 insertions(+), 4 deletions(-)
> 
> diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs
> index 502332a..d9b58b6 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<u64>,
>      #[serde(skip_serializing_if = "Option::is_none")]
>      max_age: Option<u64>,
> +    #[serde(skip_serializing_if = "Option::is_none")]
> +    task_last_hours: Option<u32>,
>  }
>  
>  pub type LoadingResult = (
> @@ -257,6 +262,7 @@ impl PdmDashboard {
>      fn reload(&mut self, ctx: &yew::Context<Self>) {
>          let link = ctx.link().clone();
>          let max_age = self.config.max_age.unwrap_or(DEFAULT_MAX_AGE_S);
> +        let last_hours = self.statistics.hours;
>  
>          self.load_finished_time = None;
>          self.async_pool.spawn(async move {
> @@ -265,7 +271,7 @@ 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 since = (Date::now() / 1000.0) as i64 - (last_hours * 60 * 60) as i64;
>              let params = Some(json!({
>                  "since": since,
>                  "limit": 0,
> @@ -291,7 +297,8 @@ impl Component for PdmDashboard {
>      type Properties = Dashboard;
>  
>      fn create(ctx: &yew::Context<Self>) -> Self {
> -        let config = PersistentState::new(StorageLocation::local("dashboard-config"));
> +        let config: PersistentState<DashboardConfig> =
> +            PersistentState::new(StorageLocation::local("dashboard-config"));
>          let async_pool = AsyncPool::new();
>  
>          let (remote_list, _context_listener) = ctx
> @@ -299,9 +306,10 @@ 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 hours = config.task_last_hours.unwrap_or(DEFAULT_TASK_SUMMARY_HOURS);

nit: maybe make this a getter? (max_age could be as well?)

> +        let since = (Date::now() / 1000.0) as i64 - (hours * 60 * 60) as i64;

possibly this as well? or at least extract into a function?

>          let statistics = StatisticsOptions {
> -            hours: 24,
> +            hours,
>              since,
>              data: None,
>              error: None,
> @@ -375,6 +383,17 @@ impl Component for PdmDashboard {
>              }
>              Msg::UpdateConfig(dashboard_config) => {
>                  self.config.update(dashboard_config);
> +                let old_hours = self.statistics.hours;
> +                let new_hours = self
> +                    .config
> +                    .task_last_hours
> +                    .unwrap_or(DEFAULT_TASK_SUMMARY_HOURS);

duplicated here

> +
> +                if old_hours != new_hours {
> +                    self.statistics.hours = new_hours;
> +                    self.reload(ctx);
> +                }
> +
>                  self.show_config_window = false;
>                  true
>              }
> @@ -592,6 +611,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)))



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel