Merge pull request #45 from rylos/main

Filter cycle (all→active→inactive→failed)

Author: matheus-git

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = systemd-manager-tui
 	pkgdesc = systemd manager tui
-	pkgver = 1.0.1
+	pkgver = 1.1.0
 	pkgrel = 1
 	url = https://github.com/matheus-git/systemd-manager-tui
 	arch = x86_64

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "systemd-manager-tui"
-version = "1.0.9"
+version = "1.1.0"
 description = "TUI for managing systemd services"
 authors = ["Matheus-git <[email protected]>"]
 license = "MIT"

Cargo.toml

@@ -1,6 +1,6 @@
 # Mantainer: matheus-git <[email protected]>
 pkgname=systemd-manager-tui
-pkgver=1.0.1
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="systemd manager tui"
 arch=('x86_64')

PKGBUILD

@@ -47,7 +47,8 @@ pub enum Actions {
     Filter(String),
     UpdateIgnoreListKeys(bool),
     EditCurrentService,
-    ServiceAction(ServiceAction)
+    ServiceAction(ServiceAction),
+    ShowHelp,
 }
 
 pub enum AppEvent {
@@ -84,6 +85,7 @@ pub struct App {
     event_rx: Receiver<AppEvent>,
     event_tx: Sender<AppEvent>,
     selected_tab_index: usize,
+    show_help: bool,
 }
 
 impl App {
@@ -108,6 +110,7 @@ impl App {
             event_rx,
             event_tx,
             selected_tab_index: 0,
+            show_help: false,
         }
     }
 
@@ -161,18 +164,36 @@ fn spawn_key_event_listener(&self) {
             match self.event_rx.recv()? {
                 AppEvent::Key(key) => match self.status {
                     Status::Log => {
-                        self.on_key_event(key);
-                        log.on_key_event(key)
+                        if self.show_help {
+                            self.show_help = false;
+                        } else {
+                            self.on_key_event(key);
+                            log.on_key_event(key);
+                        }
                     }
                     Status::List => {
-                        self.on_key_event(key);
-                        self.on_key_horizontal_event(key, filter.input_mode == InputMode::Editing);
-                        table_service.on_key_event(key);
-                        filter.on_key_event(key);
+                        if self.show_help {
+                            self.show_help = false;
+                            // Ensure the table is active and can receive key events
+                            table_service.set_ignore_key_events(false);
+                            // If no item is selected and list is not empty, select first item
+                            if table_service.table_state.selected().is_none() && !table_service.is_filtered_list_empty() {
+                                table_service.set_selected_index(0);
+                            }
+                        } else {
+                            self.on_key_event(key);
+                            self.on_key_horizontal_event(key, filter.input_mode == InputMode::Editing);
+                            table_service.on_key_event(key);
+                            filter.on_key_event(key);
+                        }
                     }
                     Status::Details => {
-                        self.on_key_event(key);
-                        details.on_key_event(key);
+                        if self.show_help {
+                            self.show_help = false;
+                        } else {
+                            self.on_key_event(key);
+                            details.on_key_event(key);
+                        }
                     }
                 },
                 AppEvent::Action(Actions::ServiceAction(action)) => {
@@ -229,6 +250,9 @@ fn spawn_key_event_listener(&self) {
                 AppEvent::Error(error_msg) => {
                     self.error_popup(&mut terminal, error_msg)?;    
                 }
+                AppEvent::Action(Actions::ShowHelp) => {
+                    self.show_help = !self.show_help;
+                }
             }
         }
 
@@ -296,6 +320,67 @@ fn spawn_key_event_listener(&self) {
         Ok(())
     }
 
+    fn draw_help_popup(&self, frame: &mut Frame, area: Rect) {
+        let popup_width = std::cmp::min(80, area.width.saturating_sub(4));
+        let popup_height = std::cmp::min(25, area.height.saturating_sub(4));
+
+        let popup_x = (area.width.saturating_sub(popup_width)) / 2;
+        let popup_y = (area.height.saturating_sub(popup_height)) / 2;
+
+        let popup_area = Rect::new(
+            area.x + popup_x,
+            area.y + popup_y,
+            popup_width,
+            popup_height,
+        );
+
+        frame.render_widget(Clear, popup_area);
+
+        let text = vec![
+            Line::from(vec![Span::styled(
+                "SYSTEMD MANAGER TUI - HELP",
+                Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD),
+            )]),
+            Line::from(""),
+            Line::from(vec![Span::styled("Navigation:", Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))]),
+            Line::from("  ↑/k - Move up    ↓/j - Move down"),
+            Line::from("  ←/h - Previous tab    →/l - Next tab"),
+            Line::from("  PageUp/PageDown - Jump 10 items"),
+            Line::from(""),
+            Line::from(vec![Span::styled("Service Control:", Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))]),
+            Line::from("  s - Start service    x - Stop service"),
+            Line::from("  r - Restart service"),
+            Line::from("  e - Enable service    d - Disable service"),
+            Line::from("  m - Mask/Unmask service"),
+            Line::from(""),
+            Line::from(vec![Span::styled("View & Filter:", Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))]),
+            Line::from("  f - Toggle all/services filter"),
+            Line::from("  a - Cycle filter (all→active→inactive→failed)"),
+            Line::from("  u - Refresh service list"),
+            Line::from(""),
+            Line::from(vec![Span::styled("Information:", Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))]),
+            Line::from("  v - View service logs"),
+            Line::from("  c - View unit file details"),
+            Line::from(""),
+            Line::from(vec![Span::styled(
+                "Press ? or any key to close",
+                Style::default().fg(Color::Gray),
+            )]),
+        ];
+
+        let help_block = Paragraph::new(text)
+            .block(
+                Block::default()
+                    .borders(Borders::ALL)
+                    .border_style(Style::default().fg(Color::Cyan))
+                    .title("Help"),
+            )
+            .alignment(Alignment::Left)
+            .wrap(ratatui::widgets::Wrap { trim: true });
+
+        frame.render_widget(help_block, popup_area);
+    }
+
     fn error_popup(&self, terminal: &mut DefaultTerminal, error_msg: String) -> Result<()> {
         let user_friendly_message = get_user_friendly_error(&error_msg);
 
@@ -403,14 +488,45 @@ fn spawn_key_event_listener(&self) {
             ])
             .areas(area);
 
