[pdm-devel] [PATCH datacenter-manager] ui: remote wizard: append nodename to tokenname if possible

* [pdm-devel] [PATCH datacenter-manager] ui: remote wizard: append nodename to tokenname if possible
@ 2025-12-03 13:40 Dominik Csapak
  2025-12-03 14:28 ` Thomas Lamprecht
  0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2025-12-03 13:40 UTC (permalink / raw)
  To: pdm-devel

so that multiple PDM instances can access the same remotes without having
their token names clash by default.

Extract the token name from the `Proxmox` object of the index.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/remotes/wizard_page_info.rs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ui/src/remotes/wizard_page_info.rs b/ui/src/remotes/wizard_page_info.rs
index 8bcd1b38..fbe57d63 100644
--- a/ui/src/remotes/wizard_page_info.rs
+++ b/ui/src/remotes/wizard_page_info.rs
@@ -1,8 +1,10 @@
 use std::rc::Rc;
 
 use anyhow::Error;
+use gloo_utils::{format::JsValueSerdeExt, window};
 use html::IntoEventCallback;
 use serde::{Deserialize, Serialize};
+use wasm_bindgen::JsValue;
 use yew::virtual_dom::{Key, VComp, VNode};
 
 use proxmox_schema::property_string::PropertyString;
@@ -341,7 +343,10 @@ impl Component for PdmWizardPageInfo {
                     .disabled(!self.user_mode)
                     .required(self.user_mode)
                     .submit(self.user_mode)
-                    .default("pdm-admin"),
+                    .default(match get_nodename() {
+                        Some(nodename) => format!("pdm-admin-{nodename}"),
+                        None => "pdm-admin".to_string(),
+                    }),
             )
             .with_right_custom_child(Container::new().key("spacer")) //spacer
             .with_right_custom_child(
@@ -409,3 +414,15 @@ impl From<WizardPageInfo> for VNode {
         VNode::from(comp)
     }
 }
+
+#[derive(Deserialize)]
+struct ProxmoxServerConfig {
+    #[serde(alias = "NodeName")]
+    pub node_name: String,
+}
+
+fn get_nodename() -> Option<String> {
+    let value = js_sys::Reflect::get(&window(), &JsValue::from_str("Proxmox")).ok()?;
+    let config: ProxmoxServerConfig = JsValueSerdeExt::into_serde(&value).ok()?;
+    Some(config.node_name)
+}
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel


^ permalink raw reply	[flat|nested] 2+ messages in thread