From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 1ABB51FF16E for ; Mon, 20 Jan 2025 10:30:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 473F316305; Mon, 20 Jan 2025 10:30:46 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 20 Jan 2025 10:29:56 +0100 Message-Id: <20250120093006.927014-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250120093006.927014-1-d.csapak@proxmox.com> References: <20250120093006.927014-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.233 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_DBL_SPAM 2.5 Contains a spam URL listed in the Spamhaus DBL blocklist [tasks.rs] Subject: [pdm-devel] [PATCH yew-comp 6/7] tasks: make columns configurable X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" this enables us to have different columns for different task views (e.g. remote tasks on PDM) and a custom renderer for the descriptions, etc. (also necessary for PDM) Signed-off-by: Dominik Csapak --- src/tasks.rs | 95 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 38 deletions(-) diff --git a/src/tasks.rs b/src/tasks.rs index 0ef80c6..bb6eb1d 100644 --- a/src/tasks.rs +++ b/src/tasks.rs @@ -49,6 +49,11 @@ pub struct Tasks { #[prop_or_default] #[builder(IntoPropValue, into_prop_value)] pub base_url: Option, + + #[builder(IntoPropValue, into_prop_value)] + #[prop_or_default] + /// An optional column configuration that overwrites the default one. + pub columns: Option>>>, } impl Default for Tasks { @@ -93,6 +98,46 @@ pub struct ProxmoxTasks { start: u64, last_filter: serde_json::Value, load_timeout: Option, + columns: Rc>>, +} + +impl ProxmoxTasks { + fn columns(ctx: &LoadableComponentContext) -> Rc>> { + if let Some(columns) = ctx.props().columns.clone() { + columns + } else { + Rc::new(vec![ + DataTableColumn::new(tr!("Start Time")) + .width("130px") + .render(|item: &TaskListItem| render_epoch_short(item.starttime).into()) + .into(), + DataTableColumn::new(tr!("End Time")) + .width("130px") + .render(|item: &TaskListItem| match item.endtime { + Some(endtime) => render_epoch_short(endtime).into(), + None => html! {}, + }) + .into(), + DataTableColumn::new(tr!("User name")) + .width("150px") + .render(|item: &TaskListItem| { + html! {&item.user} + }) + .into(), + DataTableColumn::new(tr!("Description")) + .flex(1) + .render(move |item: &TaskListItem| html! {format_upid(&item.upid)}) + .into(), + DataTableColumn::new(tr!("Status")) + .width("200px") + .render(|item: &TaskListItem| { + let text = item.status.as_deref().unwrap_or(""); + html! {text} + }) + .into(), + ]) + } + } } impl LoadableComponent for ProxmoxTasks { @@ -137,6 +182,7 @@ impl LoadableComponent for ProxmoxTasks { last_filter: serde_json::Value::Object(Map::new()), start: 0, load_timeout: None, + columns: Self::columns(ctx), } } @@ -320,7 +366,7 @@ impl LoadableComponent for ProxmoxTasks { } fn main_view(&self, ctx: &LoadableComponentContext) -> Html { - let columns = COLUMNS.with(Rc::clone); + let columns = self.columns.clone(); let link = ctx.link(); DataTable::new(columns, self.store.clone()) @@ -355,44 +401,17 @@ impl LoadableComponent for ProxmoxTasks { } } } -} -thread_local! { - static COLUMNS: Rc>> = Rc::new(vec![ - DataTableColumn::new(tr!("Start Time")) - .width("130px") - .render(|item: &TaskListItem| { - render_epoch_short(item.starttime).into() - }) - .into(), - DataTableColumn::new(tr!("End Time")) - .width("130px") - .render(|item: &TaskListItem| { - match item.endtime { - Some(endtime) => render_epoch_short(endtime).into(), - None => html!{}, - }}) - .into(), - DataTableColumn::new(tr!("User name")) - .width("150px") - .render(|item: &TaskListItem| { - html!{&item.user} - }) - .into(), - DataTableColumn::new(tr!("Description")) - .flex(1) - .render(|item: &TaskListItem| { - html!{format_upid(&item.upid)} - }) - .into(), - DataTableColumn::new(tr!("Status")) - .width("200px") - .render(|item: &TaskListItem| { - let text = item.status.as_deref().unwrap_or(""); - html!{text} - }) - .into(), - ]); + fn changed( + &mut self, + ctx: &LoadableComponentContext, + old_props: &Self::Properties, + ) -> bool { + if old_props.columns != ctx.props().columns { + self.columns = Self::columns(ctx); + } + true + } } impl From for VNode { -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel