From 94a04a00feb64a1b1fe0b7aa596b42b937c67aeb Mon Sep 17 00:00:00 2001 From: Yann Prono Date: Sat, 25 Jan 2025 17:19:40 +0100 Subject: [PATCH] fix: fix the table state in `topicDetailsComponent`, adjust delay for checkpoint while consuming records --- Cargo.lock | 4 ++-- crates/command/src/headless/mod.rs | 2 +- crates/tui/src/component/footer_component.rs | 5 +++++ crates/tui/src/component/record_details_component.rs | 2 +- crates/tui/src/component/topic_details_component.rs | 2 +- crates/tui/src/component/ui.rs | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 516686d..6370b52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -605,9 +605,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] diff --git a/crates/command/src/headless/mod.rs b/crates/command/src/headless/mod.rs index bc5f502..d31d637 100644 --- a/crates/command/src/headless/mod.rs +++ b/crates/command/src/headless/mod.rs @@ -100,7 +100,7 @@ impl Headless { let timestamp = message.timestamp().to_millis().unwrap_or_default(); tx_dd.send(message).unwrap(); - if current_time.elapsed() > Duration::from_secs(10) { + if current_time.elapsed() > Duration::from_secs(15) { current_time = Instant::now(); info!("Checkpoint: {}", timestamp); } diff --git a/crates/tui/src/component/footer_component.rs b/crates/tui/src/component/footer_component.rs index cc7eedc..fca5f0a 100644 --- a/crates/tui/src/component/footer_component.rs +++ b/crates/tui/src/component/footer_component.rs @@ -118,7 +118,10 @@ impl Component for FooterComponent { false => (state.theme.bg_disabled, state.theme.fg_disabled), }; if v.0 > 0 { + #[cfg(not(debug_assertions))] help.push("—".fg(colors.0)); + #[cfg(debug_assertions)] + help.push("".to_string().bg(colors.0).fg(state.theme.bg)); } let prefix = match v.0 { 0 if self.main_component == ComponentName::TopicsAndRecords => "◧ ", @@ -132,6 +135,8 @@ impl Component for FooterComponent { .fg(colors.1) .bold(), ); + #[cfg(debug_assertions)] + help.push("".fg(colors.0)); } help.push(Span::from(" ")); diff --git a/crates/tui/src/component/record_details_component.rs b/crates/tui/src/component/record_details_component.rs index 3d270cb..c112967 100644 --- a/crates/tui/src/component/record_details_component.rs +++ b/crates/tui/src/component/record_details_component.rs @@ -263,7 +263,7 @@ impl Component for RecordDetailsComponent<'_> { fn shortcuts(&self) -> Vec { let mut shortcuts = vec![ Shortcut::new("J/K", "Scroll"), - Shortcut::new("↑↓", "Previous/next record"), + Shortcut::new("↑↓", "Prev/next record"), ]; if self diff --git a/crates/tui/src/component/topic_details_component.rs b/crates/tui/src/component/topic_details_component.rs index 772eddd..9104855 100644 --- a/crates/tui/src/component/topic_details_component.rs +++ b/crates/tui/src/component/topic_details_component.rs @@ -294,7 +294,7 @@ impl Component for TopicDetailsComponent { width: table_area.width, height: table_area.height.saturating_sub(5), }, - &mut self.state.clone(), //.with_offset((self.scroll.value() + table_area.y + 10).into()), + &mut self.state, ); f.render_widget( diff --git a/crates/tui/src/component/ui.rs b/crates/tui/src/component/ui.rs index 98f80ad..b26c21c 100644 --- a/crates/tui/src/component/ui.rs +++ b/crates/tui/src/component/ui.rs @@ -188,7 +188,7 @@ impl Ui { let message = message.detach(); let timestamp = message.timestamp().to_millis().unwrap_or_default(); tx_dd.send(message).unwrap(); - if current_time.elapsed() > Duration::from_secs(10) { + if current_time.elapsed() > Duration::from_secs(13) { current_time = Instant::now(); tx.send(Action::Notification(Notification::new(