From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pdm-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id E5E9E1FF164
for <inbox@lore.proxmox.com>; Fri, 28 Feb 2025 16:19:11 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 24F3A122A8;
Fri, 28 Feb 2025 16:19:09 +0100 (CET)
From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pdm-devel@lists.proxmox.com
Date: Fri, 28 Feb 2025 16:17:59 +0100
Message-Id: <20250228151803.158984-23-s.hanreich@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250228151803.158984-1-s.hanreich@proxmox.com>
References: <20250228151803.158984-1-s.hanreich@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.274 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
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far
RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager 09/13] ui: sdn: add
AddVnetWindow component
X-BeenThere: pdm-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Datacenter Manager development discussion
<pdm-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/>
List-Post: <mailto:pdm-devel@lists.proxmox.com>
List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Datacenter Manager development discussion
<pdm-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pdm-devel-bounces@lists.proxmox.com
Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com>
Adds an edit window for creating a new VNet. This windows shows a form
containing all fields required to create new VNet via the create_vnet
API endpoint.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
lib/pdm-client/src/lib.rs | 2 +-
ui/src/sdn/evpn/add_vnet.rs | 216 ++++++++++++++++++++++++++++++++++++
ui/src/sdn/evpn/mod.rs | 3 +
3 files changed, 220 insertions(+), 1 deletion(-)
create mode 100644 ui/src/sdn/evpn/add_vnet.rs
diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
index 94d1f87..049d5a3 100644
--- a/lib/pdm-client/src/lib.rs
+++ b/lib/pdm-client/src/lib.rs
@@ -59,7 +59,7 @@ pub mod types {
pub use pve_api_types::PveUpid;
pub use pdm_api_types::sdn::{
- CreateVnetParams, CreateZoneParams, ListController, ListVnet, ListZone,
+ CreateVnetParams, CreateZoneParams, ListController, ListVnet, ListZone, SDN_ID_SCHEMA,
};
pub use pve_api_types::{ListControllersType, ListZonesType, SdnObjectState};
}
diff --git a/ui/src/sdn/evpn/add_vnet.rs b/ui/src/sdn/evpn/add_vnet.rs
new file mode 100644
index 0000000..05ecfbc
--- /dev/null
+++ b/ui/src/sdn/evpn/add_vnet.rs
@@ -0,0 +1,216 @@
+use std::{collections::HashSet, rc::Rc};
+
+use anyhow::{bail, Error};
+use pdm_client::types::{ListZone, SDN_ID_SCHEMA};
+use proxmox_yew_comp::{EditWindow, SchemaValidation};
+use pwt::{
+ css,
+ props::{
+ ContainerBuilder, CssBorderBuilder, CssPaddingBuilder, ExtractPrimaryKey, FieldBuilder,
+ SubmitCallback, WidgetBuilder, WidgetStyleBuilder,
+ },
+ state::{Selection, Store},
+ tr,
+ widget::{
+ data_table::{DataTable, DataTableColumn, DataTableHeader, MultiSelectMode},
+ error_message,
+ form::{
+ Field, FormContext, ManagedField, ManagedFieldContext, ManagedFieldMaster,
+ ManagedFieldState, Number,
+ },
+ Column, Container, GridPicker, InputPanel,
+ },
+};
+use pwt_macros::widget;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use yew::{function_component, virtual_dom::Key, Callback, Html, Properties};
+
+#[derive(Properties, PartialEq)]
+pub struct AddVnetWindowProps {
+ pub zones: Rc<Vec<ListZone>>,
+ pub on_submit_callback: SubmitCallback<FormContext>,
+ pub on_close_callback: Callback<()>,
+}
+
+#[function_component]
+pub fn AddVnetWindow(props: &AddVnetWindowProps) -> Html {
+ let zones = props.zones.clone();
+
+ EditWindow::new(tr!("Add VNet"))
+ .renderer(move |form_ctx: &FormContext| {
+ InputPanel::new()
+ .class(css::FlexFit)
+ .padding(4)
+ .width("auto")
+ .with_field(
+ tr!("VNet ID"),
+ Field::new()
+ .name("vnet")
+ .schema(&SDN_ID_SCHEMA)
+ .required(true),
+ )
+ .with_field(
+ tr!("VXLAN VNI"),
+ Number::<u32>::new()
+ .min(1)
+ .max(16777215)
+ .name("tag")
+ .required(true),
+ )
+ .with_custom_child(
+ Column::new()
+ .with_child(ZoneTable::new(zones.clone()).name("remotes"))
+ .with_optional_child(
+ form_ctx
+ .read()
+ .get_field_valid("remotes")
+ .and_then(|result| result.err().as_deref().map(error_message)),
+ ),
+ )
+ .into()
+ })
+ .on_close(props.on_close_callback.clone())
+ .on_submit(Some(props.on_submit_callback.clone()))
+ .into()
+}
+
+#[widget(comp=ManagedFieldMaster<ZoneTableComponent>, @input)]
+#[derive(Clone, PartialEq, Properties)]
+pub struct ZoneTable {
+ zones: Rc<Vec<ListZone>>,
+}
+
+impl ZoneTable {
+ pub fn new(zones: Rc<Vec<ListZone>>) -> Self {
+ yew::props!(Self { zones })
+ }
+}
+
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct ZoneTableEntry {
+ remote: String,
+ zone: String,
+}
+
+impl ExtractPrimaryKey for ZoneTableEntry {
+ fn extract_key(&self) -> Key {
+ Key::from(format!("{}/{}", self.remote, self.zone))
+ }
+}
+
+pub struct ZoneTableComponent {
+ store: Store<ZoneTableEntry>,
+ selection: Selection,
+}
+
+pub enum ZoneTableMsg {
+ SelectionChange,
+}
+
+impl ManagedField for ZoneTableComponent {
+ type Properties = ZoneTable;
+ type Message = ZoneTableMsg;
+ type ValidateClosure = ();
+
+ fn validation_args(_props: &Self::Properties) -> Self::ValidateClosure {}
+
+ fn validator(_props: &Self::ValidateClosure, value: &Value) -> Result<Value, Error> {
+ let selected_entries: Vec<ZoneTableEntry> = serde_json::from_value(value.clone())?;
+
+ if selected_entries.is_empty() {
+ bail!("at least one remote needs to be selected");
+ }
+
+ let mut unique = HashSet::new();
+
+ if !selected_entries
+ .iter()
+ .all(|entry| unique.insert(entry.remote.as_str()))
+ {
+ bail!("can only create the VNet once per remote!")
+ }
+
+ Ok(value.clone())
+ }
+
+ fn setup(_props: &Self::Properties) -> ManagedFieldState {
+ ManagedFieldState {
+ value: Value::Array(Vec::new()),
+ valid: Ok(()),
+ default: Value::Array(Vec::new()),
+ radio_group: false,
+ unique: false,
+ }
+ }
+
+ fn create(ctx: &ManagedFieldContext<Self>) -> Self {
+ let link = ctx.link().clone();
+ let selection = Selection::new().multiselect(true).on_select(move |_| {
+ link.send_message(Self::Message::SelectionChange);
+ });
+
+ let store = Store::new();
+ store.set_data(
+ ctx.props()
+ .zones
+ .iter()
+ .map(|zone| ZoneTableEntry {
+ remote: zone.remote.clone(),
+ zone: zone.zone.zone.clone(),
+ })
+ .collect(),
+ );
+
+ Self { store, selection }
+ }
+
+ fn update(&mut self, ctx: &ManagedFieldContext<Self>, msg: Self::Message) -> bool {
+ match msg {
+ Self::Message::SelectionChange => {
+ let read_guard = self.store.read();
+
+ ctx.link().update_value(
+ serde_json::to_value(
+ self.selection
+ .selected_keys()
+ .iter()
+ .filter_map(|key| read_guard.lookup_record(key))
+ .collect::<Vec<_>>(),
+ )
+ .unwrap(),
+ );
+ }
+ }
+
+ false
+ }
+
+ fn view(&self, _ctx: &ManagedFieldContext<Self>) -> Html {
+ let table = DataTable::new(COLUMNS.with(Rc::clone), self.store.clone())
+ .multiselect_mode(MultiSelectMode::Simple)
+ .border(true)
+ .class(css::FlexFit);
+
+ Container::new()
+ .with_child(GridPicker::new(table).selection(self.selection.clone()))
+ .into()
+ }
+}
+
+thread_local! {
+ static COLUMNS: Rc<Vec<DataTableHeader<ZoneTableEntry>>> =
+ Rc::new(vec![
+ DataTableColumn::selection_indicator().into(),
+ DataTableColumn::new(tr!("Remote"))
+ .flex(1)
+ .render(move |item: &ZoneTableEntry| item.remote.as_str().into())
+ .sorter(|a: &ZoneTableEntry, b: &ZoneTableEntry| a.remote.cmp(&b.remote))
+ .into(),
+ DataTableColumn::new(tr!("Zone"))
+ .flex(1)
+ .render(move |item: &ZoneTableEntry| item.zone.as_str().into())
+ .sorter(|a: &ZoneTableEntry, b: &ZoneTableEntry| a.zone.cmp(&b.zone))
+ .into(),
+ ]);
+}
diff --git a/ui/src/sdn/evpn/mod.rs b/ui/src/sdn/evpn/mod.rs
index 996ab25..4db42b4 100644
--- a/ui/src/sdn/evpn/mod.rs
+++ b/ui/src/sdn/evpn/mod.rs
@@ -3,3 +3,6 @@ pub use router_table::RouterTable;
mod vrf_tree;
pub use vrf_tree::VrfTree;
+
+mod add_vnet;
+pub use add_vnet::AddVnetWindow;
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel