Display selected host with brackets in title bar

- Change nftables port labels to lowercase 'wan tcp:' and 'wan udp:' - Add brackets around selected host in title bar for clarity
Remove timeout wrapper from nft command
2025-12-04 18:47:30 +01:00 · 2025-12-04 16:10:25 +01:00 · 2025-12-04 16:02:14 +01:00
6 changed files with 25 additions and 11 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"

 [[package]]
 name = "cm-dashboard"
-version = "0.1.253"
+version = "0.1.256"
 dependencies = [
 "anyhow",
 "chrono",
@@ -301,7 +301,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.253"
+version = "0.1.256"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -325,7 +325,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.253"
+version = "0.1.256"
 dependencies = [
 "chrono",
 "serde",
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.254"
+version = "0.1.257"
 edition = "2021"

 [dependencies]
--- a/agent/src/collectors/systemd.rs
+++ b/agent/src/collectors/systemd.rs
@@ -186,7 +186,7 @@ impl SystemdCollector {
                        if !tcp_ports.is_empty() {
                            let metrics = Vec::new();
                            sub_services.push(SubServiceData {
-                                name: format!("TCP: {}", tcp_ports),
+                                name: format!("wan tcp: {}", tcp_ports),
                                service_status: Status::Info,
                                metrics,
                                service_type: "firewall_port".to_string(),
@@ -196,7 +196,7 @@ impl SystemdCollector {
                        if !udp_ports.is_empty() {
                            let metrics = Vec::new();
                            sub_services.push(SubServiceData {
-                                name: format!("UDP: {}", udp_ports),
+                                name: format!("wan udp: {}", udp_ports),
                                service_status: Status::Info,
                                metrics,
                                service_type: "firewall_port".to_string(),
@@ -914,8 +914,8 @@ impl SystemdCollector {
    /// Get nftables open ports grouped by protocol
    /// Returns: (tcp_ports_string, udp_ports_string)
    fn get_nftables_open_ports(&self) -> (String, String) {
-        let output = Command::new("timeout")
-            .args(&["3", "sudo", "nft", "list", "ruleset"])
+        let output = Command::new("sudo")
+            .args(&["/run/current-system/sw/bin/nft", "list", "ruleset"])
            .output();

        let output = match output {
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.254"
+version = "0.1.257"
 edition = "2021"

 [dependencies]
--- a/dashboard/src/ui/mod.rs
+++ b/dashboard/src/ui/mod.rs
@@ -556,7 +556,14 @@ impl TuiApp {
            ));

            if Some(host) == self.current_host.as_ref() {
-                // Selected host in bold background color against status background
+                // Selected host with brackets in bold background color against status background
+                host_spans.push(Span::styled(
+                    "[",
+                    Style::default()
+                        .fg(Theme::background())
+                        .bg(background_color)
+                        .add_modifier(Modifier::BOLD),
+                ));
                host_spans.push(Span::styled(
                    host.clone(),
                    Style::default()
@@ -564,6 +571,13 @@ impl TuiApp {
                        .bg(background_color)
                        .add_modifier(Modifier::BOLD),
                ));
+                host_spans.push(Span::styled(
+                    "]",
+                    Style::default()
+                        .fg(Theme::background())
+                        .bg(background_color)
+                        .add_modifier(Modifier::BOLD),
+                ));
            } else {
                // Other hosts in normal background color against status background
                host_spans.push(Span::styled(
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.254"
+version = "0.1.257"
 edition = "2021"

 [dependencies]