Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Check Run Annotations should be able to disable the Add Comment functionality #2080

Merged
StanleyGoldman merged 2 commits into from
Nov 26, 2018
Merged

Check Run Annotations should be able to disable the Add Comment functionality #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f13d354
Attempting to control the comment ability
StanleyGoldman Nov 22, 2018
f3c4548
Correcting the xaml binding
StanleyGoldman Nov 26, 2018
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
12 changes: 12 additions & 0 deletions src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public sealed class InlineCommentPeekViewModel : ReactiveObject, IDisposable
ITrackingPoint triggerPoint;
string relativePath;
DiffSide side;
bool availableForComment;

/// <summary>
/// Initializes a new instance of the <see cref="InlineCommentPeekViewModel"/> class.
Expand Down Expand Up @@ -87,6 +88,12 @@ public InlineCommentPeekViewModel(IInlineCommentPeekService peekService,
Observable.Return(previousCommentCommand.Enabled));
}

public bool AvailableForComment
{
get { return availableForComment; }
private set { this.RaiseAndSetIfChanged(ref availableForComment, value); }
}

/// <summary>
/// Gets the annotations displayed.
/// </summary>
Expand Down Expand Up @@ -186,6 +193,11 @@ async Task UpdateThread()
var lineAndLeftBuffer = peekService.GetLineNumber(peekSession, triggerPoint);
var lineNumber = lineAndLeftBuffer.Item1;
var leftBuffer = lineAndLeftBuffer.Item2;

AvailableForComment =
file.Diff.Any(chunk => chunk.Lines
.Any(line => line.NewLineNumber == lineNumber));

var thread = file.InlineCommentThreads?.FirstOrDefault(x =>
x.LineNumber == lineNumber &&
((leftBuffer && x.DiffLineType == DiffChangeType.Delete) || (!leftBuffer && x.DiffLineType != DiffChangeType.Delete)));
Expand Down
4 changes: 3 additions & 1 deletion src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@
</ItemsControl.ItemTemplate>
</ItemsControl>

<ghfvs:CommentThreadView x:Name="threadView" DataContext="{Binding Thread}"/>
<ghfvs:CommentThreadView x:Name="threadView"
Visibility="{Binding DataContext.AvailableForComment, Converter={ghfvs:BooleanToVisibilityConverter}, ElementName=annotationsView}"
DataContext="{Binding Thread}"/>
</StackPanel>
</ScrollViewer>
</DockPanel>
Expand Down