[pdm-devel] [PATCH datacenter-manager v2 06/16] ui: dashboard: refactor task summary panel creation to its own module

[Dominik Csapak <d.csapak@proxmox.com>]

so we can easily reuse it outside the dashboard struct.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/dashboard/mod.rs   | 65 +++++++++++++++------------------------
 ui/src/dashboard/tasks.rs | 30 ++++++++++++++++++
 2 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs
index fa0fe2fc..c0b20b36 100644
--- a/ui/src/dashboard/mod.rs
+++ b/ui/src/dashboard/mod.rs
@@ -54,7 +54,7 @@ use status_row::DashboardStatusRow;
 mod filtered_tasks;
 
 mod tasks;
-use tasks::TaskSummary;
+use tasks::create_task_summary_panel;
 
 /// The initial 'max-age' parameter in seconds. The backend polls every 15 minutes, so to increase
 /// the chance of showing some data quickly use that as max age at the very first load.
@@ -145,44 +145,6 @@ pub struct PdmDashboard {
 }
 
 impl PdmDashboard {
-    fn create_task_summary_panel(
-        &self,
-        statistics: &StatisticsOptions,
-        remotes: Option<u32>,
-    ) -> Panel {
-        let (hours, since) = Self::get_task_options(&self.config);
-        let title = match remotes {
-            Some(_count) => tr!("Task Summary Sorted by Failed Tasks (Last {0}h)", hours),
-            None => tr!("Task Summary by Category (Last {0}h)", hours),
-        };
-        Panel::new()
-            .flex(1.0)
-            .width(500)
-            .border(true)
-            .title(create_title_with_icon("list", title))
-            .with_child(
-                Container::new()
-                    .class(FlexFit)
-                    .padding(2)
-                    .with_optional_child(
-                        statistics
-                            .data
-                            .clone()
-                            .map(|data| TaskSummary::new(data, since, remotes)),
-                    )
-                    .with_optional_child(
-                        (statistics.error.is_none() && statistics.data.is_none())
-                            .then_some(loading_column()),
-                    )
-                    .with_optional_child(
-                        statistics
-                            .error
-                            .as_ref()
-                            .map(|err| error_message(&err.to_string())),
-                    ),
-            )
-    }
-
     fn create_top_entities_panel(
         &self,
         icon: &str,
@@ -383,6 +345,7 @@ impl Component for PdmDashboard {
     }
 
     fn view(&self, ctx: &yew::Context<Self>) -> yew::Html {
+        let (hours, since) = Self::get_task_options(&self.config);
         let content = Column::new()
             .class(FlexFit)
             .with_child(
@@ -541,8 +504,28 @@ impl Component for PdmDashboard {
                     .style("padding-top", "0")
                     .class(pwt::css::Flex::Fill)
                     .class(FlexWrap::Wrap)
-                    .with_child(self.create_task_summary_panel(&self.statistics, None))
-                    .with_child(self.create_task_summary_panel(&self.statistics, Some(5)))
+                    .with_child(
+                        create_task_summary_panel(
+                            self.statistics.data.clone(),
+                            self.statistics.error.as_ref(),
+                            None,
+                            hours,
+                            since,
+                        )
+                        .flex(1.0)
+                        .width(500),
+                    )
+                    .with_child(
+                        create_task_summary_panel(
+                            self.statistics.data.clone(),
+                            self.statistics.error.as_ref(),
+                            Some(5),
+                            hours,
+                            since,
+                        )
+                        .flex(1.0)
+                        .width(500),
+                    )
                     .with_child(create_sdn_panel(self.status.clone()).flex(1.0).width(200)),
             );
 
diff --git a/ui/src/dashboard/tasks.rs b/ui/src/dashboard/tasks.rs
index d32cf378..cdb0d9c6 100644
--- a/ui/src/dashboard/tasks.rs
+++ b/ui/src/dashboard/tasks.rs
@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::rc::Rc;
 
+use anyhow::Error;
 use yew::html::Scope;
 use yew::virtual_dom::Key;
 
@@ -11,11 +12,15 @@ use pwt::prelude::*;
 use pwt::props::ExtractPrimaryKey;
 use pwt::state::Store;
 use pwt::widget::data_table::{DataTable, DataTableColumn, DataTableHeader};
+use pwt::widget::error_message;
+use pwt::widget::Panel;
 use pwt::widget::{ActionIcon, Container, Tooltip};
 use pwt_macros::{builder, widget};
 
 use pdm_api_types::TaskStatistics;
 
+use crate::dashboard::create_title_with_icon;
+use crate::dashboard::loading_column;
 use crate::tasks::TaskWorkerType;
 
 use super::filtered_tasks::FilteredTasks;
@@ -295,3 +300,28 @@ impl Component for ProxmoxTaskSummary {
             .into()
     }
 }
+
+pub fn create_task_summary_panel(
+    statistics: Option<TaskStatistics>,
+    error: Option<&Error>,
+    remotes: Option<u32>,
+    hours: u32,
+    since: i64,
+) -> Panel {
+    let title = match remotes {
+        Some(_count) => tr!("Task Summary Sorted by Failed Tasks (Last {0}h)", hours),
+        None => tr!("Task Summary by Category (Last {0}h)", hours),
+    };
+    let loading = error.is_none() && statistics.is_none();
+    Panel::new()
+        .border(true)
+        .title(create_title_with_icon("list", title))
+        .with_child(
+            Container::new()
+                .class(css::FlexFit)
+                .padding(2)
+                .with_optional_child(statistics.map(|data| TaskSummary::new(data, since, remotes)))
+                .with_optional_child((loading).then_some(loading_column()))
+                .with_optional_child(error.map(|err| error_message(&err.to_string()))),
+        )
+}
-- 
2.47.3



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