-            let tabs = Tabs::new(vec!["System units","Session units"])
+            let filter_state = table.get_active_filter_state();
+            
+            let system_tab = if self.selected_tab_index == 0 {
+                Line::from(vec![
+                    Span::raw("System units"),
+                    Span::styled(
+                        format!(" (Filter: {})", filter_state.as_str()),
+                        Style::default().fg(Color::Gray)
+                    )
+                ])
+            } else {
+                Line::from("System units")
+            };
+            
+            let session_tab = if self.selected_tab_index == 1 {
+                Line::from(vec![
+                    Span::raw("Session units"),
+                    Span::styled(
+                        format!(" (Filter: {})", filter_state.as_str()),
+                        Style::default().fg(Color::Gray)
+                    )
+                ])
+            } else {
+                Line::from("Session units")
+            };
+            
+            let tabs = Tabs::new(vec![system_tab, session_tab])
                 .select(self.selected_tab_index)
                 .highlight_style(Style::default().fg(Color::Yellow));
 
             frame.render_widget(tabs, tabs_box);
             filter.draw(frame, filter_box);
             table.render(frame, list_box);
             self.draw_shortcuts(frame, help_area_box, table.shortcuts());
+            
+            // Show help popup if needed
+            if self.show_help {
+                self.draw_help_popup(frame, area);
+            }
         })?;
 
         Ok(())

src/terminal/app.rs

@@ -51,6 +51,34 @@ fn generate_rows(services: &[Service]) -> Vec<Row<'static>> {
         .collect()
 }
 
