all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Christoph Heiss <c.heiss@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [PATCH yew-comp v4 13/40] widget: kvlist: add widget for user-modifiable data tables
Date: Thu, 30 Apr 2026 14:46:42 +0200	[thread overview]
Message-ID: <20260430124712.1614305-14-c.heiss@proxmox.com> (raw)
In-Reply-To: <20260430124712.1614305-1-c.heiss@proxmox.com>

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
Changes v3 -> v4:
  * moved to proxmox-yew-comp
  * use serde_json::Value instead of generic type

Changes v2 -> v3:
  * new patch

 src/key_value_list.rs | 348 ++++++++++++++++++++++++++++++++++++++++++
 src/lib.rs            |   3 +
 2 files changed, 351 insertions(+)
 create mode 100644 src/key_value_list.rs

diff --git a/src/key_value_list.rs b/src/key_value_list.rs
new file mode 100644
index 0000000..e6062b1
--- /dev/null
+++ b/src/key_value_list.rs
@@ -0,0 +1,348 @@
+use anyhow::{bail, Error};
+use serde_json::Value;
+use std::{
+    fmt::Debug,
+    rc::Rc,
+    sync::atomic::{AtomicU32, Ordering},
+};
+use yew::{html::IntoPropValue, virtual_dom::Key};
+
+use pwt::{
+    css::{AlignItems, ColorScheme, FlexFit, FontColor},
+    prelude::*,
+    props::FieldStdProps,
+    props::RenderFn,
+    state::Store,
+    widget::{
+        data_table::{DataTable, DataTableColumn, DataTableHeader},
+        form::{
+            Field, IntoSubmitValidateFn, ManagedField, ManagedFieldContext, ManagedFieldMaster,
+            ManagedFieldScopeExt, ManagedFieldState, SubmitValidateFn,
+        },
+        ActionIcon, Button, Column, Container, Fa, Row,
+    },
+};
+use pwt_macros::{builder, widget};
+
+#[widget(comp = ManagedFieldMaster<KeyValueListField>, @input)]
+#[derive(Clone, PartialEq, Properties)]
+#[builder]
+/// A [`DataTable`]-based grid to hold a list of user-enterable key-value pairs.
+///
+/// Displays a [`DataTable`] with three columns; key, value and a delete button, with an add button
+/// below to create new rows.
+/// Both key and value are modifiable by the user.
+pub struct KeyValueList {
+    #[builder]
+    #[prop_or_default]
+    /// Initial value pairs to display.
+    pub value: Vec<(String, Value)>,
+
+    #[builder(IntoPropValue, into_prop_value)]
+    #[prop_or(tr!("Name").into())]
+    /// Label for the key column, defaults to "Name".
+    pub key_label: AttrValue,
+
+    #[builder(IntoPropValue, into_prop_value)]
+    #[prop_or_default]
+    /// Placeholder to display in the key columns fields, default is no placeholder.
+    pub key_placeholder: AttrValue,
+
+    #[builder(IntoPropValue, into_prop_value)]
+    #[prop_or(tr!("Value").into())]
+    /// Label for the value column.
+    pub value_label: AttrValue,
+
+    #[builder]
+    #[prop_or(default_value_renderer.into())]
+    pub value_renderer: RenderFn<(String, Value, FieldStdProps, Callback<String>), Html>,
+
+    #[builder_cb(IntoSubmitValidateFn, into_submit_validate_fn, Vec<(String, Value)>)]
+    #[prop_or_default]
+    /// Callback to run on submit on the data in the table.
+    pub submit_validate: Option<SubmitValidateFn<Vec<(String, Value)>>>,
+}
+
+impl KeyValueList {
+    pub fn new() -> Self {
+        yew::props!(Self {})
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+struct Entry {
+    /// Only used as key for the store, since that needs a stable value
+    index: u32,
+    key: String,
+    value: Value,
+}
+
+pub struct KeyValueListField {
+    state: ManagedFieldState,
+    store: Store<Entry>,
+    index_counter: AtomicU32,
+}
+
+pwt::impl_deref_mut_property!(KeyValueListField, state, ManagedFieldState);
+
+pub enum Message {
+    DataChange,
+    UpdateKey(String, String),
+    UpdateValue(String, Value),
+    RemoveEntry(String),
+}
+
+impl KeyValueListField {
+    fn reset_data(&mut self, data: &[(String, Value)]) {
+        self.store.set_data(
+            data.iter()
+                .enumerate()
+                .map(|(i, (k, v))| Entry {
+                    index: i as u32,
+                    key: k.clone(),
+                    value: v.clone(),
+                })
+                .collect(),
+        );
+    }
+
+    fn columns(ctx: &ManagedFieldContext<KeyValueListField>) -> Rc<Vec<DataTableHeader<Entry>>> {
+        let props = ctx.props().clone();
+        let link = ctx.link().clone();
+
+        Rc::new(vec![
+            DataTableColumn::new(props.key_label.clone())
+                .flex(1)
+                .render({
+                    let link = link.clone();
+                    let props = props.clone();
+                    move |item: &Entry| {
+                        let key = item.key.clone();
+                        Field::new()
+                            .on_change(
+                                link.callback({
+                                    move |value| Message::UpdateKey(key.clone(), value)
+                                }),
+                            )
+                            .required(true)
+                            .disabled(props.input_props.disabled)
+                            .placeholder(props.key_placeholder.clone())
+                            .validate(|s: &String| {
+                                if s.is_empty() {
+                                    bail!("Field may not be empty");
+                                } else {
+                                    Ok(())
+                                }
+                            })
+                            .value(item.key.clone())
+                            .into()
+                    }
+                })
+                .sorter(|a: &Entry, b: &Entry| a.key.cmp(&b.key))
+                .into(),
+            DataTableColumn::new(props.value_label.clone())
+                .flex(1)
+                .render({
+                    let link = link.clone();
+                    let props = props.clone();
+                    move |item: &Entry| {
+                        let on_change = link.callback({
+                            let key = item.key.clone();
+                            move |value: String| {
+                                Message::UpdateValue(key.clone(), Value::String(value))
+                            }
+                        });
+                        props.value_renderer.apply(&(
+                            item.key.clone(),
+                            item.value.clone(),
+                            props.input_props.clone(),
+                            on_change,
+                        ))
+                    }
+                })
+                .into(),
+            DataTableColumn::new("")
+                .width("50px")
+                .render(move |item: &Entry| {
+                    let key = item.key.clone();
+                    ActionIcon::new("fa fa-lg fa-trash-o")
+                        .tabindex(0)
+                        .on_activate(link.callback(move |_| Message::RemoveEntry(key.clone())))
+                        .disabled(props.input_props.disabled)
+                        .into()
+                })
+                .into(),
+        ])
+    }
+}
+
+impl ManagedField for KeyValueListField {
+    type Message = Message;
+    type Properties = KeyValueList;
+    type ValidateClosure = (bool, Option<SubmitValidateFn<Vec<(String, Value)>>>);
+
+    fn create(ctx: &ManagedFieldContext<Self>) -> Self {
+        let store = Store::with_extract_key(|entry: &Entry| Key::from(entry.index))
+            .on_change(ctx.link().callback(|_| Message::DataChange));
+
+        // put the default value through the validator fn, to allow for correct dirty checking
+        let default = if let Some(f) = &ctx.props().submit_validate {
+            f.apply(&ctx.props().value).unwrap_or_default()
+        } else {
+            serde_json::to_value(ctx.props().value.clone()).unwrap_or_default()
+        };
+
+        let mut this = Self {
+            state: ManagedFieldState::new(Value::Null, default),
+            store,
+            index_counter: AtomicU32::new(ctx.props().value.len() as u32),
+        };
+        this.reset_data(&ctx.props().value);
+        this
+    }
+
+    fn validation_args(props: &Self::Properties) -> Self::ValidateClosure {
+        (props.input_props.required, props.submit_validate.clone())
+    }
+
+    fn validator(props: &Self::ValidateClosure, value: &Value) -> Result<Value, Error> {
+        let data = serde_json::from_value::<Vec<(String, Value)>>(value.clone())?;
+
+        if data.is_empty() && props.0 {
+            bail!(tr!("at least one entry required!"));
+        }
+
+        if data.iter().any(|(k, _)| k.is_empty()) {
+            bail!(tr!("name must not be empty!"));
+        }
+
+        if let Some(cb) = &props.1 {
+            cb.apply(&data)
+        } else {
+            Ok(value.clone())
+        }
+    }
+
+    fn changed(&mut self, ctx: &ManagedFieldContext<Self>, old_props: &Self::Properties) -> bool {
+        let props = ctx.props();
+        if old_props.value != props.value {
+            let data: Value = props
+                .value
+                .iter()
+                .filter_map(|n| serde_json::to_value(n).ok())
+                .collect();
+
+            ctx.link().update_default(data.clone());
+        }
+        true
+    }
+
+    fn value_changed(&mut self, _ctx: &ManagedFieldContext<Self>) {
+        match &self.state.value {
+            Value::Null => {
+                let data =
+                    serde_json::from_value::<Vec<(String, Value)>>(self.state.default.clone())
+                        .unwrap();
+                self.reset_data(&data);
+            }
+            value => {
+                let data = serde_json::from_value::<Vec<(String, Value)>>(value.clone()).unwrap();
+                self.reset_data(&data);
+            }
+        }
+    }
+
+    fn update(&mut self, ctx: &ManagedFieldContext<Self>, msg: Self::Message) -> bool {
+        match msg {
+            Message::DataChange => {
+                let list: Vec<(String, Value)> = self
+                    .store
+                    .read()
+                    .iter()
+                    .map(|Entry { key, value, .. }| (key.clone(), value.clone()))
+                    .collect();
+
+                ctx.link().update_value(serde_json::to_value(list).unwrap());
+                true
+            }
+            Message::RemoveEntry(key) => {
+                self.store.write().retain(|item| item.key != key);
+                true
+            }
+            Message::UpdateKey(old_name, new_name) => {
+                let mut data = self.store.write();
+                if let Some(item) = data.iter_mut().find(|item| item.key == old_name) {
+                    item.key = new_name;
+                }
+                true
+            }
+            Message::UpdateValue(key, value) => {
+                let mut data = self.store.write();
+                if let Some(item) = data.iter_mut().find(|item| item.key == key) {
+                    item.value = value;
+                }
+                true
+            }
+        }
+    }
+
+    fn view(&self, ctx: &ManagedFieldContext<Self>) -> Html {
+        let props = ctx.props();
+
+        let table = DataTable::new(Self::columns(ctx), self.store.clone())
+            .border(true)
+            .class(FlexFit);
+
+        let button_row = Row::new()
+            .with_child(
+                Button::new(tr!("Add"))
+                    .class(ColorScheme::Primary)
+                    .icon_class("fa fa-plus-circle")
+                    .disabled(props.input_props.disabled)
+                    .on_activate({
+                        let store = self.store.clone();
+                        let index = self.index_counter.fetch_add(1, Ordering::Relaxed);
+                        move |_| {
+                            store.write().push(Entry {
+                                index,
+                                key: String::new(),
+                                value: String::new().into(),
+                            });
+                        }
+                    }),
+            )
+            .with_flex_spacer()
+            .with_optional_child(self.state.result.clone().err().map(|err| {
+                Row::new()
+                    .class(AlignItems::Center)
+                    .gap(2)
+                    .with_child(Fa::new("exclamation-triangle").class(FontColor::Error))
+                    .with_child(err)
+            }));
+
+        Column::new()
+            .class(FlexFit)
+            .gap(2)
+            .with_child(
+                Container::from_widget_props(ctx.props().std_props.clone(), None)
+                    .class(FlexFit)
+                    .with_child(table),
+            )
+            .with_child(button_row)
+            .into()
+    }
+}
+
+fn default_value_renderer(
+    (_key, value, input_props, on_change): &(String, Value, FieldStdProps, Callback<String>),
+) -> Html {
+    Field::new()
+        .value(match value {
+            Value::String(s) => s.to_owned(),
+            Value::Number(n) => n.as_i64().unwrap_or_default().to_string(),
+            other => other.to_string(),
+        })
+        .disabled(input_props.disabled)
+        .on_change(on_change)
+        .into()
+}
diff --git a/src/lib.rs b/src/lib.rs
index 2b09bf4..dd2ccb0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -234,6 +234,9 @@ pub mod utils;
 mod xtermjs;
 pub use xtermjs::{ConsoleType, ProxmoxXTermJs, XTermJs};
 
+mod key_value_list;
+pub use key_value_list::KeyValueList;
+
 use pwt::gettext_noop;
 use pwt::state::{LanguageInfo, TextDirection};
 
-- 
2.53.0





  parent reply	other threads:[~2026-04-30 12:48 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-30 12:46 [PATCH datacenter-manager/installer/proxmox/yew-comp v4 00/40] add auto-installer integration Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 01/40] api-macro: allow $ in identifier name Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 02/40] schema: oneOf: allow single string variant Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 03/40] schema: implement UpdaterType for HashMap and BTreeMap Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 04/40] network-types: move `Fqdn` type from proxmox-installer-common Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 05/40] network-types: implement api type for Fqdn Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 06/40] network-types: add api wrapper type for std::net::IpAddr Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 07/40] network-types: cidr: implement generic `IpAddr::new` constructor Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 08/40] network-types: fqdn: implement standard library Error for Fqdn Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 09/40] node-status: make KernelVersionInformation Clone + PartialEq Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 10/40] installer-types: add common types used by the installer Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 11/40] installer-types: add types used by the auto-installer Christoph Heiss
