Skip to content

fix(core): display bottom corner indicator of tui in progress section correctly #32985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(core): display bottom corner indicator of tui in progress section correctly #32985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions ...tive__tui__components__tasks_list__tests__more_in_progress_tasks_than_parallel_limit.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
source: packages/nx/src/native/tui/components/tasks_list.rs
expression: terminal.backend()
---
" "
" NX Running Test Tasks... Cache Duration"
" │ "
" │⠋ task1 ... <1ms"
" │⠋ task2 ... <1ms"
" │⠋ task3 ... <1ms"
">│⠋ task4 ... <1ms"
" └ "
" "
" "
" "
" "
" "
" "
" quit: q help: ?"
103 changes: 102 additions & 1 deletion packages/nx/src/native/tui/components/tasks_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,16 @@ impl TasksList {
if !self.has_active_tasks() {
return None;
}
Some(self.max_parallel)

// Count in-progress tasks
let in_progress_count = self
.tasks
.iter()
.filter(|t| matches!(t.status, TaskStatus::InProgress))
.count();

// The separator is placed after max(in_progress_count, max_parallel) tasks
Some(std::cmp::max(in_progress_count, self.max_parallel))
} else {
// When filtering, calculate filtered InProgress count once and use for both checks
let filtered_in_progress_count = self
Expand Down Expand Up @@ -2077,6 +2086,98 @@ mod tests {
insta::assert_snapshot!(terminal.backend());
}

#[test]
fn test_more_in_progress_tasks_than_parallel_limit() {
// Test case for bug: bottom corner └ is missing when there are more
// in-progress tasks than the parallel limit.
//
// Scenario: 4 tasks are InProgress, but parallel limit is 2
// Expected: Should show │ next to all 4 tasks, then └ separator
// Actual (bug): Shows │ next to all 4 tasks, but missing └ separator

let test_tasks = vec![
Task {
id: "task1".to_string(),
target: TaskTarget {
project: "app1".to_string(),
target: "test".to_string(),
configuration: None,
},
outputs: vec![],
project_root: Some("".to_string()),
continuous: Some(false),
start_time: None,
end_time: None,
},
Task {
id: "task2".to_string(),
target: TaskTarget {
project: "app2".to_string(),
target: "build".to_string(),
configuration: None,
},
outputs: vec![],
project_root: Some("".to_string()),
continuous: Some(false),
start_time: None,
end_time: None,
},
Task {
id: "task3".to_string(),
target: TaskTarget {
project: "app3".to_string(),
target: "lint".to_string(),
configuration: None,
},
outputs: vec![],
project_root: Some("".to_string()),
continuous: Some(false),
start_time: None,
end_time: None,
},
Task {
id: "task4".to_string(),
target: TaskTarget {
project: "app4".to_string(),
target: "deploy".to_string(),
configuration: None,
},
outputs: vec![],
project_root: Some("".to_string()),
continuous: Some(false),
start_time: None,
end_time: None,
},
];

let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10)));
let mut tasks_list = TasksList::new(
test_tasks.clone(),
HashSet::new(),
RunMode::RunMany,
Focus::TaskList,
"Test Tasks".to_string(),
selection_manager,
);

let mut terminal = create_test_terminal(80, 15);

// Set parallel limit to 2 (less than the 4 tasks we'll start)
tasks_list.update(Action::StartCommand(Some(2))).unwrap();

// Start all 4 tasks - this exceeds the parallel limit
for task in &test_tasks {
tasks_list
.update(Action::StartTasks(vec![task.clone()]))
.ok();
}

render_to_test_backend(&mut terminal, &mut tasks_list);

// This snapshot will show the bug: bottom corner └ is missing after the 4 in-progress tasks
insta::assert_snapshot!(terminal.backend());
}

#[test]
fn test_completed_tasks_with_different_durations() {
let (mut tasks_list, test_tasks) = create_test_tasks_list();
Expand Down
Loading