+#[derive(Clone, Copy)]
+pub enum ActiveFilterState {
+    All,
+    Active,
+    Inactive,
+    Failed,
+}
+
+impl ActiveFilterState {
+    pub fn next(self) -> Self {
+        match self {
+            ActiveFilterState::All => ActiveFilterState::Active,
+            ActiveFilterState::Active => ActiveFilterState::Inactive,
+            ActiveFilterState::Inactive => ActiveFilterState::Failed,
+            ActiveFilterState::Failed => ActiveFilterState::All,
+        }
+    }
+
+    pub fn as_str(self) -> &'static str {
+        match self {
+            ActiveFilterState::All => "all",
+            ActiveFilterState::Active => "active",
+            ActiveFilterState::Inactive => "inactive",
+            ActiveFilterState::Failed => "failed",
+        }
+    }
+}
+
 pub enum ServiceAction {
     Start,
     Stop,
@@ -59,7 +87,7 @@ pub enum ServiceAction {
     Disable,
     RefreshAll,
     ToggleFilter,
-    ToggleMask
+    ToggleMask,
 }
 
 pub struct TableServices {
@@ -73,6 +101,7 @@ pub struct TableServices {
     sender: Sender<AppEvent>,
     usecase: Rc<RefCell<ServicesManager>>,
     filter_all: bool,
+    active_filter_state: ActiveFilterState,
 }
 
 impl TableServices {
@@ -131,6 +160,7 @@ impl TableServices {
             ignore_key_events: false,
             usecase,
             filter_all,
+            active_filter_state: ActiveFilterState::All,
         }
     }
 
@@ -189,6 +219,21 @@ impl TableServices {
         self.filtered_services = self.filter(filter_text, self.services.clone());
         self.rows = generate_rows(&self.filtered_services.clone());
         self.table = self.table.clone().rows(self.rows.clone());
+        
+        // If no item is selected and the list is not empty, select the first item
+        if self.table_state.selected().is_none() && !self.filtered_services.is_empty() {
+            self.table_state.select(Some(0));
+        }
+        // If the selected index is out of bounds, reset to first item or None
+        else if let Some(selected) = self.table_state.selected() {
+            if selected >= self.filtered_services.len() {
+                if self.filtered_services.is_empty() {
+                    self.table_state.select(None);
+                } else {
+                    self.table_state.select(Some(0));
+                }
+            }
+        }
     }
 
     fn fetch_services(&mut self) {
@@ -210,7 +255,14 @@ impl TableServices {
             .into_iter()
             .filter(|service| {
                 let name = service.name();
-                name.to_lowercase().contains(&lower_filter)
+                let name_matches = name.to_lowercase().contains(&lower_filter);
+                let active_matches = match self.active_filter_state {
+                    ActiveFilterState::All => true,
+                    ActiveFilterState::Active => service.state().active() == "active",
+                    ActiveFilterState::Inactive => service.state().active() != "active" && service.state().active() != "failed",
+                    ActiveFilterState::Failed => service.state().active() == "failed",
+                };
+                name_matches && active_matches
             })
             .collect()
     }
@@ -251,10 +303,26 @@ impl TableServices {
                 self.sender.send(AppEvent::Action(Actions::ServiceAction(ServiceAction::ToggleFilter))).unwrap();
                 return;
             }
+            KeyCode::Char('a') => {
+                self.active_filter_state = self.active_filter_state.next();
+                self.refresh(self.old_filter_text.clone());
+                // Select the first element only if the list is not empty
+                if !self.filtered_services.is_empty() {
+                    self.table_state.select(Some(0));
+                } else {
+                    self.table_state.select(None);
+                }
+                self.set_ignore_key_events(false);
+                return;
+            }
             KeyCode::Char('m') => {
                 self.sender.send(AppEvent::Action(Actions::ServiceAction(ServiceAction::ToggleMask))).unwrap();
                 return;
             }
+            KeyCode::Char('?') => {
+                self.sender.send(AppEvent::Action(Actions::ShowHelp)).unwrap();
+                return;
+            }
             _ => {}
         }
 
@@ -385,6 +453,14 @@ impl TableServices {
         }
     }
 
+    pub fn is_filtered_list_empty(&self) -> bool {
+        self.filtered_services.is_empty()
+    }
+
+    pub fn get_active_filter_state(&self) -> ActiveFilterState {
+        self.active_filter_state
+    }
+
     pub fn shortcuts(&mut self) -> Vec<Line<'_>> {
         let mut help_text: Vec<Line<'_>> = Vec::new();
         if !self.ignore_key_events {
@@ -396,7 +472,7 @@ impl TableServices {
             )));
 
             help_text.push(Line::from(
-                "Navigate: ↑/↓ | Switch tab: ←/→ | List all: f | Start: s | Stop: x | Restart: r | Enable: e | Disable: d | Mask/Unmask: m | Refresh list: u | Log: v | Unit File: c"
+                "Navigate: ↑/↓ | Switch tab: ←/→ | Start: s | Stop: x | Restart: r | Enable: e | Disable: d | Help: ? | List all: f | Filter: a | Mask/Unmask: m | Refresh: u | Log: v | Unit File: c"
             ));
         }