refactor(ui): scope "Let Claude handle it" to a single list
This commit is contained in:
@@ -175,8 +175,7 @@
|
|||||||
"contextOpenTerminal": "Im Terminal öffnen",
|
"contextOpenTerminal": "Im Terminal öffnen",
|
||||||
"contextLetClaude": "Claude machen lassen",
|
"contextLetClaude": "Claude machen lassen",
|
||||||
"newList": "Neue Liste",
|
"newList": "Neue Liste",
|
||||||
"addReposTip": "Repos als Listen hinzufügen",
|
"addReposTip": "Repos als Listen hinzufügen"
|
||||||
"letClaudeAllTip": "Claude machen lassen (alle Listen)"
|
|
||||||
},
|
},
|
||||||
"details": {
|
"details": {
|
||||||
"pickUpInTerminalTip": "Diese Sitzung im Terminal fortsetzen",
|
"pickUpInTerminalTip": "Diese Sitzung im Terminal fortsetzen",
|
||||||
@@ -371,7 +370,6 @@
|
|||||||
"mergeHelper": {
|
"mergeHelper": {
|
||||||
"title": "CLAUDE MACHEN LASSEN",
|
"title": "CLAUDE MACHEN LASSEN",
|
||||||
"windowTitle": "Claude machen lassen",
|
"windowTitle": "Claude machen lassen",
|
||||||
"scopeAll": "Alle Listen",
|
|
||||||
"scopeList": "Liste: {0}",
|
"scopeList": "Liste: {0}",
|
||||||
"confirm": "Claude machen lassen",
|
"confirm": "Claude machen lassen",
|
||||||
"cancel": "Abbrechen",
|
"cancel": "Abbrechen",
|
||||||
@@ -379,8 +377,7 @@
|
|||||||
"selectNone": "Keine auswählen",
|
"selectNone": "Keine auswählen",
|
||||||
"empty": "Keine Aufgaben zu übergeben — alles erledigt oder abgebrochen.",
|
"empty": "Keine Aufgaben zu übergeben — alles erledigt oder abgebrochen.",
|
||||||
"columnTask": "AUFGABE",
|
"columnTask": "AUFGABE",
|
||||||
"columnStatus": "STATUS",
|
"columnStatus": "STATUS"
|
||||||
"columnList": "LISTE"
|
|
||||||
},
|
},
|
||||||
"unfinishedPlanning": {
|
"unfinishedPlanning": {
|
||||||
"title": "UNVOLLENDETE PLANUNGSSITZUNG",
|
"title": "UNVOLLENDETE PLANUNGSSITZUNG",
|
||||||
|
|||||||
@@ -175,8 +175,7 @@
|
|||||||
"contextOpenTerminal": "Open in Terminal",
|
"contextOpenTerminal": "Open in Terminal",
|
||||||
"contextLetClaude": "Let Claude handle it",
|
"contextLetClaude": "Let Claude handle it",
|
||||||
"newList": "New list",
|
"newList": "New list",
|
||||||
"addReposTip": "Add repos as lists",
|
"addReposTip": "Add repos as lists"
|
||||||
"letClaudeAllTip": "Let Claude handle it (all lists)"
|
|
||||||
},
|
},
|
||||||
"details": {
|
"details": {
|
||||||
"pickUpInTerminalTip": "Pick up this session in a terminal",
|
"pickUpInTerminalTip": "Pick up this session in a terminal",
|
||||||
@@ -371,7 +370,6 @@
|
|||||||
"mergeHelper": {
|
"mergeHelper": {
|
||||||
"title": "LET CLAUDE HANDLE IT",
|
"title": "LET CLAUDE HANDLE IT",
|
||||||
"windowTitle": "Let Claude handle it",
|
"windowTitle": "Let Claude handle it",
|
||||||
"scopeAll": "All lists",
|
|
||||||
"scopeList": "List: {0}",
|
"scopeList": "List: {0}",
|
||||||
"confirm": "Let Claude handle it",
|
"confirm": "Let Claude handle it",
|
||||||
"cancel": "Cancel",
|
"cancel": "Cancel",
|
||||||
@@ -379,8 +377,7 @@
|
|||||||
"selectNone": "Select none",
|
"selectNone": "Select none",
|
||||||
"empty": "No tasks to hand over — everything is done or cancelled.",
|
"empty": "No tasks to hand over — everything is done or cancelled.",
|
||||||
"columnTask": "TASK",
|
"columnTask": "TASK",
|
||||||
"columnStatus": "STATUS",
|
"columnStatus": "STATUS"
|
||||||
"columnList": "LIST"
|
|
||||||
},
|
},
|
||||||
"unfinishedPlanning": {
|
"unfinishedPlanning": {
|
||||||
"title": "UNFINISHED PLANNING SESSION",
|
"title": "UNFINISHED PLANNING SESSION",
|
||||||
|
|||||||
@@ -100,18 +100,6 @@ public sealed partial class ListsIslandViewModel : ViewModelBase, IDisposable
|
|||||||
LetClaudeHandleRequested?.Invoke(new MergeHelperRequest(rawId, ids));
|
LetClaudeHandleRequested?.Invoke(new MergeHelperRequest(rawId, ids));
|
||||||
}
|
}
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
private async Task LetClaudeHandleAllAsync()
|
|
||||||
{
|
|
||||||
if (Dialogs is null || _services is null) return;
|
|
||||||
var vm = _services.GetRequiredService<MergeHelperSelectionModalViewModel>();
|
|
||||||
vm.Configure(null, null);
|
|
||||||
await vm.LoadAsync();
|
|
||||||
var ids = await Dialogs.ShowMergeHelperSelectionAsync(vm);
|
|
||||||
if (ids is { Count: > 0 })
|
|
||||||
LetClaudeHandleRequested?.Invoke(new MergeHelperRequest(null, ids));
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
private void OpenInExplorer(ListNavItemViewModel? row)
|
private void OpenInExplorer(ListNavItemViewModel? row)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ public sealed partial class MergeHelperTaskRowViewModel : ViewModelBase
|
|||||||
public required string Id { get; init; }
|
public required string Id { get; init; }
|
||||||
public required string Title { get; init; }
|
public required string Title { get; init; }
|
||||||
public required string StatusText { get; init; }
|
public required string StatusText { get; init; }
|
||||||
public required string ListName { get; init; }
|
|
||||||
|
|
||||||
[ObservableProperty] private bool _isSelected;
|
[ObservableProperty] private bool _isSelected;
|
||||||
}
|
}
|
||||||
@@ -27,12 +26,11 @@ public sealed partial class MergeHelperTaskRowViewModel : ViewModelBase
|
|||||||
public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
|
public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
|
||||||
{
|
{
|
||||||
private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
|
private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
|
||||||
private string? _listId;
|
private string _listId = "";
|
||||||
|
|
||||||
public ObservableCollection<MergeHelperTaskRowViewModel> Tasks { get; } = new();
|
public ObservableCollection<MergeHelperTaskRowViewModel> Tasks { get; } = new();
|
||||||
|
|
||||||
[ObservableProperty] private string _scopeLabel = "";
|
[ObservableProperty] private string _scopeLabel = "";
|
||||||
[ObservableProperty] private bool _isGlobal;
|
|
||||||
|
|
||||||
public bool HasTasks => Tasks.Count > 0;
|
public bool HasTasks => Tasks.Count > 0;
|
||||||
public bool CanConfirm => Tasks.Any(t => t.IsSelected);
|
public bool CanConfirm => Tasks.Any(t => t.IsSelected);
|
||||||
@@ -43,13 +41,10 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
|
|||||||
public MergeHelperSelectionModalViewModel(IDbContextFactory<ClaudeDoDbContext> dbFactory)
|
public MergeHelperSelectionModalViewModel(IDbContextFactory<ClaudeDoDbContext> dbFactory)
|
||||||
=> _dbFactory = dbFactory;
|
=> _dbFactory = dbFactory;
|
||||||
|
|
||||||
public void Configure(string? listId, string? listName)
|
public void Configure(string listId, string listName)
|
||||||
{
|
{
|
||||||
_listId = listId;
|
_listId = listId;
|
||||||
IsGlobal = listId is null;
|
ScopeLabel = Loc.T("modals.mergeHelper.scopeList", listName);
|
||||||
ScopeLabel = listId is null
|
|
||||||
? Loc.T("modals.mergeHelper.scopeAll")
|
|
||||||
: Loc.T("modals.mergeHelper.scopeList", listName ?? "");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task LoadAsync(CancellationToken ct = default)
|
public async Task LoadAsync(CancellationToken ct = default)
|
||||||
@@ -58,14 +53,11 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
|
|||||||
Tasks.Clear();
|
Tasks.Clear();
|
||||||
|
|
||||||
await using var ctx = await _dbFactory.CreateDbContextAsync(ct);
|
await using var ctx = await _dbFactory.CreateDbContextAsync(ct);
|
||||||
var query = ctx.Tasks.AsNoTracking()
|
var candidates = await ctx.Tasks.AsNoTracking()
|
||||||
.Where(t => t.Status != TaskStatus.Done && t.Status != TaskStatus.Cancelled);
|
.Where(t => t.Status != TaskStatus.Done && t.Status != TaskStatus.Cancelled)
|
||||||
if (_listId is not null)
|
.Where(t => t.ListId == _listId)
|
||||||
query = query.Where(t => t.ListId == _listId);
|
|
||||||
|
|
||||||
var candidates = await query
|
|
||||||
.OrderBy(t => t.SortOrder).ThenBy(t => t.CreatedAt)
|
.OrderBy(t => t.SortOrder).ThenBy(t => t.CreatedAt)
|
||||||
.Select(t => new { t.Id, t.Title, t.Status, ListName = t.List.Name })
|
.Select(t => new { t.Id, t.Title, t.Status })
|
||||||
.ToListAsync(ct);
|
.ToListAsync(ct);
|
||||||
|
|
||||||
foreach (var c in candidates)
|
foreach (var c in candidates)
|
||||||
@@ -75,7 +67,6 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
|
|||||||
Id = c.Id,
|
Id = c.Id,
|
||||||
Title = c.Title,
|
Title = c.Title,
|
||||||
StatusText = c.Status.ToString(),
|
StatusText = c.Status.ToString(),
|
||||||
ListName = c.ListName,
|
|
||||||
IsSelected = IsTickedByDefault(c.Status),
|
IsSelected = IsTickedByDefault(c.Status),
|
||||||
};
|
};
|
||||||
row.PropertyChanged += OnRowChanged;
|
row.PropertyChanged += OnRowChanged;
|
||||||
|
|||||||
@@ -181,8 +181,8 @@
|
|||||||
</ItemsControl.ItemTemplate>
|
</ItemsControl.ItemTemplate>
|
||||||
</ItemsControl>
|
</ItemsControl>
|
||||||
|
|
||||||
<!-- New list + import + merge-helper row -->
|
<!-- New list + import row -->
|
||||||
<Grid ColumnDefinitions="*,Auto,Auto" Margin="0,4,0,0">
|
<Grid ColumnDefinitions="*,Auto" Margin="0,4,0,0">
|
||||||
<Button Grid.Column="0" Classes="new-list-btn"
|
<Button Grid.Column="0" Classes="new-list-btn"
|
||||||
Command="{Binding CreateListCommand}">
|
Command="{Binding CreateListCommand}">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="6">
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
||||||
@@ -203,13 +203,6 @@
|
|||||||
Width="14" Height="14"
|
Width="14" Height="14"
|
||||||
Foreground="{DynamicResource TextMuteBrush}"/>
|
Foreground="{DynamicResource TextMuteBrush}"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Grid.Column="2" Classes="icon-btn" Margin="6,0,0,0"
|
|
||||||
Command="{Binding LetClaudeHandleAllCommand}"
|
|
||||||
ToolTip.Tip="{loc:Tr lists.letClaudeAllTip}">
|
|
||||||
<PathIcon Data="{StaticResource Icon.Broom}"
|
|
||||||
Width="14" Height="14"
|
|
||||||
Foreground="{DynamicResource TextMuteBrush}"/>
|
|
||||||
</Button>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -38,12 +38,10 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<!-- Column headers -->
|
<!-- Column headers -->
|
||||||
<Grid DockPanel.Dock="Top" ColumnDefinitions="32,*,120,120" Margin="20,0,20,4"
|
<Grid DockPanel.Dock="Top" ColumnDefinitions="32,*,120" Margin="20,0,20,4"
|
||||||
IsVisible="{Binding HasTasks}">
|
IsVisible="{Binding HasTasks}">
|
||||||
<TextBlock Grid.Column="1" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnTask}"/>
|
<TextBlock Grid.Column="1" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnTask}"/>
|
||||||
<TextBlock Grid.Column="2" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnStatus}"/>
|
<TextBlock Grid.Column="2" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnStatus}"/>
|
||||||
<TextBlock Grid.Column="3" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnList}"
|
|
||||||
IsVisible="{Binding IsGlobal}"/>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<ScrollViewer Padding="20,2,20,8">
|
<ScrollViewer Padding="20,2,20,8">
|
||||||
@@ -54,7 +52,7 @@
|
|||||||
<ItemsControl ItemsSource="{Binding Tasks}">
|
<ItemsControl ItemsSource="{Binding Tasks}">
|
||||||
<ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
<DataTemplate DataType="vm:MergeHelperTaskRowViewModel">
|
<DataTemplate DataType="vm:MergeHelperTaskRowViewModel">
|
||||||
<Grid ColumnDefinitions="32,*,120,120" Margin="0,1">
|
<Grid ColumnDefinitions="32,*,120" Margin="0,1">
|
||||||
<CheckBox Grid.Column="0" MinWidth="0"
|
<CheckBox Grid.Column="0" MinWidth="0"
|
||||||
IsChecked="{Binding IsSelected, Mode=TwoWay}"
|
IsChecked="{Binding IsSelected, Mode=TwoWay}"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
@@ -65,10 +63,6 @@
|
|||||||
HorizontalAlignment="Left" VerticalAlignment="Center">
|
HorizontalAlignment="Left" VerticalAlignment="Center">
|
||||||
<TextBlock Text="{Binding StatusText}"/>
|
<TextBlock Text="{Binding StatusText}"/>
|
||||||
</Border>
|
</Border>
|
||||||
<TextBlock Classes="meta" Grid.Column="3" Text="{Binding ListName}"
|
|
||||||
VerticalAlignment="Center" Margin="8,0,0,0"
|
|
||||||
TextTrimming="CharacterEllipsis"
|
|
||||||
IsVisible="{Binding $parent[Window].((vm:MergeHelperSelectionModalViewModel)DataContext).IsGlobal}"/>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ItemsControl.ItemTemplate>
|
</ItemsControl.ItemTemplate>
|
||||||
|
|||||||
@@ -74,11 +74,12 @@ public class MergeHelperSelectionModalViewModelTests : IDisposable
|
|||||||
{
|
{
|
||||||
await SeedAllStatusesAsync();
|
await SeedAllStatusesAsync();
|
||||||
var vm = BuildVm();
|
var vm = BuildVm();
|
||||||
vm.Configure(null, null);
|
vm.Configure("L1", "Work");
|
||||||
await vm.LoadAsync();
|
await vm.LoadAsync();
|
||||||
|
|
||||||
Assert.DoesNotContain(vm.Tasks, t => t.Id is "t-done" or "t-cancelled");
|
Assert.DoesNotContain(vm.Tasks, t => t.Id is "t-done" or "t-cancelled");
|
||||||
Assert.Equal(7, vm.Tasks.Count);
|
Assert.DoesNotContain(vm.Tasks, t => t.Id == "t-other-list");
|
||||||
|
Assert.Equal(6, vm.Tasks.Count);
|
||||||
|
|
||||||
Assert.True(vm.Tasks.Single(t => t.Id == "t-idle").IsSelected);
|
Assert.True(vm.Tasks.Single(t => t.Id == "t-idle").IsSelected);
|
||||||
Assert.True(vm.Tasks.Single(t => t.Id == "t-queued").IsSelected);
|
Assert.True(vm.Tasks.Single(t => t.Id == "t-queued").IsSelected);
|
||||||
@@ -98,8 +99,6 @@ public class MergeHelperSelectionModalViewModelTests : IDisposable
|
|||||||
|
|
||||||
Assert.Single(vm.Tasks);
|
Assert.Single(vm.Tasks);
|
||||||
Assert.Equal("t-other-list", vm.Tasks[0].Id);
|
Assert.Equal("t-other-list", vm.Tasks[0].Id);
|
||||||
Assert.Equal("Home", vm.Tasks[0].ListName);
|
|
||||||
Assert.False(vm.IsGlobal);
|
|
||||||
Assert.Contains("Home", vm.ScopeLabel);
|
Assert.Contains("Home", vm.ScopeLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,7 +107,7 @@ public class MergeHelperSelectionModalViewModelTests : IDisposable
|
|||||||
{
|
{
|
||||||
await SeedAllStatusesAsync();
|
await SeedAllStatusesAsync();
|
||||||
var vm = BuildVm();
|
var vm = BuildVm();
|
||||||
vm.Configure(null, null);
|
vm.Configure("L1", "Work");
|
||||||
await vm.LoadAsync();
|
await vm.LoadAsync();
|
||||||
|
|
||||||
Assert.True(vm.CanConfirm);
|
Assert.True(vm.CanConfirm);
|
||||||
@@ -129,7 +128,7 @@ public class MergeHelperSelectionModalViewModelTests : IDisposable
|
|||||||
{
|
{
|
||||||
await SeedAllStatusesAsync();
|
await SeedAllStatusesAsync();
|
||||||
var vm = BuildVm();
|
var vm = BuildVm();
|
||||||
vm.Configure(null, null);
|
vm.Configure("L1", "Work");
|
||||||
await vm.LoadAsync();
|
await vm.LoadAsync();
|
||||||
|
|
||||||
vm.SelectNoneCommand.Execute(null);
|
vm.SelectNoneCommand.Execute(null);
|
||||||
@@ -152,7 +151,7 @@ public class MergeHelperSelectionModalViewModelTests : IDisposable
|
|||||||
{
|
{
|
||||||
await SeedAllStatusesAsync();
|
await SeedAllStatusesAsync();
|
||||||
var vm = BuildVm();
|
var vm = BuildVm();
|
||||||
vm.Configure(null, null);
|
vm.Configure("L1", "Work");
|
||||||
await vm.LoadAsync();
|
await vm.LoadAsync();
|
||||||
|
|
||||||
var closed = false;
|
var closed = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user