[pdm-devel] [PATCH datacenter-manager 3/5] ui: remote: tasks: add optional remote property to filter

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

so that we can show tasks from a single remote

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/remotes/tasks.rs | 45 +++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/ui/src/remotes/tasks.rs b/ui/src/remotes/tasks.rs
index 9099e89..fc7c30a 100644
--- a/ui/src/remotes/tasks.rs
+++ b/ui/src/remotes/tasks.rs
@@ -2,8 +2,9 @@ use std::rc::Rc;
 
 use yew::{
     html,
+    html::IntoPropValue,
     virtual_dom::{VComp, VNode},
-    Component, Properties,
+    AttrValue, Component, Properties,
 };
 
 use pdm_api_types::RemoteUpid;
@@ -20,11 +21,19 @@ use pwt::{
         Column, Fa, Row,
     },
 };
+use pwt_macros::builder;
 
 use crate::{tasks::format_optional_remote_upid, widget::RemoteSelector};
 
 #[derive(PartialEq, Properties)]
-pub struct RemoteTaskList;
+#[builder]
+pub struct RemoteTaskList {
+    /// If given, shows only tasks of this remote
+    #[prop_or_default]
+    #[builder(IntoPropValue, into_prop_value)]
+    remote: Option<AttrValue>,
+}
+
 impl RemoteTaskList {
     pub fn new() -> Self {
         yew::props!(Self {})
@@ -109,6 +118,7 @@ impl Component for PbsRemoteTaskList {
     }
 
     fn view(&self, ctx: &yew::Context<Self>) -> yew::Html {
+        let props = ctx.props();
         let task = self
             .upid
             .as_ref()
@@ -124,21 +134,26 @@ impl Component for PbsRemoteTaskList {
                         move |_| link.send_message(None)
                     })
             });
+
+        let mut task_list = Tasks::new()
+            .base_url("/remote-tasks/list")
+            .on_show_task({
+                let link = ctx.link().clone();
+                move |(upid_str, endtime)| link.send_message(Some((upid_str, endtime)))
+            })
+            .columns(self.columns.clone());
+
+        task_list = match props.remote.clone() {
+            Some(remote) => task_list.fixed_filter(("remote".into(), remote.to_string())),
+            None => task_list.extra_filter(
+                tr!("Remote"),
+                RemoteSelector::new().name("remote").placeholder(tr!("All")),
+            ),
+        };
+
         Column::new()
             .class(FlexFit)
-            .with_child(
-                Tasks::new()
-                    .base_url("/remote-tasks/list")
-                    .on_show_task({
-                        let link = ctx.link().clone();
-                        move |(upid_str, endtime)| link.send_message(Some((upid_str, endtime)))
-                    })
-                    .columns(self.columns.clone())
-                    .extra_filter(
-                        tr!("Remote"),
-                        RemoteSelector::new().name("remote").placeholder(tr!("All")),
-                    ),
-            )
+            .with_child(task_list)
             .with_optional_child(task)
             .into()
     }
-- 
2.47.3



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