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 D86C01FF15C
for <inbox@lore.proxmox.com>; Fri, 16 May 2025 15:36:00 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E787DD9C0;
Fri, 16 May 2025 15:36:20 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Date: Fri, 16 May 2025 15:36:07 +0200
Message-Id: <20250516133611.3499075-18-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250516133611.3499075-1-d.csapak@proxmox.com>
References: <20250516133611.3499075-1-d.csapak@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 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 datacenter-manager 17/21] ui: pve wizard: info:
use pve realm selector
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>
instead of using the realm info from the connect page scan.
This enables us to use another api path for the connect page.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
ui/src/remotes/wizard_page_info.rs | 40 ++++++++----------------------
1 file changed, 11 insertions(+), 29 deletions(-)
diff --git a/ui/src/remotes/wizard_page_info.rs b/ui/src/remotes/wizard_page_info.rs
index 0d19ebf..a3834fc 100644
--- a/ui/src/remotes/wizard_page_info.rs
+++ b/ui/src/remotes/wizard_page_info.rs
@@ -2,18 +2,18 @@ use std::rc::Rc;
use anyhow::{bail, Error};
use html::IntoEventCallback;
-use proxmox_schema::property_string::PropertyString;
use serde::{Deserialize, Serialize};
use yew::virtual_dom::{Key, VComp, VNode};
+use proxmox_schema::property_string::PropertyString;
use proxmox_yew_comp::WizardPageRenderInfo;
use pwt::{
css::{self, FlexFit},
prelude::*,
widget::{
error_message,
- form::{Combobox, Field, FormContext, FormContextObserver, InputType, RadioButton},
- Button, Column, Container, InputPanel, Mask, Row,
+ form::{Field, FormContext, FormContextObserver, InputType, RadioButton},
+ Column, Container, InputPanel, Mask, Row,
},
AsyncPool,
};
@@ -23,6 +23,7 @@ use pdm_api_types::remotes::{NodeUrl, Remote, ScanResult};
use pwt_macros::builder;
use super::wizard_page_connect::ConnectParams;
+use crate::widget::PveRealmSelector;
#[derive(Clone, PartialEq, Properties)]
#[builder]
@@ -46,7 +47,6 @@ impl WizardPageInfo {
pub struct PdmWizardPageInfo {
user_mode: bool,
- realms: Rc<Vec<AttrValue>>,
server_info: Option<Remote>,
last_error: Option<Error>,
credentials: Option<(String, String)>,
@@ -72,20 +72,6 @@ pub struct ScanParams {
fingerprint: Option<String>,
}
-fn create_realm_list(props: &WizardPageInfo) -> Rc<Vec<AttrValue>> {
- if let Some(info) = &props.connect_info {
- let realms = Rc::new(
- info.realms
- .iter()
- .map(|realm| AttrValue::from(realm.realm.clone()))
- .collect(),
- );
- realms
- } else {
- Rc::new(Vec::new())
- }
-}
-
async fn scan(connection_params: ConnectParams, form_ctx: FormContext) -> Result<Remote, Error> {
let mut data = form_ctx.get_submit_data();
@@ -199,7 +185,6 @@ impl Component for PdmWizardPageInfo {
Self {
server_info: None,
user_mode: true,
- realms: create_realm_list(props),
_form_observer,
last_error: None,
loading: false,
@@ -278,12 +263,12 @@ impl Component for PdmWizardPageInfo {
true
}
- fn changed(&mut self, ctx: &Context<Self>, _old_props: &Self::Properties) -> bool {
- self.realms = create_realm_list(ctx.props());
- true
- }
-
fn view(&self, ctx: &Context<Self>) -> Html {
+ let props = ctx.props();
+ let (hostname, fingerprint) = match props.connect_info.clone() {
+ Some(info) => (info.hostname, info.fingerprint),
+ None => (Default::default(), None),
+ };
let input_panel = InputPanel::new()
.class(FlexFit)
.padding(4)
@@ -318,12 +303,9 @@ impl Component for PdmWizardPageInfo {
)
.with_field(
tr!("Realm"),
- Combobox::new()
+ PveRealmSelector::new(hostname, fingerprint)
.name("realm")
- .disabled(!self.user_mode)
- .required(self.user_mode)
- .items(self.realms.clone())
- .submit(false),
+ .required(true),
)
.with_field(
tr!("API Token Name"),
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel