From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH yew-comp 4/7] running tasks: make TaskListItem renderer configurable
Date: Mon, 20 Jan 2025 10:29:54 +0100 [thread overview]
Message-ID: <20250120093006.927014-5-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250120093006.927014-1-d.csapak@proxmox.com>
we currently don't have all types here (e.g. RemoteUpid), so simply
make it generally configurable, so the downstream user of this can
format the task the way it's necessary there.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/running_tasks.rs | 17 ++++++++++++++++-
src/running_tasks_button.rs | 7 +++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/running_tasks.rs b/src/running_tasks.rs
index 8ddc73c..b0b63af 100644
--- a/src/running_tasks.rs
+++ b/src/running_tasks.rs
@@ -4,6 +4,7 @@ use yew::html::IntoEventCallback;
use yew::virtual_dom::{VComp, VNode};
use pwt::prelude::*;
+use pwt::props::{IntoOptionalRenderFn, RenderFn};
use pwt::state::{Loader, LoaderState, SharedStateObserver, Store};
use pwt::widget::data_table::{DataTable, DataTableColumn, DataTableHeader};
use pwt::widget::{ActionIcon, Button, Container, Panel, Toolbar, Tooltip};
@@ -22,6 +23,11 @@ pub struct RunningTasks {
#[prop_or_default]
pub on_show_task: Option<Callback<(String, Option<i64>)>>,
+ #[builder_cb(IntoOptionalRenderFn, into_optional_render_fn, TaskListItem)]
+ #[prop_or_default]
+ /// Render function for the [`TaskListItem`]
+ pub render: Option<RenderFn<TaskListItem>>,
+
#[builder_cb(IntoEventCallback, into_event_callback, ())]
#[prop_or_default]
pub on_close: Option<Callback<()>>,
@@ -71,7 +77,16 @@ impl ProxmoxRunningTasks {
Rc::new(vec![
DataTableColumn::new(tr!("Task"))
.flex(1)
- .render(|item: &TaskListItem| html! {format_upid(&item.upid)})
+ .render({
+ let render = props.render.clone();
+ move |item: &TaskListItem| {
+ if let Some(render) = &render {
+ render.apply(item)
+ } else {
+ html! {format_upid(&item.upid)}
+ }
+ }
+ })
.into(),
DataTableColumn::new(tr!("Start Time"))
.width("130px")
diff --git a/src/running_tasks_button.rs b/src/running_tasks_button.rs
index 43ca6f3..e0e1062 100644
--- a/src/running_tasks_button.rs
+++ b/src/running_tasks_button.rs
@@ -8,6 +8,7 @@ use yew::virtual_dom::{VComp, VNode};
use pwt::dom::align::{align_to, AlignOptions, GrowDirection, Point};
use pwt::prelude::*;
+use pwt::props::{IntoOptionalRenderFn, RenderFn};
use pwt::state::{Loader, LoaderState, SharedStateObserver};
use pwt::widget::{Button, Container};
@@ -24,6 +25,11 @@ pub struct RunningTasksButton {
#[builder_cb(IntoEventCallback, into_event_callback, (String, Option<i64>))]
#[prop_or_default]
on_show_task: Option<Callback<(String, Option<i64>)>>,
+
+ #[builder_cb(IntoOptionalRenderFn, into_optional_render_fn, TaskListItem)]
+ #[prop_or_default]
+ /// Render function for the [`TaskListItem`]
+ pub render: Option<RenderFn<TaskListItem>>,
}
impl RunningTasksButton {
@@ -152,6 +158,7 @@ impl Component for ProxmoxRunningTasksButton {
RunningTasks::new(props.running_tasks.clone())
.as_dropdown(true)
.on_show_task(props.on_show_task.clone())
+ .render(props.render.clone())
.on_close(ctx.link().callback(|_| Msg::CloseMenu)),
)
});
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-01-20 9:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-20 9:29 [pdm-devel] [PATCH yew-comp/datacenter-manager] ui: implement remote task list Dominik Csapak
2025-01-20 9:29 ` [pdm-devel] [PATCH yew-comp 1/7] tasks: make date filter functional Dominik Csapak
2025-01-20 11:30 ` Thomas Lamprecht
2025-01-20 12:10 ` Dominik Csapak
2025-01-21 8:33 ` Thomas Lamprecht
2025-01-21 9:46 ` Dominik Csapak
2025-01-20 9:29 ` [pdm-devel] [PATCH yew-comp 2/7] tasks: load more tasks on end of list Dominik Csapak
2025-01-20 17:29 ` Thomas Lamprecht
2025-01-21 9:43 ` Dominik Csapak
2025-01-20 9:29 ` [pdm-devel] [PATCH yew-comp 3/7] utils: factor out task description into own function Dominik Csapak
2025-01-20 17:29 ` Thomas Lamprecht
2025-01-21 9:44 ` Dominik Csapak
2025-01-20 9:29 ` Dominik Csapak [this message]
2025-01-20 9:29 ` [pdm-devel] [PATCH yew-comp 5/7] running tasks: make buttons configurable Dominik Csapak
2025-01-20 9:29 ` [pdm-devel] [PATCH yew-comp 6/7] tasks: make columns configurable Dominik Csapak
2025-01-20 17:37 ` Thomas Lamprecht
2025-01-20 9:29 ` [pdm-devel] [PATCH yew-comp 7/7] tasks: make the 'show task' action configurable Dominik Csapak
2025-01-20 9:29 ` [pdm-devel] [PATCH datacenter-manager 1/9] server: factor out task filters into `TaskFilters` type Dominik Csapak
2025-01-20 17:42 ` Thomas Lamprecht
2025-01-20 9:29 ` [pdm-devel] [PATCH datacenter-manager 2/9] server: task cache: skip remotes with errors on fetch Dominik Csapak
2025-01-20 17:45 ` Thomas Lamprecht
2025-01-21 8:29 ` Dietmar Maurer
2025-01-20 9:30 ` [pdm-devel] [PATCH datacenter-manager 3/9] server: task cache: add filter options Dominik Csapak
2025-01-20 9:30 ` [pdm-devel] [PATCH datacenter-manager 4/9] server: task cache: reverse task order Dominik Csapak
2025-01-20 9:30 ` [pdm-devel] [PATCH datacenter-manager 5/9] pdm-client: export PveUpid Dominik Csapak
2025-01-20 9:30 ` [pdm-devel] [PATCH datacenter-manager 6/9] ui: refactor RemoteConfigPanel into own module Dominik Csapak
2025-01-20 9:30 ` [pdm-devel] [PATCH datacenter-manager 7/9] ui: remotes: add tasks to global remote panel Dominik Csapak
2025-01-20 9:30 ` [pdm-devel] [PATCH datacenter-manager 8/9] ui: register pve tasks Dominik Csapak
2025-01-20 9:30 ` [pdm-devel] [PATCH datacenter-manager 9/9] ui: also show running remote tasks in 'running tasks' list Dominik Csapak
2025-01-20 11:27 ` [pdm-devel] applied: [PATCH yew-comp/datacenter-manager] ui: implement remote task list Dietmar Maurer
2025-01-20 11:34 ` Thomas Lamprecht
2025-01-21 8:41 ` [pdm-devel] " Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250120093006.927014-5-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pdm-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.