[pdm-devel] [PATCH datacenter-manager v2 11/16] ui: dashboard: factor out task parameter calculation

[Dominik Csapak]

into the dashboard::tasks module.

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 ui/src/dashboard/mod.rs   | 19 ++++++-------------
 ui/src/dashboard/tasks.rs |  8 ++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs
index fc2e150a..06283500 100644
--- a/ui/src/dashboard/mod.rs
+++ b/ui/src/dashboard/mod.rs
@@ -47,7 +47,7 @@ use status_row::DashboardStatusRow;
 mod filtered_tasks;
 
 mod tasks;
-use tasks::create_task_summary_panel;
+use tasks::{create_task_summary_panel, get_task_options};
 
 pub mod types;
 
@@ -57,8 +57,7 @@ pub use refresh_config_edit::{
     create_refresh_config_edit_window, refresh_config_id, RefreshConfig,
 };
 use refresh_config_edit::{
-    DEFAULT_MAX_AGE_S, DEFAULT_REFRESH_INTERVAL_S, DEFAULT_TASK_SUMMARY_HOURS,
-    FORCE_RELOAD_MAX_AGE_S, INITIAL_MAX_AGE_S,
+    DEFAULT_MAX_AGE_S, DEFAULT_REFRESH_INTERVAL_S, FORCE_RELOAD_MAX_AGE_S, INITIAL_MAX_AGE_S,
 };
 
 #[derive(Properties, PartialEq)]
@@ -127,7 +126,7 @@ impl PdmDashboard {
 
     fn do_reload(&mut self, ctx: &yew::Context<Self>, max_age: u64) {
         let link = ctx.link().clone();
-        let (_, since) = Self::get_task_options(&self.config);
+        let (_, since) = get_task_options(self.config.task_last_hours);
 
         self.load_finished_time = None;
         self.async_pool.spawn(async move {
@@ -167,12 +166,6 @@ impl PdmDashboard {
             link.send_message(Msg::LoadingFinished(LoadingResult::All));
         });
     }
-
-    fn get_task_options(config: &PersistentState<RefreshConfig>) -> (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 {
@@ -275,9 +268,9 @@ impl Component for PdmDashboard {
                 true
             }
             Msg::UpdateConfig(dashboard_config) => {
-                let (old_hours, _) = Self::get_task_options(&self.config);
+                let (old_hours, _) = get_task_options(self.config.task_last_hours);
                 self.config.update(dashboard_config);
-                let (new_hours, _) = Self::get_task_options(&self.config);
+                let (new_hours, _) = get_task_options(self.config.task_last_hours);
 
                 if old_hours != new_hours {
                     self.reload(ctx);
@@ -290,7 +283,7 @@ impl Component for PdmDashboard {
     }
 
     fn view(&self, ctx: &yew::Context<Self>) -> yew::Html {
-        let (hours, since) = Self::get_task_options(&self.config);
+        let (hours, since) = get_task_options(self.config.task_last_hours);
         let content = Column::new()
             .class(FlexFit)
             .with_child(
diff --git a/ui/src/dashboard/tasks.rs b/ui/src/dashboard/tasks.rs
index da447ecd..9989d4a9 100644
--- a/ui/src/dashboard/tasks.rs
+++ b/ui/src/dashboard/tasks.rs
@@ -3,6 +3,7 @@ use std::collections::HashMap;
 use std::rc::Rc;
 
 use anyhow::Error;
+use js_sys::Date;
 use yew::html::Scope;
 use yew::virtual_dom::Key;
 
@@ -21,6 +22,7 @@ use pdm_api_types::TaskStatistics;
 
 use crate::dashboard::create_title_with_icon;
 use crate::dashboard::loading_column;
+use crate::dashboard::refresh_config_edit::DEFAULT_TASK_SUMMARY_HOURS;
 use crate::tasks::TaskWorkerType;
 
 use super::filtered_tasks::FilteredTasks;
@@ -328,3 +330,9 @@ pub fn create_task_summary_panel(
                 .with_optional_child(error.map(|err| error_message(&err.to_string()))),
         )
 }
+
+pub fn get_task_options(last_hours: Option<u32>) -> (u32, i64) {
+    let hours = last_hours.unwrap_or(DEFAULT_TASK_SUMMARY_HOURS);
+    let since = (Date::now() / 1000.0) as i64 - (hours * 60 * 60) as i64;
+    (hours, since)
+}
-- 
2.47.3