enhance firewall rendering

pythops · Oct 5, 2024 · 92b76c9 · 92b76c9
1 parent 850f0f3
commit 92b76c9
Show file tree

Hide file tree

Showing 5 changed files with 316 additions and 227 deletions.
diff --git a/oryx-tui/src/app.rs b/oryx-tui/src/app.rs
@@ -22,6 +22,7 @@ pub enum ActivePopup {
     Help,
     UpdateFilters,
     PacketInfos,
+    NewFirewallRule,
 }
 
 #[derive(Debug)]

diff --git a/oryx-tui/src/handler.rs b/oryx-tui/src/handler.rs
@@ -6,6 +6,7 @@ use crate::{
     export::export,
     filter::FocusedBlock,
     notification::{Notification, NotificationLevel},
+    section::{FocusedSection, Section},
 };
 use ratatui::crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 
@@ -56,25 +57,41 @@ pub fn handle_key_events(
         match key_event.code {
             KeyCode::Esc => {
                 app.active_popup = None;
-                if popup == ActivePopup::UpdateFilters {
-                    app.filter.handle_key_events(key_event, true);
+                match popup {
+                    ActivePopup::UpdateFilters => {
+                        app.filter.handle_key_events(key_event, true);
+                    }
+                    ActivePopup::NewFirewallRule => {
+                        app.section.firewall.handle_keys(key_event);
+                        app.is_editing = false;
+                    }
+                    _ => {}
                 }
             }
-            KeyCode::Enter => {
-                if popup == ActivePopup::UpdateFilters
-                    && app.filter.focused_block == FocusedBlock::Apply
-                {
-                    app.filter
-                        .update(sender.clone(), app.data_channel_sender.clone())?;
+            KeyCode::Enter => match popup {
+                ActivePopup::UpdateFilters => {
+                    if app.filter.focused_block == FocusedBlock::Apply {
+                        app.filter
+                            .update(sender.clone(), app.data_channel_sender.clone())?;
 
-                    app.active_popup = None;
+                        app.active_popup = None;
+                    }
                 }
-            }
-            _ => {
-                if popup == ActivePopup::UpdateFilters {
+                ActivePopup::NewFirewallRule => {
+                    app.section.firewall.handle_keys(key_event);
+                }
+                _ => {}
+            },
+
+            _ => match popup {
+                ActivePopup::UpdateFilters => {
                     app.filter.handle_key_events(key_event, true);
                 }
-            }
+                ActivePopup::NewFirewallRule => {
+                    app.section.firewall.handle_keys(key_event);
+                }
+                _ => {}
+            },
         }
 
         return Ok(());
@@ -122,9 +139,19 @@ pub fn handle_key_events(
             }
         }
 
-        KeyCode::Char('/') | KeyCode::Char('n') => {
-            app.is_editing = true;
-            app.section.handle_keys(key_event);
+        KeyCode::Char('/') => {
+            if app.section.focused_section == FocusedSection::Inspection {
+                app.is_editing = true;
+                app.section.handle_keys(key_event);
+            }
+        }
+
+        KeyCode::Char('n') => {
+            if app.section.focused_section == FocusedSection::Firewall {
+                app.is_editing = true;
+                app.section.handle_keys(key_event);
+                app.active_popup = Some(ActivePopup::NewFirewallRule);
+            }
         }
 
         KeyCode::Char('i') => {

diff --git a/oryx-tui/src/section.rs b/oryx-tui/src/section.rs
@@ -31,7 +31,7 @@ pub enum FocusedSection {
 
 #[derive(Debug)]
 pub struct Section {
-    focused_section: FocusedSection,
+    pub focused_section: FocusedSection,
     pub inspection: Inspection,
     pub stats: Stats,
     pub alert: Alert,
@@ -111,7 +111,7 @@ impl Section {
             FocusedSection::Inspection => self.inspection.render(frame, block),
             FocusedSection::Stats => self.stats.render(frame, block, network_interace),
             FocusedSection::Alerts => self.alert.render(frame, block),
-            FocusedSection::Firewall => self.alert.render(frame, block),
+            FocusedSection::Firewall => self.firewall.render(frame, block),
         }
     }
 
@@ -135,6 +135,11 @@ impl Section {
                 if self.focused_section == FocusedSection::Inspection {
                     self.inspection.handle_keys(key_event);
                 }
+                match self.focused_section {
+                    FocusedSection::Inspection => self.inspection.handle_keys(key_event),
+                    FocusedSection::Firewall => self.firewall.handle_keys(key_event),
+                    _ => {}
+                }
             }
         }
     }