releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 25 Wiki Activity

fix(ui): MergeHelperSelectionModal — Task-Nummer anzeigen, Titel wrappen, Status-Spalte verbreitern

Browse Source
This commit is contained in:
mika kuns
2026-08-27 09:10:44 +02:00
parent 18755910bd
commit 24e1d648ee
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ClaudeDo.Ui/ViewModels/Modals/MergeHelperSelectionModalViewModel.cs
+12 -7
View File
@@ -12,8 +12,11 @@ namespace ClaudeDo.Ui.ViewModels.Modals;
public sealed partial class MergeHelperTaskRowViewModel : ViewModelBase public sealed partial class MergeHelperTaskRowViewModel : ViewModelBase
{ {
public required string Id { get; init; } public required string Id { get; init; }
public int Number { 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 bool ShowNumber => Number > 0;
public string? ParentTaskId { get; init; } public string? ParentTaskId { get; init; }
/// <summary>The owning list — only set in review mode, where rows span lists.</summary> /// <summary>The owning list — only set in review mode, where rows span lists.</summary>
@@ -174,7 +177,7 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
.Where(t => t.Status == TaskStatus.WaitingForReview && !t.IsManual) .Where(t => t.Status == TaskStatus.WaitingForReview && !t.IsManual)
.Join(ctx.Lists.Where(l => l.WorkingDir != null && l.WorkingDir != ""), .Join(ctx.Lists.Where(l => l.WorkingDir != null && l.WorkingDir != ""),
t => t.ListId, l => l.Id, t => t.ListId, l => l.Id,
(t, l) => new { t.Id, t.Title, t.Status, t.ParentTaskId, t.ListId, ListName = l.Name, t.SortOrder, t.CreatedAt }) (t, l) => new { t.Id, t.Number, t.Title, t.Status, t.ParentTaskId, t.ListId, ListName = l.Name, t.SortOrder, t.CreatedAt })
.OrderBy(x => x.ListName).ThenBy(x => x.SortOrder).ThenBy(x => x.CreatedAt) .OrderBy(x => x.ListName).ThenBy(x => x.SortOrder).ThenBy(x => x.CreatedAt)
.ToListAsync(ct); .ToListAsync(ct);
@@ -193,6 +196,7 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
var reviewRow = new MergeHelperTaskRowViewModel var reviewRow = new MergeHelperTaskRowViewModel
{ {
Id = c.Id, Id = c.Id,
Number = c.Number,
Title = c.Title, Title = c.Title,
StatusText = c.Status.ToString(), StatusText = c.Status.ToString(),
ParentTaskId = c.ParentTaskId, ParentTaskId = c.ParentTaskId,
@@ -214,7 +218,7 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
// Manual tasks are reminders the user owns — never offer them to the handler. // Manual tasks are reminders the user owns — never offer them to the handler.
.Where(t => !t.IsManual) .Where(t => !t.IsManual)
.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, t.ParentTaskId }) .Select(t => new { t.Id, t.Number, t.Title, t.Status, t.ParentTaskId })
.ToListAsync(ct); .ToListAsync(ct);
var candidateIds = candidates.Select(c => c.Id).ToHashSet(); var candidateIds = candidates.Select(c => c.Id).ToHashSet();
@@ -230,17 +234,17 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
// (including orphaned children whose parent isn't a candidate) interleaved with their // (including orphaned children whose parent isn't a candidate) interleaved with their
// visible children, preserving the SortOrder/CreatedAt order within each level. // visible children, preserving the SortOrder/CreatedAt order within each level.
var emitted = new HashSet<string>(); var emitted = new HashSet<string>();
var ordered = new List<(string Id, string Title, TaskStatus Status, string? ParentTaskId)>(); var ordered = new List<(string Id, int Number, string Title, TaskStatus Status, string? ParentTaskId)>();
void Emit(string id, string title, TaskStatus status, string? parentTaskId) void Emit(string id, int number, string title, TaskStatus status, string? parentTaskId)
{ {
if (!emitted.Add(id)) return; if (!emitted.Add(id)) return;
ordered.Add((id, title, status, parentTaskId)); ordered.Add((id, number, title, status, parentTaskId));
if (childrenByParent.TryGetValue(id, out var kids)) if (childrenByParent.TryGetValue(id, out var kids))
foreach (var kid in kids) foreach (var kid in kids)
Emit(kid.Id, kid.Title, kid.Status, kid.ParentTaskId); Emit(kid.Id, kid.Number, kid.Title, kid.Status, kid.ParentTaskId);
} }
foreach (var c in candidates.Where(c => !ParentIsCandidate(c.ParentTaskId))) foreach (var c in candidates.Where(c => !ParentIsCandidate(c.ParentTaskId)))
Emit(c.Id, c.Title, c.Status, c.ParentTaskId); Emit(c.Id, c.Number, c.Title, c.Status, c.ParentTaskId);
foreach (var c in ordered) foreach (var c in ordered)
{ {
@@ -248,6 +252,7 @@ public sealed partial class MergeHelperSelectionModalViewModel : ViewModelBase
var row = new MergeHelperTaskRowViewModel var row = new MergeHelperTaskRowViewModel
{ {
Id = c.Id, Id = c.Id,
Number = c.Number,
Title = c.Title, Title = c.Title,
StatusText = c.Status.ToString(), StatusText = c.Status.ToString(),
ParentTaskId = c.ParentTaskId, ParentTaskId = c.ParentTaskId,
src/ClaudeDo.Ui/Views/Modals/MergeHelperSelectionModal.axaml
+12 -7
View File
@@ -38,7 +38,7 @@
</Grid> </Grid>
<!-- Column headers --> <!-- Column headers -->
<Grid DockPanel.Dock="Top" ColumnDefinitions="24,32,*,120" Margin="20,0,20,4" <Grid DockPanel.Dock="Top" ColumnDefinitions="24,32,*,140" Margin="20,0,20,4"
IsVisible="{Binding HasTasks}"> IsVisible="{Binding HasTasks}">
<TextBlock Grid.Column="2" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnTask}"/> <TextBlock Grid.Column="2" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnTask}"/>
<TextBlock Grid.Column="3" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnStatus}"/> <TextBlock Grid.Column="3" Classes="eyebrow" Text="{loc:Tr modals.mergeHelper.columnStatus}"/>
@@ -52,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="24,32,*,120" Margin="0,1"> <Grid ColumnDefinitions="24,32,*,140" Margin="0,1">
<!-- Review mode: non-selectable list-name section header --> <!-- Review mode: non-selectable list-name section header -->
<TextBlock Grid.Column="0" Grid.ColumnSpan="3" Classes="eyebrow" <TextBlock Grid.Column="0" Grid.ColumnSpan="3" Classes="eyebrow"
Text="{Binding Title}" IsVisible="{Binding IsListHeader}" Text="{Binding Title}" IsVisible="{Binding IsListHeader}"
@@ -66,18 +66,23 @@
IsChecked="{Binding IsSelected, Mode=TwoWay}" IsChecked="{Binding IsSelected, Mode=TwoWay}"
IsVisible="{Binding !IsListHeader}" IsVisible="{Binding !IsListHeader}"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" <Grid Grid.Column="2" ColumnDefinitions="Auto,*,Auto"
IsVisible="{Binding !IsListHeader}" IsVisible="{Binding !IsListHeader}"
VerticalAlignment="Center"> VerticalAlignment="Center">
<TextBlock Classes="body" Text="{Binding Title}" <TextBlock Grid.Column="0" Classes="meta"
Text="{Binding Number, StringFormat='#{0}'}"
IsVisible="{Binding ShowNumber}"
VerticalAlignment="Center" Margin="4,0,6,0"/>
<TextBlock Grid.Column="1" Classes="body" Text="{Binding Title}"
VerticalAlignment="Center" Margin="4,0,0,0" VerticalAlignment="Center" Margin="4,0,0,0"
TextTrimming="CharacterEllipsis"/> TextWrapping="Wrap"/>
<Border Classes="badge manual" VerticalAlignment="Center" <Border Grid.Column="2" Classes="badge manual" VerticalAlignment="Center"
Margin="4,0,0,0"
IsVisible="{Binding IsOrphanChild}" IsVisible="{Binding IsOrphanChild}"
ToolTip.Tip="{loc:Tr modals.mergeHelper.orphanHintTip}"> ToolTip.Tip="{loc:Tr modals.mergeHelper.orphanHintTip}">
<TextBlock Text="{loc:Tr modals.mergeHelper.orphanHint}"/> <TextBlock Text="{loc:Tr modals.mergeHelper.orphanHint}"/>
</Border> </Border>
</StackPanel> </Grid>
<Border Grid.Column="3" Classes="chip" <Border Grid.Column="3" Classes="chip"
IsVisible="{Binding !IsListHeader}" IsVisible="{Binding !IsListHeader}"
HorizontalAlignment="Left" VerticalAlignment="Center"> HorizontalAlignment="Left" VerticalAlignment="Center">