Bump version to 0.1.53

Fix string syntax error in rebuild command
- Replace raw string with escaped string to fix compilation error - Maintain same functionality with proper string formatting
2025-10-30 17:00:39 +01:00 · 2025-10-30 16:59:41 +01:00 · 2025-10-30 15:30:58 +01:00 · 2025-10-30 13:26:04 +01:00
5 changed files with 24 additions and 36 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -270,7 +270,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"

 [[package]]
 name = "cm-dashboard"
-version = "0.1.49"
+version = "0.1.52"
 dependencies = [
 "anyhow",
 "chrono",
@@ -291,7 +291,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.49"
+version = "0.1.52"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -314,7 +314,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.49"
+version = "0.1.52"
 dependencies = [
 "chrono",
 "serde",
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.50"
+version = "0.1.53"
 edition = "2021"

 [dependencies]
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.50"
+version = "0.1.53"
 edition = "2021"

 [dependencies]
--- a/dashboard/src/ui/mod.rs
+++ b/dashboard/src/ui/mod.rs
@@ -244,14 +244,9 @@ impl TuiApp {
                KeyCode::Char('r') => {
                    // System rebuild command - works on any panel for current host
                    if let Some(hostname) = self.current_host.clone() {
-                        // Create command that shows CM Dashboard logo and then rebuilds
+                        // Create command that shows logo, rebuilds, and waits for user input
                        let logo_and_rebuild = format!(
-                            r"cat << 'EOF'
-NixOS System Rebuild
-Target: {}
-
-EOF
-ssh -tt {}@{} 'bash -ic {}'",
+                            "bash -c 'cat << \"EOF\"\nNixOS System Rebuild\nTarget: {}\n\nEOF\nssh -tt {}@{} \"bash -ic {}\"\necho\necho \"========================================\"\necho \"Rebuild completed. Press any key to close...\"\necho \"========================================\"\nread -n 1 -s\nexit'",
                            hostname,
                            self.config.ssh.rebuild_user,
                            hostname,
@@ -259,11 +254,10 @@ ssh -tt {}@{} 'bash -ic {}'",
                        );
                        
                        std::process::Command::new("tmux")
-                            .arg("display-popup")
-                            .arg("-w")
-                            .arg("80%")
-                            .arg("-h") 
-                            .arg("80%")
+                            .arg("split-window")
+                            .arg("-v")
+                            .arg("-p")
+                            .arg("30")
                            .arg(&logo_and_rebuild)
                            .spawn()
                            .ok(); // Ignore errors, tmux will handle them
@@ -286,49 +280,43 @@ ssh -tt {}@{} 'bash -ic {}'",
                    }
                }
                KeyCode::Char('J') => {
-                    // Show service logs via journalctl in tmux popup
+                    // Show service logs via journalctl in tmux split window
                    if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
                        let journalctl_command = format!(
-                            "ssh -tt {}@{} 'journalctl -u {}.service -f --no-pager -n 50'",
+                            "bash -c \"ssh -tt {}@{} 'sudo journalctl -u {}.service -f --no-pager -n 50'; exit\"",
                            self.config.ssh.rebuild_user,
                            hostname,
                            service_name
                        );
                        
                        std::process::Command::new("tmux")
-                            .arg("display-popup")
-                            .arg("-w")
-                            .arg("80%")
-                            .arg("-h") 
-                            .arg("80%")
-                            .arg("-T")
-                            .arg(format!("Logs: {}", service_name))
+                            .arg("split-window")
+                            .arg("-v")
+                            .arg("-p")
+                            .arg("30")
                            .arg(&journalctl_command)
                            .spawn()
                            .ok(); // Ignore errors, tmux will handle them
                    }
                }
                KeyCode::Char('L') => {
-                    // Show custom service log file in tmux popup
+                    // Show custom service log file in tmux split window
                    if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
                        // Check if this service has a custom log file configured
                        if let Some(host_logs) = self.config.service_logs.get(&hostname) {
                            if let Some(log_config) = host_logs.iter().find(|config| config.service_name == service_name) {
                                let tail_command = format!(
-                                    "ssh -tt {}@{} 'tail -f {}'",
+                                    "bash -c \"ssh -tt {}@{} 'sudo tail -n 50 -f {}'; exit\"",
                                    self.config.ssh.rebuild_user,
                                    hostname,
                                    log_config.log_file_path
                                );
                                
                                std::process::Command::new("tmux")
-                                    .arg("display-popup")
-                                    .arg("-w")
-                                    .arg("80%")
-                                    .arg("-h") 
-                                    .arg("80%")
-                                    .arg("-T")
-                                    .arg(format!("Custom Log: {}", service_name))
+                                    .arg("split-window")
+                                    .arg("-v")
+                                    .arg("-p")
+                                    .arg("30")
                                    .arg(&tail_command)
                                    .spawn()
                                    .ok(); // Ignore errors, tmux will handle them
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.50"
+version = "0.1.53"
 edition = "2021"

 [dependencies]
Author	SHA1	Message	Date
Christoffer Martinsson	57de4c366a	Bump version to 0.1.53 All checks were successful Build and Release / build-and-release (push) Successful in 2m10s Details	2025-10-30 17:00:39 +01:00
Christoffer Martinsson	e18778e962	Fix string syntax error in rebuild command - Replace raw string with escaped string to fix compilation error - Maintain same functionality with proper string formatting	2025-10-30 16:59:41 +01:00
Christoffer Martinsson	e4469a0ebf	Replace tmux popups with split windows for better log navigation Some checks failed Build and Release / build-and-release (push) Failing after 1m9s Details - Change J/L log commands from popups to split windows for scrolling support - Change rebuild command from popup to split window with consistent 30% height - Add auto-close behavior with bash -c "command; exit" wrapper for logs - Add "press any key to close" prompt with visual separators for rebuild - Enable proper tmux copy mode and navigation in all split windows Users can now scroll through logs, copy text, and resize windows while maintaining clean auto-close behavior for all operations.	2025-10-30 15:30:58 +01:00
Christoffer Martinsson	6fedf4c7fc	Add sudo support and line count to log viewing commands All checks were successful Build and Release / build-and-release (push) Successful in 1m12s Details - Add sudo to journalctl command for proper systemd log access - Add sudo to tail command for system log file access - Add -n 50 to tail command to match journalctl behavior - Both J and L keys now show last 50 lines before following Ensures consistent behavior and proper permissions for all log viewing.	2025-10-30 13:26:04 +01:00