[pdm-devel] [PATCH datacenter-manager v3 06/21] ui: dashboard: refactor sdn panel creation into its own module

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

so we can more easily reuse that outside the dashboard struct.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/dashboard/mod.rs            | 17 ++---------------
 ui/src/dashboard/sdn_zone_panel.rs | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs
index 8e124cdd..9ec3f092 100644
--- a/ui/src/dashboard/mod.rs
+++ b/ui/src/dashboard/mod.rs
@@ -46,7 +46,7 @@ mod node_status_panel;
 use node_status_panel::create_node_panel;
 
 mod sdn_zone_panel;
-use sdn_zone_panel::SdnZonePanel;
+use sdn_zone_panel::create_sdn_panel;
 
 mod status_row;
 use status_row::DashboardStatusRow;
@@ -148,19 +148,6 @@ pub struct PdmDashboard {
 }
 
 impl PdmDashboard {
-    fn create_sdn_panel(&self) -> Panel {
-        let sdn_zones_status = self.status.as_ref().map(|status| status.sdn_zones.clone());
-
-        Panel::new()
-            .flex(1.0)
-            .width(200)
-            .title(create_title_with_icon("sdn", tr!("SDN Zones")))
-            .border(true)
-            .with_child(SdnZonePanel::new(
-                (!self.loading).then_some(sdn_zones_status).flatten(),
-            ))
-    }
-
     fn create_task_summary_panel(
         &self,
         statistics: &StatisticsOptions,
@@ -519,7 +506,7 @@ impl Component for PdmDashboard {
                     .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(self.create_sdn_panel()),
+                    .with_child(create_sdn_panel(self.status.clone()).flex(1.0).width(200)),
             );
 
         Panel::new()
diff --git a/ui/src/dashboard/sdn_zone_panel.rs b/ui/src/dashboard/sdn_zone_panel.rs
index 0e26fa9c..611aadd1 100644
--- a/ui/src/dashboard/sdn_zone_panel.rs
+++ b/ui/src/dashboard/sdn_zone_panel.rs
@@ -1,18 +1,18 @@
 use std::rc::Rc;
 
-use pdm_api_types::resource::{ResourceType, SdnStatus, SdnZoneCount};
+use pdm_api_types::resource::{ResourceType, ResourcesStatus, SdnStatus, SdnZoneCount};
 use pdm_search::{Search, SearchTerm};
 use pwt::{
     css::{self, FontColor, TextAlign},
     prelude::*,
-    widget::{Container, Fa, List, ListTile},
+    widget::{Container, Fa, List, ListTile, Panel},
 };
 use yew::{
     virtual_dom::{VComp, VNode},
     Properties,
 };
 
-use crate::search_provider::get_search_provider;
+use crate::{dashboard::create_title_with_icon, search_provider::get_search_provider};
 
 use super::loading_column;
 
@@ -155,3 +155,12 @@ fn create_sdn_zone_search_term(status: Option<SdnStatus>) -> Search {
 
     Search::with_terms(terms)
 }
+
+pub fn create_sdn_panel(status: Option<ResourcesStatus>) -> Panel {
+    let sdn_zones_status = status.map(|status| status.sdn_zones);
+
+    Panel::new()
+        .title(create_title_with_icon("sdn", tr!("SDN Zones")))
+        .border(true)
+        .with_child(SdnZonePanel::new(sdn_zones_status))
+}
-- 
2.47.3



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