public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager 5/5] ui: remote edit: add 'web-url' options to the edit panel
Date: Fri, 10 Jan 2025 11:21:42 +0100	[thread overview]
Message-ID: <20250110102142.1212874-7-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250110102142.1212874-1-d.csapak@proxmox.com>

so users can modify it.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/remotes/edit_remote.rs | 59 ++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/ui/src/remotes/edit_remote.rs b/ui/src/remotes/edit_remote.rs
index f9b0356..27c3cb6 100644
--- a/ui/src/remotes/edit_remote.rs
+++ b/ui/src/remotes/edit_remote.rs
@@ -1,18 +1,24 @@
 use std::rc::Rc;
 
+use anyhow::Error;
+use serde_json::Value;
 use yew::html::IntoEventCallback;
 use yew::virtual_dom::{VComp, VNode};
 
 use pwt::css::FlexFit;
 use pwt::prelude::*;
-use pwt::widget::form::{DisplayField, Field, FormContext, InputType};
-use pwt::widget::{Container, InputPanel};
+use pwt::widget::form::{delete_empty_values, DisplayField, Field, FormContext, InputType};
+use pwt::widget::{Container, InputPanel, Row};
 
+use proxmox_yew_comp::form::{flatten_property_string, property_string_from_parts};
 use proxmox_yew_comp::percent_encoding::percent_encode_component;
 use proxmox_yew_comp::{EditWindow, SchemaValidation};
 
+use proxmox_client::ApiResponseData;
 use proxmox_schema::ApiType;
 
+use pdm_api_types::remotes::WebUrl;
+
 use super::NodeUrlList;
 
 use pwt_macros::builder;
@@ -37,6 +43,14 @@ impl EditRemote {
 
 pub struct PdmEditRemote {}
 
+async fn load_remote(url: AttrValue) -> Result<ApiResponseData<Value>, Error> {
+    let mut resp: ApiResponseData<Value> = proxmox_yew_comp::http_get_full(&*url, None).await?;
+
+    flatten_property_string(&mut resp.data, "web-url", &WebUrl::API_SCHEMA);
+
+    Ok(resp)
+}
+
 impl Component for PdmEditRemote {
     type Message = ();
     type Properties = EditRemote;
@@ -47,14 +61,15 @@ impl Component for PdmEditRemote {
 
     fn view(&self, ctx: &Context<Self>) -> Html {
         let props = ctx.props();
+        let url = format!(
+            "/remotes/{}/config",
+            percent_encode_component(&props.remote_id)
+        );
         EditWindow::new(tr!("Edit") + ": " + &tr!("Remote"))
             .width(800)
             .min_height(400)
             .on_done(props.on_done.clone())
-            .loader(format!(
-                "/remotes/{}/config",
-                percent_encode_component(&props.remote_id)
-            ))
+            .loader((load_remote, url))
             .renderer({
                 let remote_id = props.remote_id.clone();
                 move |form_ctx| edit_remote_input_panel(form_ctx, &remote_id)
@@ -64,7 +79,12 @@ impl Component for PdmEditRemote {
                 move |form_ctx: FormContext| {
                     let url = url.clone();
                     async move {
-                        let data = form_ctx.get_submit_data();
+                        let mut data = form_ctx.get_submit_data();
+
+                        property_string_from_parts::<WebUrl>(&mut data, "web-url", true);
+
+                        let data = delete_empty_values(&data, &["web-url"], true);
+
                         proxmox_yew_comp::http_put(&url, Some(data)).await
                     }
                 }
@@ -97,6 +117,31 @@ fn edit_remote_input_panel(_form_ctx: &FormContext, remote_id: &str) -> Html {
                 .input_type(InputType::Password)
                 .required(false),
         )
+        .with_field(
+            tr!("Web Base URL"),
+            Field::new()
+                .name("_web-url_base-url")
+                .placeholder(tr!("Automatically generate from first connection.")),
+        )
+        .with_field(
+            tr!("per Node URL template"),
+            Field::new()
+                .name("_web-url_per-node-template")
+                .placeholder(tr!("Same as Web Base URL.")),
+        )
+        .with_custom_child(
+            Row::new()
+                .key("hint-text")
+                .gap(2)
+                .with_child(Container::new().with_child(tr!(
+                    "Possible template values for 'per Node URL template' are:"
+                )))
+                .with_child(
+                    Container::new()
+                        .style("font-family", "monospace")
+                        .with_child("{{nodename}}"),
+                ),
+        )
         .with_custom_child(
             Container::new()
                 .key("nodes-title")
-- 
2.39.5



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


  parent reply	other threads:[~2025-01-10 10:22 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-10 10:21 [pdm-devel] [PATCH yew-comp/datacenter-manager] make ui url generation configurable Dominik Csapak
2025-01-10 10:21 ` [pdm-devel] [PATCH yew-comp 1/1] form: add helpers for property strings Dominik Csapak
2025-01-10 10:21 ` [pdm-devel] [PATCH datacenter-manager 1/5] server: add an optional 'web-url' property for remotes Dominik Csapak
2025-01-15 15:12   ` Thomas Lamprecht
2025-01-16  8:04     ` Dominik Csapak
2025-01-23  8:48       ` Thomas Lamprecht
2025-01-23 13:31         ` Dominik Csapak
2025-01-10 10:21 ` [pdm-devel] [PATCH datacenter-manager 2/5] ui: remote edit: add missing key for displayfield Dominik Csapak
2025-01-10 10:21 ` [pdm-devel] [PATCH datacenter-manager 3/5] ui: remote edit: rename 'Nodes' to 'Endpoints' Dominik Csapak
2025-01-10 10:21 ` [pdm-devel] [PATCH datacenter-manager 4/5] ui: generate URLs with the option 'web-url' property Dominik Csapak
2025-01-10 10:21 ` Dominik Csapak [this message]
2025-01-15 15:27   ` [pdm-devel] [PATCH datacenter-manager 5/5] ui: remote edit: add 'web-url' options to the edit panel Thomas Lamprecht
2025-01-15 17:40     ` Dietmar Maurer
2025-01-13 14:33 ` [pdm-devel] [PATCH yew-comp/datacenter-manager] make ui url generation configurable Dominik Csapak
2025-01-15 13:12 ` [pdm-devel] applied: " Dietmar Maurer

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=20250110102142.1212874-7-d.csapak@proxmox.com \
    --to=d.csapak@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal