[PATCH yew-mobile-gui v2 14/21] cluster/qemu firewall: use rules panel and comment out unused tabs

[Shannon Sterz <s.sterz@proxmox.com>]

this makes the rules panel actually display the QEMU and cluster
firewall rules. it also comments out the place-holder tabs for now as
they don't actually offer any real benefit to users yet. add them back
once appropriate components have been implemented.

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 src/pages/page_cluster_firewall/mod.rs       | 51 ++++++++++----------
 src/pages/page_qemu_status/firewall_panel.rs | 27 ++++++-----
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/pages/page_cluster_firewall/mod.rs b/src/pages/page_cluster_firewall/mod.rs
index 6bb8253..47b50cf 100644
--- a/src/pages/page_cluster_firewall/mod.rs
+++ b/src/pages/page_cluster_firewall/mod.rs
@@ -8,7 +8,7 @@ use pwt::prelude::*;
 use pwt::state::PersistentState;
 use pwt::widget::{Column, MiniScroll, TabBar, TabBarItem};
 
-use proxmox_yew_comp::configuration::pve::FirewallOptionsClusterPanel;
+use proxmox_yew_comp::configuration::pve::{FirewallOptionsClusterPanel, FirewallRulesPanel};
 use pwt::props::StorageLocation;
 
 use crate::widgets::TopNavBar;
@@ -37,9 +37,9 @@ pub enum ViewState {
     #[default]
     Rules,
     Options,
-    SecurityGroup,
-    Alias,
-    IPSet,
+    //SecurityGroup,
+    //Alias,
+    //IPSet,
 }
 
 pub enum Msg {
@@ -69,9 +69,10 @@ impl Component for PvePageClusterFirewall {
         let (active_tab, content): (_, Html) = match *self.view_state {
             ViewState::Rules => (
                 "rules",
-                html! {
-                    <div>{ format!("Firewall rules for cluster") }</div>
-                },
+                FirewallRulesPanel::cluster_firewall()
+                    .mobile(true)
+                    .readonly(true)
+                    .into(),
             ),
             ViewState::Options => (
                 "options",
@@ -80,6 +81,12 @@ impl Component for PvePageClusterFirewall {
                     .readonly(true)
                     .into(),
             ),
+            /*ViewState::SecurityGroup => (
+                "security-group",
+                html! {
+                    <div>{ format!("Firewall security group for cluster") }</div>
+                },
+            ),
             ViewState::Alias => (
                 "alias",
                 html! {
@@ -91,13 +98,7 @@ impl Component for PvePageClusterFirewall {
                 html! {
                     <div>{ format!("Firewall ipset for cluster") }</div>
                 },
-            ),
-            ViewState::SecurityGroup => (
-                "security-group",
-                html! {
-                    <div>{ format!("Firewall security group for cluster") }</div>
-                },
-            ),
+            ),*/
         };
 
         let tab_bar = TabBar::new()
@@ -122,6 +123,16 @@ impl Component for PvePageClusterFirewall {
                             .callback(|_| Msg::SetViewState(ViewState::Options)),
                     ),
             )
+            /*.with_item(
+                TabBarItem::new()
+                    .key("security-group")
+                    .label(tr!("Security Group"))
+                    .icon_class("fa fa-list")
+                    .on_activate(
+                        ctx.link()
+                            .callback(|_| Msg::SetViewState(ViewState::SecurityGroup)),
+                    ),
+            )
             .with_item(
                 TabBarItem::new()
                     .key("alias")
@@ -135,17 +146,7 @@ impl Component for PvePageClusterFirewall {
                     .label(tr!("IPSet"))
                     .icon_class("fa fa-list-ol")
                     .on_activate(ctx.link().callback(|_| Msg::SetViewState(ViewState::IPSet))),
-            )
-            .with_item(
-                TabBarItem::new()
-                    .key("security-group")
-                    .label(tr!("Security Group"))
-                    .icon_class("fa fa-list")
-                    .on_activate(
-                        ctx.link()
-                            .callback(|_| Msg::SetViewState(ViewState::SecurityGroup)),
-                    ),
-            );
+            )*/;
 
         Column::new()
             .class("pwt-fit")
diff --git a/src/pages/page_qemu_status/firewall_panel.rs b/src/pages/page_qemu_status/firewall_panel.rs
index bcc6213..2c420c8 100644
--- a/src/pages/page_qemu_status/firewall_panel.rs
+++ b/src/pages/page_qemu_status/firewall_panel.rs
@@ -8,7 +8,7 @@ use pwt::props::StorageLocation;
 use pwt::state::PersistentState;
 use pwt::widget::{Column, MiniScroll, TabBar, TabBarItem};
 
-use proxmox_yew_comp::configuration::pve::FirewallOptionsGuestPanel;
+use proxmox_yew_comp::configuration::pve::{FirewallOptionsGuestPanel, FirewallRulesPanel};
 use proxmox_yew_comp::form::pve::PveGuestType;
 
 #[derive(Clone, PartialEq, Properties)]
@@ -31,9 +31,9 @@ pub enum ViewState {
     #[default]
     Rules,
     Options,
-    Alias,
-    IPSet,
-    Log,
+    //Alias,
+    //IPSet,
+    //Log,
 }
 pub struct PveQemuFirewallPanel {
     view_state: PersistentState<ViewState>,
@@ -72,9 +72,14 @@ impl Component for PveQemuFirewallPanel {
         let (active_tab, content): (_, Html) = match *self.view_state {
             ViewState::Rules => (
                 "rules",
-                html! {
-                    <div>{ format!("Firewall rules for VM {}", props.vmid) }</div>
-                },
+                FirewallRulesPanel::guest_firewall(
+                    PveGuestType::Qemu,
+                    props.node.clone(),
+                    props.vmid,
+                )
+                .mobile(true)
+                .readonly(true)
+                .into(),
             ),
             ViewState::Options => (
                 "options",
@@ -83,7 +88,7 @@ impl Component for PveQemuFirewallPanel {
                     .readonly(true)
                     .into(),
             ),
-            ViewState::Alias => (
+            /*ViewState::Alias => (
                 "alias",
                 html! {
                     <div>{ format!("Firewall alias for VM {}", props.vmid) }</div>
@@ -100,7 +105,7 @@ impl Component for PveQemuFirewallPanel {
                 html! {
                     <div>{ format!("Firewall log for VM {}", props.vmid) }</div>
                 },
-            ),
+            ),*/
         };
 
         let tab_bar = TabBar::new()
@@ -125,7 +130,7 @@ impl Component for PveQemuFirewallPanel {
                             .callback(|_| Msg::SetViewState(ViewState::Options)),
                     ),
             )
-            .with_item(
+            /*.with_item(
                 TabBarItem::new()
                     .key("alias")
                     .label(tr!("Alias"))
@@ -145,7 +150,7 @@ impl Component for PveQemuFirewallPanel {
                     .label(tr!("Log"))
                     .icon_class("fa fa-list")
                     .on_activate(ctx.link().callback(|_| Msg::SetViewState(ViewState::Log))),
-            );
+            )*/;
 
         Column::new()
             .class(pwt::css::FlexFit)
-- 
2.47.3