public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager 2/2] ui: firewall: add link to pve to rules/options panel
Date: Mon,  1 Dec 2025 16:31:09 +0100	[thread overview]
Message-ID: <20251201153109.274759-3-h.laimer@proxmox.com> (raw)
In-Reply-To: <20251201153109.274759-1-h.laimer@proxmox.com>

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 ui/src/remotes/firewall/tree.rs | 65 +++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/ui/src/remotes/firewall/tree.rs b/ui/src/remotes/firewall/tree.rs
index 18510b5..ad538e0 100644
--- a/ui/src/remotes/firewall/tree.rs
+++ b/ui/src/remotes/firewall/tree.rs
@@ -1,4 +1,5 @@
 use futures::Future;
+use gloo_utils::window;
 use std::pin::Pin;
 use std::rc::Rc;
 use yew::{ContextHandle, Html};
@@ -139,6 +140,7 @@ pub enum Msg {
         nodes: Vec<String>,
     },
     SelectionChanged,
+    TabChanged,
     ToggleTreePanel,
     Error(FirewallError),
     NoOp,
@@ -147,6 +149,7 @@ pub enum Msg {
 pub struct FirewallTreeComponent {
     store: TreeStore<TreeEntry>,
     selection: Selection,
+    tab_selection: Selection,
     _context_listener: ContextHandle<RemoteList>,
     filter_text: String,
     scope: Scope,
@@ -169,6 +172,46 @@ impl FirewallTreeComponent {
         self.selected_entry = None;
     }
 
+    fn get_pve_url(&self, ctx: &LoadableComponentContext<Self>, tab: &str) -> Option<String> {
+        let entry = self.selected_entry.as_ref()?;
+        let (remote, node, vmid, kind) = match entry {
+            TreeEntry::Remote(r) => (r.name.as_str(), None, None, None),
+            TreeEntry::Node(n) => (n.remote.as_str(), Some(n.name.as_str()), None, None),
+            TreeEntry::Guest(g, kind) => (
+                g.remote.as_str(),
+                Some(g.node.as_str()),
+                Some(g.guest.vmid),
+                Some(kind),
+            ),
+            _ => return None,
+        };
+
+        let is_options = tab == "options";
+        let index = if is_options { 36 } else { 32 };
+
+        match (node, vmid, kind) {
+            (None, None, _) => {
+                let id = format!("v1:0:18:4:::::::{index}");
+                let url = crate::get_deep_url_low_level(ctx.link().yew_link(), remote, None, &id)?;
+                Some(url.href())
+            }
+            (Some(node), None, _) => {
+                let id = format!("node/{node}:4:{index}");
+                let url = crate::get_deep_url(ctx.link().yew_link(), remote, Some(node), &id)?;
+                Some(url.href())
+            }
+            (Some(node), Some(vmid), Some(kind)) => {
+                let id = match kind {
+                    GuestKind::Lxc => format!("lxc/{vmid}:4::::::{index}"),
+                    GuestKind::Qemu => format!("qemu/{vmid}:4:::::{index}"),
+                };
+                let url = crate::get_deep_url(ctx.link().yew_link(), remote, Some(node), &id)?;
+                Some(url.href())
+            }
+            _ => None,
+        }
+    }
+
     fn handle_scope_change(&mut self, ctx: &LoadableComponentContext<Self>, new_scope: Scope) {
         let remote_changed = self.scope.remote_name() != new_scope.remote_name();
 
@@ -301,10 +344,28 @@ impl FirewallTreeComponent {
             config.title
         };
 
+        let current_tab = self
+            .tab_selection
+            .selected_key()
+            .map(|k| k.to_string())
+            .unwrap_or_else(|| "rules".to_string());
+
+        let pve_url = self.get_pve_url(ctx, &current_tab);
+
         let mut tab_panel = TabPanel::new()
+            .selection(self.tab_selection.clone())
             .class(css::FlexFit)
             .class(css::ColorScheme::Neutral)
             .title(title)
+            .tool(
+                Button::new(tr!("Open Web UI"))
+                    .icon_class("fa fa-external-link")
+                    .on_activate(move |_| {
+                        if let Some(url) = &pve_url {
+                            let _ = window().open_with_url(url);
+                        }
+                    }),
+            )
             .with_item_builder(
                 TabBarItem::new()
                     .key("rules")
@@ -403,6 +464,8 @@ impl LoadableComponent for FirewallTreeComponent {
         let selection = Selection::new()
             .on_select(link.callback(|_selection: Selection| Msg::SelectionChanged));
 
+        let tab_selection = Selection::new().on_select(link.callback(|_| Msg::TabChanged));
+
         let (_, context_listener) = ctx
             .link()
             .yew_link()
@@ -413,6 +476,7 @@ impl LoadableComponent for FirewallTreeComponent {
         Self {
             store,
             selection,
+            tab_selection,
             _context_listener: context_listener,
             filter_text: String::new(),
             scope: Scope::default(),
@@ -533,6 +597,7 @@ impl LoadableComponent for FirewallTreeComponent {
                 }
                 true
             }
+            Msg::TabChanged => true,
             Msg::ToggleTreePanel => {
                 self.tree_collapsed = !self.tree_collapsed;
                 true
-- 
2.47.3



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


  parent reply	other threads:[~2025-12-01 15:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-01 15:31 [pdm-devel] [PATCH proxmox-datacenter-manager 0/2] change to tabbed panel when selecting an item in the firewall tree Hannes Laimer
2025-12-01 15:31 ` [pdm-devel] [PATCH proxmox-datacenter-manager 1/2] ui: firewall: use property view for options instead of dialog Hannes Laimer
2025-12-01 15:31 ` Hannes Laimer [this message]
2025-12-01 23:40 ` [pdm-devel] applied: [PATCH proxmox-datacenter-manager 0/2] change to tabbed panel when selecting an item in the firewall tree Thomas Lamprecht

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=20251201153109.274759-3-h.laimer@proxmox.com \
    --to=h.laimer@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