[pdm-devel] [PATCH yew-comp 7/7] tasks: make the 'show task' action configurable

Dominik Csapak d.csapak at proxmox.com
Mon Jan 20 10:29:57 CET 2025


we sometimes want to use a different base url for a task (e.g. remote
tasks on PDM)

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 src/tasks.rs | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/tasks.rs b/src/tasks.rs
index bb6eb1d..56da7dd 100644
--- a/src/tasks.rs
+++ b/src/tasks.rs
@@ -7,6 +7,7 @@ use anyhow::Error;
 use pwt::widget::form::{Field, Form, FormContext, InputType};
 
 use gloo_timers::callback::Timeout;
+use html::IntoEventCallback;
 use serde_json::Map;
 use yew::html::IntoPropValue;
 use yew::virtual_dom::{VComp, VNode};
@@ -50,6 +51,11 @@ pub struct Tasks {
     #[builder(IntoPropValue, into_prop_value)]
     pub base_url: Option<AttrValue>,
 
+    #[builder_cb(IntoEventCallback, into_event_callback, (String, Option<i64>))]
+    #[prop_or_default]
+    /// Called when the task is opened
+    pub on_show_task: Option<Callback<(String, Option<i64>)>>,
+
     #[builder(IntoPropValue, into_prop_value)]
     #[prop_or_default]
     /// An optional column configuration that overwrites the default one.
@@ -88,6 +94,7 @@ pub enum Msg {
     ToggleFilter,
     LoadBatch(u64), // start
     UpdateFilter,
+    ShowTask,
 }
 pub struct ProxmoxTasks {
     selection: Selection,
@@ -270,6 +277,22 @@ impl LoadableComponent for ProxmoxTasks {
                 }));
                 false
             }
+            Msg::ShowTask => {
+                if let Some(on_show_task) = &ctx.props().on_show_task {
+                    let selected_item = self
+                        .selection
+                        .selected_key()
+                        .and_then(|key| self.store.read().lookup_record(&key).cloned());
+                    let selected_item = match selected_item {
+                        Some(item) => item,
+                        None => return false,
+                    };
+                    on_show_task.emit((selected_item.upid, selected_item.endtime));
+                } else {
+                    ctx.link().change_view(Some(ViewDialog::TaskViewer));
+                }
+                false
+            }
         }
     }
 
@@ -292,10 +315,9 @@ impl LoadableComponent for ProxmoxTasks {
             .class("pwt-overflow-hidden")
             .class("pwt-border-bottom")
             .with_child(
-                Button::new(tr!("View")).disabled(disabled).onclick(
-                    ctx.link()
-                        .change_view_callback(|_| Some(ViewDialog::TaskViewer)),
-                ),
+                Button::new(tr!("View"))
+                    .disabled(disabled)
+                    .onclick(ctx.link().callback(|_| Msg::ShowTask)),
             )
             .with_flex_spacer()
             .with_child({
@@ -373,7 +395,7 @@ impl LoadableComponent for ProxmoxTasks {
             .class("pwt-flex-fit")
             .selection(self.selection.clone())
             .on_row_dblclick(move |_: &mut _| {
-                link.change_view(Some(ViewDialog::TaskViewer));
+                link.send_message(Msg::ShowTask);
             })
             .row_render_callback(self.row_render_callback.clone())
             .into()
-- 
2.39.5





More information about the pdm-devel mailing list