Simplify navigation and add vi-style keys
All checks were successful
Build and Release / build-and-release (push) Successful in 1m12s

Major UI simplification and navigation improvements:

Changes:
- Removed panel selection concept entirely (no more Shift+Tab)
- Service selection always visible with blue highlighting
- Up/Down arrows now directly control service selection
- Added j/k vi-style navigation keys as alternatives to arrow keys
- Removed panel focus borders - all panels look uniform
- Service commands (s/S) work without panel focus requirements
- Updated keyboard shortcuts to reflect simplified navigation

Navigation:
- Tab: Switch hosts
- ↑↓/jk: Select service (always works)
- R: Rebuild host
- s: Start service
- S: Stop service
- q: Quit

The interface is now much simpler and more intuitive with direct service control.
This commit is contained in:
Christoffer Martinsson 2025-10-28 16:31:35 +01:00
parent e890c5e810
commit f22e3ee95e
8 changed files with 45 additions and 173 deletions

6
Cargo.lock generated
View File

@ -270,7 +270,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
[[package]] [[package]]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.31" version = "0.1.32"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -291,7 +291,7 @@ dependencies = [
[[package]] [[package]]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.31" version = "0.1.32"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -314,7 +314,7 @@ dependencies = [
[[package]] [[package]]
name = "cm-dashboard-shared" name = "cm-dashboard-shared"
version = "0.1.31" version = "0.1.32"
dependencies = [ dependencies = [
"chrono", "chrono",
"serde", "serde",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.32" version = "0.1.33"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.32" version = "0.1.33"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

View File

@ -14,7 +14,7 @@ use app::Dashboard;
/// Get hardcoded version /// Get hardcoded version
fn get_version() -> &'static str { fn get_version() -> &'static str {
"v0.1.32" "v0.1.33"
} }
/// Check if running inside tmux session /// Check if running inside tmux session

View File

@ -1,5 +1,5 @@
use anyhow::Result; use anyhow::Result;
use crossterm::event::{Event, KeyCode, KeyModifiers}; use crossterm::event::{Event, KeyCode};
use ratatui::{ use ratatui::{
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
style::Style, style::Style,
@ -37,15 +37,6 @@ pub enum CommandType {
} }
/// Panel types for focus management /// Panel types for focus management
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum PanelType {
System,
Services,
Backup,
}
impl PanelType {
}
/// Widget states for a specific host /// Widget states for a specific host
#[derive(Clone)] #[derive(Clone)]
@ -92,8 +83,6 @@ pub struct TuiApp {
available_hosts: Vec<String>, available_hosts: Vec<String>,
/// Host index for navigation /// Host index for navigation
host_index: usize, host_index: usize,
/// Currently focused panel
focused_panel: PanelType,
/// Should quit application /// Should quit application
should_quit: bool, should_quit: bool,
/// Track if user manually navigated away from localhost /// Track if user manually navigated away from localhost
@ -109,7 +98,6 @@ impl TuiApp {
current_host: None, current_host: None,
available_hosts: Vec::new(), available_hosts: Vec::new(),
host_index: 0, host_index: 0,
focused_panel: PanelType::System, // Start with System panel focused
should_quit: false, should_quit: false,
user_navigated_away: false, user_navigated_away: false,
config, config,
@ -271,54 +259,49 @@ impl TuiApp {
} }
} }
KeyCode::Char('s') => { KeyCode::Char('s') => {
if self.focused_panel == PanelType::Services { // Service start command
// Service start command if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) { if self.start_command(&hostname, CommandType::ServiceStart, service_name.clone()) {
if self.start_command(&hostname, CommandType::ServiceStart, service_name.clone()) { return Ok(Some(UiCommand::ServiceStart { hostname, service_name }));
return Ok(Some(UiCommand::ServiceStart { hostname, service_name }));
}
} }
} }
} }
KeyCode::Char('S') => { KeyCode::Char('S') => {
if self.focused_panel == PanelType::Services { // Service stop command
// Service stop command if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) { if self.start_command(&hostname, CommandType::ServiceStop, service_name.clone()) {
if self.start_command(&hostname, CommandType::ServiceStop, service_name.clone()) { return Ok(Some(UiCommand::ServiceStop { hostname, service_name }));
return Ok(Some(UiCommand::ServiceStop { hostname, service_name }));
}
} }
} }
} }
KeyCode::Char('b') => { KeyCode::Char('b') => {
if self.focused_panel == PanelType::Backup { // Trigger backup
// Trigger backup if let Some(hostname) = self.current_host.clone() {
if let Some(hostname) = self.current_host.clone() { self.start_command(&hostname, CommandType::BackupTrigger, hostname.clone());
self.start_command(&hostname, CommandType::BackupTrigger, hostname.clone()); return Ok(Some(UiCommand::TriggerBackup { hostname }));
return Ok(Some(UiCommand::TriggerBackup { hostname }));
}
} }
} }
KeyCode::Tab => { KeyCode::Tab => {
if key.modifiers.contains(KeyModifiers::SHIFT) { // Tab cycles to next host
// Shift+Tab cycles through panels self.navigate_host(1);
self.next_panel(); }
} else { KeyCode::Up | KeyCode::Char('k') => {
// Tab cycles to next host // Move service selection up
self.navigate_host(1); if let Some(hostname) = self.current_host.clone() {
let host_widgets = self.get_or_create_host_widgets(&hostname);
host_widgets.services_widget.select_previous();
} }
} }
KeyCode::BackTab => { KeyCode::Down | KeyCode::Char('j') => {
// BackTab (Shift+Tab on some terminals) also cycles panels // Move service selection down
self.next_panel(); if let Some(hostname) = self.current_host.clone() {
} let total_services = {
KeyCode::Up => { let host_widgets = self.get_or_create_host_widgets(&hostname);
// Scroll up in focused panel host_widgets.services_widget.get_total_services_count()
self.scroll_focused_panel(-1); };
} let host_widgets = self.get_or_create_host_widgets(&hostname);
KeyCode::Down => { host_widgets.services_widget.select_next(total_services);
// Scroll down in focused panel }
self.scroll_focused_panel(1);
} }
_ => {} _ => {}
} }
@ -359,25 +342,6 @@ impl TuiApp {
} }
/// Switch to next panel (Shift+Tab) - only cycles through visible panels
pub fn next_panel(&mut self) {
let visible_panels = self.get_visible_panels();
if visible_panels.len() <= 1 {
return; // Can't switch if only one or no panels visible
}
// Find current panel index in visible panels
if let Some(current_index) = visible_panels.iter().position(|&p| p == self.focused_panel) {
// Move to next visible panel
let next_index = (current_index + 1) % visible_panels.len();
self.focused_panel = visible_panels[next_index];
} else {
// Current panel not visible, switch to first visible panel
self.focused_panel = visible_panels[0];
}
info!("Switched to panel: {:?}", self.focused_panel);
}
@ -478,61 +442,8 @@ impl TuiApp {
} }
} }
/// Scroll the focused panel up or down
pub fn scroll_focused_panel(&mut self, direction: i32) {
if let Some(hostname) = self.current_host.clone() {
let focused_panel = self.focused_panel; // Get the value before borrowing
let host_widgets = self.get_or_create_host_widgets(&hostname);
match focused_panel {
PanelType::System => {
if direction > 0 {
host_widgets.system_scroll_offset = host_widgets.system_scroll_offset.saturating_add(1);
} else {
host_widgets.system_scroll_offset = host_widgets.system_scroll_offset.saturating_sub(1);
}
info!("System panel scroll offset: {}", host_widgets.system_scroll_offset);
}
PanelType::Services => {
// For services panel, Up/Down moves selection cursor, not scroll
let total_services = host_widgets.services_widget.get_total_services_count();
if direction > 0 {
host_widgets.services_widget.select_next(total_services);
info!("Services selection moved down");
} else {
host_widgets.services_widget.select_previous();
info!("Services selection moved up");
}
}
PanelType::Backup => {
if direction > 0 {
host_widgets.backup_scroll_offset = host_widgets.backup_scroll_offset.saturating_add(1);
} else {
host_widgets.backup_scroll_offset = host_widgets.backup_scroll_offset.saturating_sub(1);
}
info!("Backup panel scroll offset: {}", host_widgets.backup_scroll_offset);
}
}
}
}
/// Get list of currently visible panels
fn get_visible_panels(&self) -> Vec<PanelType> {
let mut visible_panels = vec![PanelType::System, PanelType::Services];
// Check if backup panel should be shown
if let Some(hostname) = &self.current_host {
if let Some(host_widgets) = self.host_widgets.get(hostname) {
if host_widgets.backup_widget.has_data() {
visible_panels.push(PanelType::Backup);
}
}
}
visible_panels
}
/// Render the dashboard (real btop-style multi-panel layout) /// Render the dashboard (real btop-style multi-panel layout)
pub fn render(&mut self, frame: &mut Frame, metric_store: &MetricStore) { pub fn render(&mut self, frame: &mut Frame, metric_store: &MetricStore) {
@ -601,7 +512,7 @@ impl TuiApp {
// Render services widget for current host // Render services widget for current host
if let Some(hostname) = self.current_host.clone() { if let Some(hostname) = self.current_host.clone() {
let is_focused = self.focused_panel == PanelType::Services; let is_focused = true; // Always show service selection
let (scroll_offset, pending_transitions) = { let (scroll_offset, pending_transitions) = {
let host_widgets = self.get_or_create_host_widgets(&hostname); let host_widgets = self.get_or_create_host_widgets(&hostname);
(host_widgets.services_scroll_offset, host_widgets.pending_service_transitions.clone()) (host_widgets.services_scroll_offset, host_widgets.pending_service_transitions.clone())
@ -730,25 +641,10 @@ impl TuiApp {
// Global shortcuts // Global shortcuts
shortcuts.push("Tab: Switch Host".to_string()); shortcuts.push("Tab: Switch Host".to_string());
shortcuts.push("Shift+Tab: Switch Panel".to_string()); shortcuts.push("↑↓/jk: Select Service".to_string());
// Scroll shortcuts (always available)
shortcuts.push("↑↓: Scroll".to_string());
// Global rebuild shortcut (works on any panel)
shortcuts.push("R: Rebuild Host".to_string()); shortcuts.push("R: Rebuild Host".to_string());
shortcuts.push("S: Start Service".to_string());
// Panel-specific shortcuts shortcuts.push("Shift+S: Stop Service".to_string());
match self.focused_panel {
PanelType::Services => {
shortcuts.push("S: Start".to_string());
shortcuts.push("Shift+S: Stop".to_string());
}
PanelType::Backup => {
shortcuts.push("B: Trigger Backup".to_string());
}
_ => {}
}
// Always show quit // Always show quit
shortcuts.push("Q: Quit".to_string()); shortcuts.push("Q: Quit".to_string());
@ -757,11 +653,7 @@ impl TuiApp {
} }
fn render_system_panel(&mut self, frame: &mut Frame, area: Rect, _metric_store: &MetricStore) { fn render_system_panel(&mut self, frame: &mut Frame, area: Rect, _metric_store: &MetricStore) {
let system_block = if self.focused_panel == PanelType::System { let system_block = Components::widget_block("system");
Components::focused_widget_block("system")
} else {
Components::widget_block("system")
};
let inner_area = system_block.inner(area); let inner_area = system_block.inner(area);
frame.render_widget(system_block, area); frame.render_widget(system_block, area);
// Get current host widgets, create if none exist // Get current host widgets, create if none exist
@ -776,11 +668,7 @@ impl TuiApp {
} }
fn render_backup_panel(&mut self, frame: &mut Frame, area: Rect) { fn render_backup_panel(&mut self, frame: &mut Frame, area: Rect) {
let backup_block = if self.focused_panel == PanelType::Backup { let backup_block = Components::widget_block("backup");
Components::focused_widget_block("backup")
} else {
Components::widget_block("backup")
};
let inner_area = backup_block.inner(area); let inner_area = backup_block.inner(area);
frame.render_widget(backup_block, area); frame.render_widget(backup_block, area);

View File

@ -289,18 +289,6 @@ impl Components {
) )
} }
/// Widget block with focus indicator (blue border)
pub fn focused_widget_block(title: &str) -> Block<'_> {
Block::default()
.title(title)
.borders(Borders::ALL)
.style(Style::default().fg(Theme::highlight()).bg(Theme::background())) // Blue border for focus
.title_style(
Style::default()
.fg(Theme::highlight()) // Blue title for focus
.bg(Theme::background()),
)
}
} }
impl Typography { impl Typography {

View File

@ -443,11 +443,7 @@ impl ServicesWidget {
/// Render with focus, scroll, and pending transitions for visual feedback /// Render with focus, scroll, and pending transitions for visual feedback
pub fn render_with_transitions(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, pending_transitions: &HashMap<String, (CommandType, String, std::time::Instant)>) { pub fn render_with_transitions(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, pending_transitions: &HashMap<String, (CommandType, String, std::time::Instant)>) {
let services_block = if is_focused { let services_block = Components::widget_block("services");
Components::focused_widget_block("services")
} else {
Components::widget_block("services")
};
let inner_area = services_block.inner(area); let inner_area = services_block.inner(area);
frame.render_widget(services_block, area); frame.render_widget(services_block, area);

View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard-shared" name = "cm-dashboard-shared"
version = "0.1.32" version = "0.1.33"
edition = "2021" edition = "2021"
[dependencies] [dependencies]