From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH yew-comp 2/7] tasks: load more tasks on end of list
Date: Mon, 20 Jan 2025 10:29:52 +0100 [thread overview]
Message-ID: <20250120093006.927014-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250120093006.927014-1-d.csapak@proxmox.com>
and prevent the list to load multiple times the same data when filters
change rapidly (e.g. on first render or when the user enters text in
the filters)
reset the list when the filters changed or the reload button is pressed.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/tasks.rs | 72 ++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 59 insertions(+), 13 deletions(-)
diff --git a/src/tasks.rs b/src/tasks.rs
index fa17602..0ef80c6 100644
--- a/src/tasks.rs
+++ b/src/tasks.rs
@@ -6,6 +6,8 @@ use anyhow::Error;
use pwt::widget::form::{Field, Form, FormContext, InputType};
+use gloo_timers::callback::Timeout;
+use serde_json::Map;
use yew::html::IntoPropValue;
use yew::virtual_dom::{VComp, VNode};
@@ -26,6 +28,10 @@ use crate::{LoadableComponent, LoadableComponentContext, LoadableComponentMaster
use super::{TaskStatusSelector, TaskTypeSelector};
+const FILTER_UPDATE_BUFFER_MS: u32 = 150;
+const BATCH_LIMIT: u64 = 500;
+const LOAD_BUFFER_ROWS: usize = 20;
+
#[derive(PartialEq, Properties)]
#[builder]
pub struct Tasks {
@@ -75,6 +81,7 @@ pub enum ViewDialog {
pub enum Msg {
Redraw,
ToggleFilter,
+ LoadBatch(u64), // start
UpdateFilter,
}
pub struct ProxmoxTasks {
@@ -83,6 +90,9 @@ pub struct ProxmoxTasks {
show_filter: PersistentState<bool>,
filter_form_context: FormContext,
row_render_callback: DataTableRowRenderCallback<TaskListItem>,
+ start: u64,
+ last_filter: serde_json::Value,
+ load_timeout: Option<Timeout>,
}
impl LoadableComponent for ProxmoxTasks {
@@ -98,14 +108,21 @@ impl LoadableComponent for ProxmoxTasks {
let filter_form_context =
FormContext::new().on_change(ctx.link().callback(|_| Msg::UpdateFilter));
- let row_render_callback = DataTableRowRenderCallback::new(|args: &mut _| {
- let record: &TaskListItem = args.record();
- if let Some(status) = &record.status {
- if status != "OK" {
- if status.starts_with("WARNINGS:") {
- args.add_class("pwt-color-warning");
- } else {
- args.add_class("pwt-color-error");
+ let row_render_callback = DataTableRowRenderCallback::new({
+ let store = store.clone();
+ let link = link.clone();
+ move |args: &mut _| {
+ if args.row_index() > store.data_len().saturating_sub(LOAD_BUFFER_ROWS) {
+ link.send_message(Msg::LoadBatch(store.data_len() as u64));
+ }
+ let record: &TaskListItem = args.record();
+ if let Some(status) = &record.status {
+ if status != "OK" {
+ if status.starts_with("WARNINGS:") {
+ args.add_class("pwt-color-warning");
+ } else {
+ args.add_class("pwt-color-error");
+ }
}
}
}
@@ -117,6 +134,9 @@ impl LoadableComponent for ProxmoxTasks {
show_filter: PersistentState::new("ProxmoxTasksShowFilter"),
filter_form_context,
row_render_callback,
+ last_filter: serde_json::Value::Object(Map::new()),
+ start: 0,
+ load_timeout: None,
}
}
@@ -155,9 +175,17 @@ impl LoadableComponent for ProxmoxTasks {
filter["until"] = until.into();
}
+ let start = self.start;
+ filter["start"] = start.into();
+ filter["limit"] = BATCH_LIMIT.into();
+
Box::pin(async move {
- let data = crate::http_get(&path, Some(filter)).await?;
- store.write().set_data(data);
+ let mut data: Vec<_> = crate::http_get(&path, Some(filter)).await?;
+ if start == 0 {
+ store.write().set_data(data);
+ } else {
+ store.write().append(&mut data);
+ }
Ok(())
})
}
@@ -170,14 +198,32 @@ impl LoadableComponent for ProxmoxTasks {
true
}
Msg::UpdateFilter => {
- // fixme: delay load
let form_context = self.filter_form_context.read();
if !form_context.is_valid() {
return false;
}
- ctx.link().send_reload();
+ let filter_params = form_context.get_submit_data();
+ if ctx.loading() && self.last_filter == filter_params {
+ return false;
+ }
+
+ self.last_filter = filter_params;
+ self.start = 0;
+
+ let link = ctx.link().clone();
+ self.load_timeout = Some(Timeout::new(FILTER_UPDATE_BUFFER_MS, move || {
+ link.send_reload();
+ }));
true
}
+ Msg::LoadBatch(start) => {
+ self.start = start;
+ let link = ctx.link().clone();
+ self.load_timeout = Some(Timeout::new(FILTER_UPDATE_BUFFER_MS, move || {
+ link.send_reload();
+ }));
+ false
+ }
}
}
@@ -220,7 +266,7 @@ impl LoadableComponent for ProxmoxTasks {
.with_child({
let loading = ctx.loading();
let link = ctx.link();
- Button::refresh(loading).onclick(move |_| link.send_reload())
+ Button::refresh(loading).onclick(move |_| link.send_message(Msg::LoadBatch(0)))
});
let filter_classes = classes!(
--
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 ` Dominik Csapak [this message]
2025-01-20 17:29 ` [pdm-devel] [PATCH yew-comp 2/7] tasks: load more tasks on end of list 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 ` [pdm-devel] [PATCH yew-comp 4/7] running tasks: make TaskListItem renderer configurable Dominik Csapak
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-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox