summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2019-10-16 18:55:14 +0200
committerAram Drevekenin <aram@poor.dev>2019-10-16 18:55:14 +0200
commite73a7777f81fb06805ed62b18671f949bdb1ac74 (patch)
tree3080c05b5ede299f7788dad1a8a9a09dfbb8124f
parent5bf79ce29b8be65d06a1ebf63aedfab8478ba07a (diff)
feat(ui): change table order
-rw-r--r--src/display/ui.rs2
-rw-r--r--src/tests/snapshots/tests__basic_startup.snap4
-rw-r--r--src/tests/snapshots/tests__bi_directional_traffic-2.snap2
-rw-r--r--src/tests/snapshots/tests__bi_directional_traffic.snap4
-rw-r--r--src/tests/snapshots/tests__layout_full_width_under_30_height-2.snap8
-rw-r--r--src/tests/snapshots/tests__layout_full_width_under_30_height.snap4
-rw-r--r--src/tests/snapshots/tests__layout_under_120_width_full_height-2.snap16
-rw-r--r--src/tests/snapshots/tests__layout_under_120_width_full_height.snap8
-rw-r--r--src/tests/snapshots/tests__layout_under_120_width_under_30_height-2.snap8
-rw-r--r--src/tests/snapshots/tests__layout_under_120_width_under_30_height.snap4
-rw-r--r--src/tests/snapshots/tests__layout_under_150_width_full_height-2.snap16
-rw-r--r--src/tests/snapshots/tests__layout_under_150_width_full_height.snap8
-rw-r--r--src/tests/snapshots/tests__layout_under_150_width_under_30_height-2.snap8
-rw-r--r--src/tests/snapshots/tests__layout_under_150_width_under_30_height.snap4
-rw-r--r--src/tests/snapshots/tests__multiple_connections_from_remote_ip-2.snap4
-rw-r--r--src/tests/snapshots/tests__multiple_connections_from_remote_ip.snap4
-rw-r--r--src/tests/snapshots/tests__multiple_packets_of_traffic_from_different_connections-2.snap4
-rw-r--r--src/tests/snapshots/tests__multiple_packets_of_traffic_from_different_connections.snap4
-rw-r--r--src/tests/snapshots/tests__multiple_packets_of_traffic_from_single_connection-2.snap2
-rw-r--r--src/tests/snapshots/tests__multiple_packets_of_traffic_from_single_connection.snap4
-rw-r--r--src/tests/snapshots/tests__multiple_processes_with_multiple_connections-2.snap8
-rw-r--r--src/tests/snapshots/tests__multiple_processes_with_multiple_connections.snap4
-rw-r--r--src/tests/snapshots/tests__one_packet_of_traffic-2.snap2
-rw-r--r--src/tests/snapshots/tests__one_packet_of_traffic.snap4
-rw-r--r--src/tests/snapshots/tests__one_process_with_multiple_connections-2.snap4
-rw-r--r--src/tests/snapshots/tests__one_process_with_multiple_connections.snap4
-rw-r--r--src/tests/snapshots/tests__sustained_traffic_from_multiple_processes.snap4
-rw-r--r--src/tests/snapshots/tests__sustained_traffic_from_multiple_processes_bi_directional-2.snap4
-rw-r--r--src/tests/snapshots/tests__sustained_traffic_from_multiple_processes_bi_directional.snap4
-rw-r--r--src/tests/snapshots/tests__sustained_traffic_from_one_process.snap2
-rw-r--r--src/tests/snapshots/tests__traffic_with_host_names-2.snap4
-rw-r--r--src/tests/snapshots/tests__traffic_with_host_names.snap4
-rw-r--r--src/tests/snapshots/tests__traffic_with_winch_event-3.snap2
-rw-r--r--src/tests/snapshots/tests__traffic_with_winch_event.snap4
34 files changed, 86 insertions, 86 deletions
diff --git a/src/display/ui.rs b/src/display/ui.rs
index b263582..df99311 100644
--- a/src/display/ui.rs
+++ b/src/display/ui.rs
@@ -44,7 +44,7 @@ where
let total_bandwidth = TotalBandwidth { state: &state };
let layout = Layout {
header: total_bandwidth,
- children: vec![connections, processes, remote_ips],
+ children: vec![processes, connections, remote_ips],
};
layout.render(&mut frame, size);
})
diff --git a/src/tests/snapshots/tests__basic_startup.snap b/src/tests/snapshots/tests__basic_startup.snap
index f6a6bed..34628ac 100644
--- a/src/tests/snapshots/tests__basic_startup.snap
+++ b/src/tests/snapshots/tests__basic_startup.snap
@@ -3,8 +3,8 @@ source: src/tests/mod.rs
expression: "&terminal_draw_events_mirror[0]"
---
Total Rate Up/Down: 0Bps/0Bps
-┌Utilization by connection────────────────────────────────────────────────────────────────────┐┌Utilization by process name──────────────────────────────────────────────────────────────────┐
-│Connection Process Rate Up/Down ││Process Connection count Rate Up/Down │
+┌Utilization by process name──────────────────────────────────────────────────────────────────┐┌Utilization by connection────────────────────────────────────────────────────────────────────┐
+│Process Connection count Rate Up/Down ││Connection Process Rate Up/Down │
│ ││ │
│ ││ │
│ ││ │
diff --git a/src/tests/snapshots/tests__bi_directional_traffic-2.snap b/src/tests/snapshots/tests__bi_directional_traffic-2.snap
index aa5df7d..3b69f51 100644
--- a/src/tests/snapshots/tests__bi_directional_traffic-2.snap
+++ b/src/tests/snapshots/tests__bi_directional_traffic-2.snap
@@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]"
- :443 => 1.1.1.1:12345 (tcp) 1 29Bps/31Bps 1 1 29Bps/31Bps
+ 1 1 29Bps/31Bps :443 => 1.1.1.1:12345 (tcp) 1 29Bps/31Bps
diff --git a/src/tests/snapshots/tests__bi_directional_traffic.snap b/src/tests/snapshots/tests__bi_directional_traffic.snap
index f6a6bed..34628ac 100644
--- a/src/tests/snapshots/tests__bi_directional_traffic.snap
+++ b/src/tests/snapshots/tests__bi_directional_traffic.snap
@@ -3,8 +3,8 @@ source: src/tests/mod.rs
expression: "&terminal_draw_events_mirror[0]"
---
Total Rate Up/Down: 0Bps/0Bps
-┌Utilization by connection────────────────────────────────────────────────────────────────────┐┌Utilization by process name──────────────────────────────────────────────────────────────────┐
-│Connection Process Rate Up/Down ││Process Connection count Rate Up/Down │
+┌Utilization by process name──────────────────────────────────────────────────────────────────┐┌Utilization by connection────────────────────────────────────────────────────────────────────┐
+│Process Connection count Rate Up/Down ││Connection Process Rate Up/Down │
│ ││ │
│ ││ │
│ ││ │
diff --git a/src/tests/snapshots/tests__layout_full_width_under_30_height-2.snap b/src/tests/snapshots/tests__layout_full_width_under_30_height-2.snap
index 8d1822a..bd3e843 100644
--- a/src/tests/snapshots/tests__layout_full_width_under_30_height-2.snap
+++ b/src/tests/snapshots/tests__layout_full_width_under_30_height-2.snap
@@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]"
- :443 => 2.2.2.2:54321 (tcp) 4 0Bps/33Bps 4 1 0Bps/33Bps
- :443 => 3.3.3.3:1337 (tcp) 5 0Bps/25Bps 5 1 0Bps/25Bps
- :443 => 1.1.1.1:12345 (tcp) 1 0Bps/24Bps 1 1 0Bps/24Bps
- :443 => 4.4.4.4:1337 (tcp) 2 0Bps/22Bps 2 1 0Bps/22Bps
+ 4 1 0Bps/33Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps/33Bps
+ 5 1 0Bps/25Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/25Bps
+ 1 1 0Bps/24Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/24Bps
+ 2 1 0Bps/22Bps :443 => 4.4.4.4:1337 (tcp) 2 0Bps/22Bps
diff --git a/src/tests/snapshots/tests__layout_full_width_under_30_height.snap b/src/tests/snapshots/tests__layout_full_width_under_30_height.snap
index bc69fdd..0b734e4 100644
--- a/src/tests/snapshots/tests__layout_full_width_under_30_height.snap
+++ b/src/tests/snapshots/tests__layout_full_width_under_30_height.snap
@@ -3,8 +3,8 @@ source: src/tests/mod.rs
expression: "&terminal_draw_events_mirror[0]"
---
Total Rate Up/Down: 0Bps/0Bps
-┌Utilization by connection────────────────────────────────────────────────────────────────────┐┌Utilization by process name──────────────────────────────────────────────────────────────────┐
-│Connection Process Rate Up/Down ││Process Connection count Rate Up/Down │
+┌Utilization by process name──────────────────────────────────────────────────────────────────┐┌Utilization by connection────────────────────────────────────────────────────────────────────┐
+│Process Connection count Rate Up/Down ││Connection Process Rate Up/Down │
│ ││ │
│ ││ │
│ ││ │
diff --git a/src/tests/snapshots/tests__layout_under_120_width_full_height-2.snap b/src/tests/snapshots/tests__layout_under_120_width_full_height-2.snap
index 49a5f0c..32c4178 100644
--- a/src/tests/snapshots/tests__layout_under_120_width_full_height-2.snap
+++ b/src/tests/snapshots/tests__layout_under_120_width_full_height-2.snap
@@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]"
- :443 => 2.2.2.2:54321 (tcp) 4 0Bps/33Bps
- :443 => 3.3.3.3:1337 (tcp) 5 0Bps/25Bps
- :443 => 1.1.1.1:12345 (tcp) 1 0Bps/24Bps
- :443 => 4.4.4.4:1337 (tcp) 2 0Bps/22Bps
+ 4 1 0Bps/33Bps
+ 5 1 0Bps/25Bps
+ 1 1 0Bps/24Bps
+ 2 1 0Bps/22Bps
@@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]"
- 4 1 0Bps/33Bps
- 5 1 0Bps/25Bps
- 1 1 0Bps/24Bps
- 2 1 0Bps/22Bps
+ :443 => 2.2.2.2:54321 (tcp) 4 0Bps/33Bps
+ :443 => 3.3.3.3:1337 (tcp) 5 0Bps/25Bps
+ :443 => 1.1.1.1:12345 (tcp) 1 0Bps/24Bps
+ :443 => 4.4.4.4:1337 (tcp) 2 0Bps/22Bps
diff --git a/src/tests/snapshots/tests__layout_under_120_width_full_height.snap b/src/tests/snapshots/tests__layout_under_120_width_full_height.snap
index 0de82cd..abea388 100644
--- a/src/tests/snapshots/tests__layout_under_120_width_full_height.snap
+++ b/src/tests/snapshots/tests__layout_under_120_width_full_height.snap
@@ -3,8 +3,8 @@ source: src/tests/mod.rs
expression: "&terminal_draw_events_mirror[0]"
---
Total Rate Up/Down: 0Bps/0Bps
-┌Utilization by connection────────────────────────────────────────────────────────────────────────────────────────────┐
-│Connection Process Rate Up/Down │
+┌Utilization by process name──────────────────────────────────────────────────────────────────────────────────────────┐
+│Process Connection count Rate Up/Down │
│ │
│ │
│ │
@@ -27,8 +27,8 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
│ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-┌Utilization by process name──────────────────────────────────────────────────────────────────────────────────────────┐
-│Process Connection count Rate Up/Down │
+┌Utilization by connection────────────────────────────────────────────────────────────────────────────────────────────┐
+│Connection Process Rate Up/Down │
│ │
│ │
│ │
diff --git a/src/tests/snapshots/tests__layout_under_120_width_under_30_height-2.snap b/src/tests/snapshots/tests__layout_under_120_width_under_30_height-2.snap
index f9f4775..ad389d1 100644
--- a/src/tests/snapshots/tests__layout_under_120_width_under_30_height-2.snap
+++ b/src/tests/snapshots/tests__layout_under_120_width_under_30_height-2.snap
@@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]"
- :443 => 2.2.2.2:54321 (tcp) 4 0Bps/33Bps
- :443 => 3.3.3.3:1337 (tcp) 5 0Bps/25Bps
- :443 => 1.1.1.1:12345 (tcp) 1 0Bps/24Bps
- :443 => 4.4.4.4:1337 (tcp) 2 0Bps/22Bps
+ 4 1 0Bps/33Bps
+ 5 1 0Bps/25Bps
+ 1 1 0Bps/24Bps
+ 2 1 0Bps/22Bps
diff --git a/src/tests/snapshots/tests__layout_under_120_width_under_30_height.snap b/src/tests/snapshots/tests__layout_under_120_width_under_30_height.snap
index c550ce4..5045dc8 100644
--- a/src/tests/snapshots/tests__layout_under_120_width_under_30_height.snap
+++ b/src/tests/snapshots/tests__layout_under_120_width_under_30_height.snap
@@ -3,8 +3,8 @@ source: src/tests/mod.rs
expression: "&terminal_draw_events_mirror[0]"
---
Total Rate Up/Down: 0Bps/0Bps
-┌Utilization by connection────────────────────────────────────────────────────────────────────────────────────────────┐
-│Connection Process Rate Up/Down │
+┌Utilization by process name──────────────────────────────────────────────────────────────────────────────────────────┐
+│Process Connection count Rate Up/Down │
│ │
│ │
│ │
diff --git a/src/tests/snapshots/tests__layout_under_150_width_full_height-2.snap b/src/tests/snapshots/tests__layout_under_150_width_full_height-2.snap
index 77b428e..1a07c03 100644
--- a/src/tests/snapshots/tests__layout_under_150_width_full_height-2.snap
+++ b/src/tests/snapshots/tests__layout_under_150_width_full_height-2.snap
@@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]"
- :443 => 2.2.2.2:54321 (tcp) 4 0Bps/33Bps
- :443 => 3.3.3.3:1337 (tcp) 5 0Bps/25Bps
- :443 => 1.1.1.1:12345 (tcp) 1 0Bps/24Bps
- :443 => 4.4.4.4:1337 (tcp) 2 0Bps/22Bps
+ 4 1 0Bps/33Bps
+ 5 1 0Bps/25Bps
+ 1 1 0Bps/24Bps
+ 2 1 0Bps/22Bps
@@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]"
- 4 0Bps/33Bps 2.2.2.2 0Bps/33Bps
- 5 0Bps/25Bps 3.3.3.3 0Bps/25Bps
- 1 0Bps/24Bps 1.1.1.1 0Bps/24Bps
- 2 0Bps/22Bps 4.4.4.4 0Bps/22Bps
+ :443 => 2.2.2.2:54321 (tcp) 0Bps/33Bps 2.2.2.2 0Bps/33Bps
+ :443 => 3.3.3.3:1337 (tcp) 0Bps/25Bps 3.3.3.3 0Bps/25Bps
+ :443 => 1.1.1.1:12345 (tcp) 0Bps/24Bps 1.1.1.1 0Bps/24Bps
+ :443 => 4.4.4.4:1337 (tcp) 0Bps/22Bps 4.4.4.4 0Bps/22Bps
diff --git a/src/tests/snapshots/tests__layout_under_150_width_full_height.snap b/src/tests/snapshots/tests__layout_under_150_width_full_height.snap
index ec22278..2978766 100644
--- a/src/tests/snapshots/tests__layout_under_150_width_full_height.snap
+++ b/src/tests/snapshots/tests__layout_under_150_width_full_height.snap
@@ -3,8 +3,8 @@ source: src/tests/mod.rs
expression: "&terminal_draw_events_mirror[0]"
---
Total Rate Up/Down: 0Bps/0Bps
-┌Utilization by connection──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│Connection Process Rate Up/Down │
+┌Utilization by process name────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│Process Connection count Rate Up/Down │
│ │
│ │
│ │
@@ -27,8 +27,8 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
│ │
└───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-┌Utilization by process name─────────────────────────────────────────────┐┌Utilization by remote ip─────────────────────────────────────────────────┐
-│Process Rate Up/Down ││Remote Address Rate Up/Down │
+┌Utilization by connection───────────────────────────────────────────────┐┌Utilization by remote ip─────────────────────────────────────────────────┐
+│Connection Rate Up/Down ││Remote Address Rate Up/Down │
│ ││ │
│ ││ │
│ ││ │
diff --git a/src/tests/snapshots/tests__layout_under_150_width_under_30_height-2.snap b/src/tests/snapshots/tests__layout_under_150_width_under_30_height-2.snap
index 9111757..8060d3b 100644
--- a/