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 3879D1FF16B for <inbox@lore.proxmox.com>; Thu, 3 Apr 2025 16:18:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3355B3D82; Thu, 3 Apr 2025 16:18:17 +0200 (CEST) From: Shannon Sterz <s.sterz@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Thu, 3 Apr 2025 16:18:04 +0200 Message-Id: <20250403141806.402974-8-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403141806.402974-1-s.sterz@proxmox.com> References: <20250403141806.402974-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 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 Subject: [pdm-devel] [PATCH yew-comp 3/3] role_selector/acl_edit: make api endpoint and default role configurable 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> and expose it via the AclEdit component too so that users can more easily adapt the components to their needs. Signed-off-by: Shannon Sterz <s.sterz@proxmox.com> --- src/acl/acl_edit.rs | 22 +++++++++++++++++++++- src/role_selector.rs | 20 ++++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/acl/acl_edit.rs b/src/acl/acl_edit.rs index b8bbd89..03421b0 100644 --- a/src/acl/acl_edit.rs +++ b/src/acl/acl_edit.rs @@ -24,6 +24,16 @@ pub struct AclEdit { #[builder(IntoPropValue, into_prop_value)] acl_api_endpoint: String, + /// The endpoint which will be used to create new ACL entries via a PUT request. + #[prop_or_default] + #[builder(IntoPropValue, into_prop_value)] + role_api_endpoint: Option<String>, + + /// The role that will be pre-selected in the role selector, `NoAccess` by default. + #[prop_or_default] + #[builder(IntoPropValue, into_prop_value)] + default_role: Option<AttrValue>, + #[prop_or_default] input_panel: InputPanel, } @@ -59,12 +69,22 @@ impl From<AclEdit> for EditWindow { ) }; + let mut role_selector = RoleSelector::new().name("role").required(true); + + if let Some(role_api_endpoint) = value.role_api_endpoint { + role_selector.set_role_api_endpoint(role_api_endpoint); + } + + if let Some(default_role) = value.default_role { + role_selector.set_default_role(default_role.clone()); + } + let input_panel = value .input_panel .clone() .padding(4) .with_field(authid_label, authid_field) - .with_field(tr!("Role"), RoleSelector::new().name("role").required(true)) + .with_field(tr!("Role"), role_selector) .with_field( tr!("Propagate"), Checkbox::new().name("propagate").required(true), diff --git a/src/role_selector.rs b/src/role_selector.rs index 20a8483..429f58c 100644 --- a/src/role_selector.rs +++ b/src/role_selector.rs @@ -1,5 +1,6 @@ use anyhow::format_err; use std::rc::Rc; +use yew::html::IntoPropValue; use yew::virtual_dom::Key; @@ -37,11 +38,22 @@ thread_local! { } use pwt::props::{FieldBuilder, WidgetBuilder}; -use pwt_macros::widget; +use pwt_macros::{builder, widget}; #[widget(comp=ProxmoxRoleSelector, @input)] #[derive(Clone, Properties, PartialEq)] -pub struct RoleSelector {} +#[builder] +pub struct RoleSelector { + /// The default role. + #[builder(IntoPropValue, into_prop_value)] + #[prop_or(Some(AttrValue::from("NoAccess")))] + default_role: Option<AttrValue>, + + /// The API endpoint from which to fetch the existing roles from. + #[builder(IntoPropValue, into_prop_value)] + #[prop_or(String::from("/access/roles"))] + role_api_endpoint: String, +} impl Default for RoleSelector { fn default() -> Self { @@ -104,8 +116,8 @@ impl Component for ProxmoxRoleSelector { .with_std_props(&props.std_props) .with_input_props(&props.input_props) .required(true) - .default("NoAccess") - .loader("/access/roles") + .default(ctx.props().default_role.clone()) + .loader(ctx.props().role_api_endpoint.clone()) .validate(self.validate.clone()) .into() } -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel