Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/*.log
/*.gif
/AGENTS.md
/**/.DS_Store
108 changes: 96 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ vergen-gix = { version = "9.1.0", features = ["build", "cargo"] }

[dev-dependencies]
criterion = { version = "0.5.1", features = ["html_reports"] }
fake = "4.4.0"
insta = "1.40"

[[bench]]
name = "ui_hotspots"
Expand Down
2 changes: 1 addition & 1 deletion src/ui/components/issue_detail.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pub struct PrSummary {
}

pub struct IssuePreview {
current: Option<IssuePreviewSeed>,
pub current: Option<IssuePreviewSeed>,
action_tx: Option<tokio::sync::mpsc::Sender<Action>>,
area: Rect,
}
Expand Down
1 change: 1 addition & 0 deletions src/ui/components/label_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1262,3 +1262,4 @@ impl HasFocus for LabelList {
self.state.focus()
}
}

4 changes: 2 additions & 2 deletions src/ui/components/search_bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ pub const HELP: &[HelpElementKind] = &[
];

pub struct TextSearch {
search_state: rat_widget::text_input::TextInputState,
label_state: rat_widget::text_input::TextInputState,
pub search_state: rat_widget::text_input::TextInputState,
pub label_state: rat_widget::text_input::TextInputState,
cstate: ChoiceState,
state: State,
action_tx: Option<tokio::sync::mpsc::Sender<Action>>,
Expand Down
4 changes: 2 additions & 2 deletions src/ui/components/status_bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ use ratatui::widgets::Widget;
use ratatui_macros::{line, span};
use std::sync::atomic::Ordering;

use crate::ui::components::DumbComponent;
use crate::ui::components::issue_list::LOADED_ISSUE_COUNT;
use crate::ui::{AppState, layout::Layout};
use crate::ui::components::DumbComponent;
use crate::ui::{layout::Layout, AppState};

pub struct StatusBar {
repo_label: String,
Expand Down
75 changes: 30 additions & 45 deletions src/ui/issue_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,11 @@ impl TrieStringInterner {

#[cfg(test)]
mod tests {
use super::{AuthorId, TrieStringInterner, UiAuthor, UiIssue, UiIssuePool};
use super::TrieStringInterner;
use octocrab::models::IssueState;

use crate::ui::testing::{DummyDataConfig, dummy_ui_data_with};

#[test]
fn trie_interner_reuses_existing_string_ids() {
let mut interner = TrieStringInterner::default();
Expand All @@ -198,54 +200,25 @@ mod tests {
assert_eq!(interner.resolve(long), "opened");
}

fn ensure_author(pool: &mut UiIssuePool) -> AuthorId {
if let Some(existing) = pool.author_by_github_id.get(&1).copied() {
return existing;
}
let login = pool.intern_str("octo");
let key = pool.authors.insert(UiAuthor {
github_id: 1,
login,
});
pool.author_by_github_id.insert(1, key);
key
}

fn make_issue(pool: &mut UiIssuePool, number: u64, title: &str, state: IssueState) -> UiIssue {
let author = ensure_author(pool);
let created_at_short = pool.intern_str("2024-01-01 00:00");
let created_at_full = pool.intern_str("2024-01-01 00:00:00");
let updated_at_short = pool.intern_str("2024-01-01 00:00");
UiIssue {
number,
state,
title: pool.intern_str(title),
body: Some(pool.intern_str("body")),
author,
created_ts: 0,
created_at_short,
created_at_full,
updated_at_short,
comments: 0,
assignees: Vec::new(),
milestone: None,
is_pull_request: false,
pull_request_url: None,
labels: Vec::new(),
}
}

#[test]
fn upsert_issue_reuses_existing_id() {
let mut pool = UiIssuePool::default();
let first = make_issue(&mut pool, 42, "open issue", IssueState::Open);
let first_id = pool.upsert_issue(first);
let second = make_issue(&mut pool, 42, "closed issue", IssueState::Closed);
let second_id = pool.upsert_issue(second);
let mut data = dummy_ui_data_with(DummyDataConfig {
issue_count: 1,
author_count: 2,
comments_per_issue: 0,
timeline_events_per_issue: 0,
seed: 7,
});
let first_id = data.issue_ids[0];
let mut second = data.pool.get_issue(first_id).clone();
second.state = IssueState::Closed;
second.title = data.pool.intern_str("closed issue");
let second_id = data.pool.upsert_issue(second);

assert_eq!(first_id, second_id);
let stored = pool.get_issue(second_id);
let stored = data.pool.get_issue(second_id);
assert_eq!(stored.state, IssueState::Closed);
assert_eq!(pool.resolve_str(stored.title), "closed issue");
assert_eq!(data.pool.resolve_str(stored.title), "closed issue");
}
}

Expand Down Expand Up @@ -303,6 +276,18 @@ impl UiIssuePool {
self.resolve_str(author.login)
}

#[cfg(test)]
pub(crate) fn intern_test_author(&mut self, github_id: u64, login: &str) -> AuthorId {
if let Some(existing) = self.author_by_github_id.get(&github_id).copied() {
return existing;
}

let login = self.intern_str(login);
let key = self.authors.insert(UiAuthor { github_id, login });
self.author_by_github_id.insert(github_id, key);
key
}

pub fn insert_issue(&mut self, issue: UiIssue) -> IssueId {
self.upsert_issue(issue)
}
Expand Down
Loading