2026-04-30 12:46 ` [PATCH proxmox v4 12/40] installer-types: implement api type for all externally-used types Christoph Heiss
2026-04-30 12:46 ` Christoph Heiss [this message]
2026-04-30 12:46 ` [PATCH datacenter-manager v4 14/40] api-types, cli: use ReturnType::new() instead of constructing it manually Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 15/40] api-types: add api types for auto-installer integration Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 16/40] config: add auto-installer configuration module Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 17/40] acl: wire up new /system/auto-installation acl path Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 18/40] server: api: add auto-installer integration module Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 19/40] server: api: auto-installer: add access token management endpoints Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 20/40] client: add bindings for auto-installer endpoints Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 21/40] ui: auto-installer: add installations overview panel Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 22/40] ui: auto-installer: add prepared answer configuration panel Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 23/40] ui: auto-installer: add access token " Christoph Heiss
2026-04-30 12:46 ` [PATCH datacenter-manager v4 24/40] docs: add documentation for auto-installer integration Christoph Heiss
2026-04-30 12:46 ` [PATCH installer v4 25/40] install: iso env: use JSON boolean literals for product config Christoph Heiss
2026-04-30 12:46 ` [PATCH installer v4 26/40] common: http: allow passing custom headers to post() Christoph Heiss
2026-04-30 12:46 ` [PATCH installer v4 27/40] common: http: retrieve error message from body on post() Christoph Heiss
2026-04-30 12:46 ` [PATCH installer v4 28/40] common: options: move regex construction out of loop Christoph Heiss
2026-04-30 12:46 ` [PATCH installer v4 29/40] assistant: support adding an authorization token for HTTP-based answers Christoph Heiss
2026-04-30 12:46 ` [PATCH installer v4 30/40] post-hook: run cargo fmt Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 31/40] tree-wide: used moved `Fqdn` type to proxmox-network-types Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 32/40] tree-wide: use `Cidr` type from proxmox-network-types Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 33/40] tree-wide: switch to filesystem types from proxmox-installer-types Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 34/40] auto: sysinfo: switch to " Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 35/40] fetch-answer: " Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 36/40] fetch-answer: http: prefer json over toml for answer format Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 37/40] fetch-answer: send auto-installer HTTP authorization token if set Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 38/40] fetch-answer: print full error messages when fetching failed Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 39/40] tree-wide: switch out `Answer` -> `AutoInstallerConfig` types Christoph Heiss
2026-04-30 12:47 ` [PATCH installer v4 40/40] auto: drop now-dead answer file definitions Christoph Heiss

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=20260430124712.1614305-14-c.heiss@proxmox.com \
    --to=c.heiss@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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal