feat(ui): route detail-pane review actions through OperationStatus
Approve, Submit, Reject, and Park each get their own OperationStatus so the button locks and shows an OperationIndicator for the duration of the call; Approve additionally scopes a MergeProgressEvent subscription to its own task id to sharpen the label from "merging" to "verifying" mid-flight. MergeSectionViewModel's preview refresh gets the same treatment for display only, since it has no command button to gate.
This commit is contained in:
Mika Kuns
@@ -147,7 +147,7 @@ public class DetailsIslandReviewActionsTests : IDisposable
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ApproveReview_WhenWorkerThrows_CallsShowErrorAsync()
|
||||
public async Task ApproveReview_WhenWorkerThrows_CallsShowErrorAsync_AndResetsIsRunning()
|
||||
{
|
||||
var worker = new ThrowingWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
@@ -160,6 +160,189 @@ public class DetailsIslandReviewActionsTests : IDisposable
|
||||
await vm.ApproveReviewCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.Equal(worker.ExceptionMessage, reportedError);
|
||||
Assert.False(vm.ApproveOp.IsRunning);
|
||||
Assert.True(vm.ApproveReviewCommand.CanExecute(null));
|
||||
}
|
||||
|
||||
private sealed class BlockingApproveWorkerClient : StubWorkerClient
|
||||
{
|
||||
public override bool IsConnected => true;
|
||||
public TaskCompletionSource<MergeResultDto?> Gate { get; } = new();
|
||||
public override Task<MergeResultDto?> ApproveReviewAsync(string taskId, string targetBranch) => Gate.Task;
|
||||
}
|
||||
|
||||
private static int MergeProgressSubscriberCount(StubWorkerClient worker)
|
||||
{
|
||||
var field = typeof(StubWorkerClient).GetField("MergeProgressEvent",
|
||||
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
|
||||
var del = (Delegate?)field!.GetValue(worker);
|
||||
return del?.GetInvocationList().Length ?? 0;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ApproveReview_SetsIsRunning_AndLocksTheButton_WhileThePendingCallIsInFlight()
|
||||
{
|
||||
var worker = new BlockingApproveWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
vm.Bind(new TaskRowViewModel { Id = "task-approve-1", Status = TaskStatus.WaitingForReview });
|
||||
vm.Monitor.ApplyState(TaskStatus.WaitingForReview);
|
||||
|
||||
var approve = vm.ApproveReviewCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.True(vm.ApproveOp.IsRunning);
|
||||
Assert.False(vm.ApproveReviewCommand.CanExecute(null));
|
||||
|
||||
worker.Gate.SetResult(new MergeResultDto("merged", new List<string>(), null));
|
||||
await approve;
|
||||
|
||||
Assert.False(vm.ApproveOp.IsRunning);
|
||||
Assert.True(vm.ApproveReviewCommand.CanExecute(null));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ApproveReview_SharpensLabelForItsOwnTask_ButIgnoresProgressForOtherTasks()
|
||||
{
|
||||
var worker = new BlockingApproveWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
vm.Bind(new TaskRowViewModel { Id = "task-approve-2", Status = TaskStatus.WaitingForReview });
|
||||
vm.Monitor.ApplyState(TaskStatus.WaitingForReview);
|
||||
|
||||
var approve = vm.ApproveReviewCommand.ExecuteAsync(null);
|
||||
var merging = vm.ApproveOp.Label;
|
||||
|
||||
worker.RaiseMergeProgress("some-other-task", "verifying", 30);
|
||||
Assert.Equal(merging, vm.ApproveOp.Label);
|
||||
|
||||
worker.RaiseMergeProgress("task-approve-2", "verifying", 30);
|
||||
Assert.NotEqual(merging, vm.ApproveOp.Label);
|
||||
|
||||
worker.Gate.SetResult(new MergeResultDto("merged", new List<string>(), null));
|
||||
await approve;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ApproveReview_UnsubscribesFromMergeProgress_AfterTheCallCompletes()
|
||||
{
|
||||
var worker = new BlockingApproveWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
vm.Bind(new TaskRowViewModel { Id = "task-approve-3", Status = TaskStatus.WaitingForReview });
|
||||
vm.Monitor.ApplyState(TaskStatus.WaitingForReview);
|
||||
|
||||
var approve = vm.ApproveReviewCommand.ExecuteAsync(null);
|
||||
Assert.Equal(1, MergeProgressSubscriberCount(worker));
|
||||
|
||||
worker.Gate.SetResult(new MergeResultDto("merged", new List<string>(), null));
|
||||
await approve;
|
||||
|
||||
Assert.Equal(0, MergeProgressSubscriberCount(worker));
|
||||
}
|
||||
|
||||
private sealed class BlockingSubmitWorkerClient : StubWorkerClient
|
||||
{
|
||||
public override bool IsConnected => true;
|
||||
public TaskCompletionSource Gate { get; } = new();
|
||||
public override Task SubmitTaskForReviewAsync(string taskId, CancellationToken ct = default) => Gate.Task;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SubmitForReview_SetsIsRunning_AndLocksTheButton_WhilePending()
|
||||
{
|
||||
var worker = new BlockingSubmitWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
vm.Bind(new TaskRowViewModel { Id = "task-submit-1", Status = TaskStatus.Idle });
|
||||
vm.Monitor.ApplyState(TaskStatus.Idle);
|
||||
vm.WorktreePath = "/tmp/wt";
|
||||
|
||||
var submit = vm.SubmitForReviewCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.True(vm.SubmitOp.IsRunning);
|
||||
Assert.False(vm.SubmitForReviewCommand.CanExecute(null));
|
||||
|
||||
worker.Gate.SetResult();
|
||||
await submit;
|
||||
|
||||
Assert.False(vm.SubmitOp.IsRunning);
|
||||
Assert.True(vm.SubmitForReviewCommand.CanExecute(null));
|
||||
}
|
||||
|
||||
private sealed class BlockingRejectWorkerClient : StubWorkerClient
|
||||
{
|
||||
public override bool IsConnected => true;
|
||||
public TaskCompletionSource Gate { get; } = new();
|
||||
public override Task RejectReviewToQueueAsync(string taskId, string feedback) => Gate.Task;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RejectReview_SetsIsRunning_AndLocksTheButton_WhilePending()
|
||||
{
|
||||
var worker = new BlockingRejectWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
vm.Bind(new TaskRowViewModel { Id = "task-reject-1", Status = TaskStatus.WaitingForReview });
|
||||
vm.ReviewFeedback = "tighten the error handling";
|
||||
|
||||
var reject = vm.RejectReviewCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.True(vm.RejectOp.IsRunning);
|
||||
Assert.False(vm.RejectReviewCommand.CanExecute(null));
|
||||
|
||||
worker.Gate.SetResult();
|
||||
await reject;
|
||||
|
||||
Assert.False(vm.RejectOp.IsRunning);
|
||||
}
|
||||
|
||||
private sealed class BlockingParkWorkerClient : StubWorkerClient
|
||||
{
|
||||
public override bool IsConnected => true;
|
||||
public TaskCompletionSource Gate { get; } = new();
|
||||
public override Task RejectReviewToIdleAsync(string taskId) => Gate.Task;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ParkReview_SetsIsRunning_AndLocksTheButton_WhilePending()
|
||||
{
|
||||
var worker = new BlockingParkWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
vm.Bind(new TaskRowViewModel { Id = "task-park-2", Status = TaskStatus.WaitingForReview });
|
||||
|
||||
var park = vm.ParkReviewCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.True(vm.ParkOp.IsRunning);
|
||||
Assert.False(vm.ParkReviewCommand.CanExecute(null));
|
||||
|
||||
worker.Gate.SetResult();
|
||||
await park;
|
||||
|
||||
Assert.False(vm.ParkOp.IsRunning);
|
||||
Assert.True(vm.ParkReviewCommand.CanExecute(null));
|
||||
}
|
||||
|
||||
private sealed class BlockingPreviewWorkerClient : StubWorkerClient
|
||||
{
|
||||
public override bool IsConnected => true;
|
||||
public TaskCompletionSource<MergePreviewDto?> Gate { get; } = new();
|
||||
public override Task<MergePreviewDto?> PreviewMergeAsync(string taskId, string targetBranch) => Gate.Task;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task MergePreview_ShowsBusy_WhileTheWorkerCallIsPending_AndResetsAfter()
|
||||
{
|
||||
var worker = new BlockingPreviewWorkerClient();
|
||||
var vm = BuildVm(worker);
|
||||
// SyncTaskContext directly rather than Bind(): Bind() loads the task from the DB
|
||||
// asynchronously and TaskId only lands once that completes, which would race the
|
||||
// synchronous assertion below.
|
||||
vm.Merge.SyncTaskContext("task-preview-1", "do the thing", false);
|
||||
vm.Merge.SyncWorktree("/tmp/wt", null, null, "Active", null);
|
||||
|
||||
var preview = vm.Merge.RefreshMergePreviewAsync();
|
||||
|
||||
Assert.True(vm.Merge.PreviewOp.IsRunning);
|
||||
|
||||
worker.Gate.SetResult(new MergePreviewDto("clean", new List<string>(), 3));
|
||||
await preview;
|
||||
|
||||
Assert.False(vm.Merge.PreviewOp.IsRunning);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
Reference in New Issue
Block a user