Check Run Annotations

src/GitHub.Api/GitHub.Api.csproj

@@ -30,6 +30,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
+    <PackageReference Include="Octokit.GraphQL" Version="0.1.2-beta" />
   </ItemGroup>
 </Project>

src/GitHub.App/GitHub.App.csproj

@@ -49,10 +49,10 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
+    <PackageReference Include="Octokit.GraphQL" Version="0.1.2-beta" />
     <PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
     <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="SerilogAnalyzer" Version="0.12.0.0" />
     <PackageReference Include="Stateless" Version="2.5.56.0" targetFramework="net45" />
   </ItemGroup>
-</Project>
+</Project>

src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs

@@ -1,5 +1,7 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
+using GitHub.Models;
 using GitHub.ViewModels;
 using ReactiveUI;
 
@@ -8,6 +10,16 @@ namespace GitHub.SampleData
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
     public class CommentThreadViewModelDesigner : ViewModelBase, ICommentThreadViewModel
     {
+        public CommentThreadViewModelDesigner()
+        {
+            Comments = new ReactiveList<ICommentViewModel>(){new CommentViewModelDesigner()
+            {
+                Author = new ActorViewModel{ Login = "shana"},
+                Body = "You can use a `CompositeDisposable` type here, it's designed to handle disposables in an optimal way (you can just call `Dispose()` on it and it will handle disposing everything it holds)."
+            }};
+
+        }
+
         public IReadOnlyReactiveList<ICommentViewModel> Comments { get; }
             = new ReactiveList<ICommentViewModel>();
 

src/GitHub.App/SampleData/InlineAnnotationViewModelDesigner.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using GitHub.Models;
+using GitHub.ViewModels;
+
+namespace GitHub.SampleData
+{
+    public class InlineAnnotationViewModelDesigner : IInlineAnnotationViewModel
+    {
+        public InlineAnnotationViewModelDesigner()
+        {
+            var checkRunAnnotationModel = new CheckRunAnnotationModel
+            {
+                AnnotationLevel = CheckAnnotationLevel.Failure,
+                Path = "SomeFile.cs",
+                EndLine = 12,
+                StartLine = 12,
+                Message = "Some Error Message",
+                Title = "CS12345"
+            };
+
+            var checkRunModel =
+                new CheckRunModel
+                {
+                    Annotations = new List<CheckRunAnnotationModel> {checkRunAnnotationModel},
+                    Name = "Fake Check Run"
+                };
+
+            var checkSuiteModel = new CheckSuiteModel()
+            {
+                ApplicationName = "Fake Check Suite",
+                HeadSha = "ed6198c37b13638e902716252b0a17d54bd59e4a",
+                CheckRuns = new List<CheckRunModel> { checkRunModel}
+            };
+
+            Model= new InlineAnnotationModel(checkSuiteModel, checkRunModel, checkRunAnnotationModel);
+        }
+
+        public InlineAnnotationModel Model { get; }
+    }
+}

src/GitHub.App/SampleData/PullRequestAnnotationItemViewModelDesigner.cs

@@ -0,0 +1,18 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reactive;
+using GitHub.Models;
+using GitHub.ViewModels.GitHubPane;
+using ReactiveUI;
+
+namespace GitHub.SampleData
+{
+    [ExcludeFromCodeCoverage]
+    public sealed class PullRequestAnnotationItemViewModelDesigner : IPullRequestAnnotationItemViewModel
+    {
+        public CheckRunAnnotationModel Annotation { get; set; }
+        public bool IsExpanded { get; set; }
+        public string LineDescription => $"{Annotation.StartLine}:{Annotation.EndLine}";
+        public bool IsFileInPullRequest { get; set;  }
+        public ReactiveCommand<Unit, Unit> OpenAnnotation { get; }
+    }
+}

src/GitHub.App/SampleData/PullRequestAnnotationsViewModelDesigner.cs

@@ -0,0 +1,91 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reactive;
+using System.Threading.Tasks;
+using GitHub.Models;
+using GitHub.ViewModels.GitHubPane;
+using ReactiveUI;
+
+namespace GitHub.SampleData
+{
+    [ExcludeFromCodeCoverage]
+    public sealed class PullRequestAnnotationsViewModelDesigner : PanePageViewModelBase, IPullRequestAnnotationsViewModel
+    {
+        public LocalRepositoryModel LocalRepository { get; set; }
+        public string RemoteRepositoryOwner { get; set; }
+        public int PullRequestNumber { get; set; } = 123;
+        public string CheckRunId { get; set; }
+        public ReactiveCommand<Unit, Unit> NavigateToPullRequest { get; }
+        public string PullRequestTitle { get; } = "Fixing stuff in this PR";
+        public string CheckSuiteName { get; } = "Awesome Check Suite";
+        public string CheckRunSummary { get; } = "Awesome Check Run Summary";
+        public string CheckRunText { get; } = "Awesome Check Run Text";
+
+        public IReadOnlyDictionary<string, IPullRequestAnnotationItemViewModel[]> AnnotationsDictionary { get; }
+            = new Dictionary<string, IPullRequestAnnotationItemViewModel[]>
+            {
+                {
+                    "asdf/asdf.cs",
+                    new IPullRequestAnnotationItemViewModel[] 
+                    {
+                        new PullRequestAnnotationItemViewModelDesigner
+                        {
+                            Annotation = new CheckRunAnnotationModel
+                            {
+                                AnnotationLevel = CheckAnnotationLevel.Warning,
+                                StartLine = 3,
+                                EndLine = 4,
+                                Path = "asdf/asdf.cs",
+                                Message = "; is expected",
+                                Title = "CS 12345"
+                            },
+                            IsExpanded = true,
+                            IsFileInPullRequest = true
+                        },
+                        new PullRequestAnnotationItemViewModelDesigner
+                        {
+                            Annotation = new CheckRunAnnotationModel
+                            {
+                                AnnotationLevel = CheckAnnotationLevel.Failure,
+                                StartLine = 3,
+                                EndLine = 4,
+                                Path = "asdf/asdf.cs",
+                                Message = "; is expected",
+                                Title = "CS 12345"
+                            },
+                            IsExpanded = true,
+                            IsFileInPullRequest = true
+                        },
+                    }
+                },
+                {
+                    "blah.cs",
+                    new IPullRequestAnnotationItemViewModel[] 
+                    {
+                        new PullRequestAnnotationItemViewModelDesigner
+                        {
+                            Annotation = new CheckRunAnnotationModel
+                            {
+                                AnnotationLevel = CheckAnnotationLevel.Notice,
+                                StartLine = 3,
+                                EndLine = 4,
+                                Path = "blah.cs",
+                                Message = "; is expected",
+                                Title = "CS 12345"
+                            },
+                            IsExpanded = true,
+                        }
+                    }
+                },
+            };
+
+        public string CheckRunName { get; } = "Psuedo Check Run";
+
+        public Task InitializeAsync(LocalRepositoryModel localRepository, IConnection connection, string owner,
+            string repo,
+            int pullRequestNumber, string checkRunId)
+        {
+            return Task.CompletedTask;
+        }
+    }
+}

src/GitHub.App/SampleData/PullRequestCheckViewModelDesigner.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Reactive;
-using System.Windows.Media.Imaging;
+using GitHub.Models;
 using GitHub.ViewModels;
 using GitHub.ViewModels.GitHubPane;
 using ReactiveUI;
@@ -18,5 +18,11 @@ public sealed class PullRequestCheckViewModelDesigner : ViewModelBase, IPullRequ
         public Uri DetailsUrl { get; set; } = new Uri("http://github.com");
 
         public ReactiveCommand<Unit, Unit> OpenDetailsUrl { get; set; } = null;
+
+        public PullRequestCheckType CheckType { get; set; } = PullRequestCheckType.ChecksApi;
+
+        public string CheckRunId { get; set; }
+
+        public bool HasAnnotations { get; } = true;
     }
 }

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -9,6 +9,7 @@
 using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.SampleData;
+using ReactiveUI.Legacy;
 
 namespace GitHub.SampleData
 {
@@ -122,8 +123,10 @@ public PullRequestDetailViewModelDesigner()
         public ReactiveCommand<Unit, Unit> Checkout { get; }
         public ReactiveCommand<Unit, Unit> Pull { get; }
         public ReactiveCommand<Unit, Unit> Push { get; }
+        public ReactiveCommand<Unit, Unit> SyncSubmodules { get; }
         public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
         public ReactiveCommand<IPullRequestReviewSummaryViewModel, Unit> ShowReview { get; }
+        public ReactiveCommand<IPullRequestCheckViewModel, Unit> ShowAnnotations { get; }
 
         public IReadOnlyList<IPullRequestCheckViewModel> Checks { get; }
 

src/GitHub.App/SampleData/PullRequestFilesViewModelDesigner.cs

@@ -36,6 +36,9 @@ public PullRequestFilesViewModelDesigner()
         public ReactiveCommand<IPullRequestFileNode, Unit> DiffFileWithWorkingDirectory { get; }
         public ReactiveCommand<IPullRequestFileNode, Unit> OpenFileInWorkingDirectory { get; }
         public ReactiveCommand<IPullRequestFileNode, Unit> OpenFirstComment { get; }
+        public ReactiveCommand<IPullRequestFileNode, Unit> OpenFirstAnnotationNotice { get; }
+        public ReactiveCommand<IPullRequestFileNode, Unit> OpenFirstAnnotationWarning { get; }
+        public ReactiveCommand<IPullRequestFileNode, Unit> OpenFirstAnnotationFailure { get; }
 
         public Task InitializeAsync(
             IPullRequestSession session,

src/GitHub.App/Services/FromGraphQlExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using GitHub.Models;
 using Octokit.GraphQL.Model;
+using CheckAnnotationLevel = GitHub.Models.CheckAnnotationLevel;
 using CheckConclusionState = GitHub.Models.CheckConclusionState;
 using CheckStatusState = GitHub.Models.CheckStatusState;
 using PullRequestReviewState = GitHub.Models.PullRequestReviewState;
@@ -84,7 +85,7 @@ public static CheckStatusState FromGraphQl(this Octokit.GraphQL.Model.CheckStatu
             }
         }
 
-        public static GitHub.Models.PullRequestReviewState FromGraphQl(this Octokit.GraphQL.Model.PullRequestReviewState value)
+        public static PullRequestReviewState FromGraphQl(this Octokit.GraphQL.Model.PullRequestReviewState value)
         {
             switch (value) {
                 case Octokit.GraphQL.Model.PullRequestReviewState.Pending:
@@ -101,5 +102,20 @@ public static GitHub.Models.PullRequestReviewState FromGraphQl(this Octokit.Grap
                     throw new ArgumentOutOfRangeException(nameof(value), value, null);
             }
         }
+
+        public static CheckAnnotationLevel FromGraphQl(this Octokit.GraphQL.Model.CheckAnnotationLevel value)
+        {
+            switch (value)
+            {
+                case Octokit.GraphQL.Model.CheckAnnotationLevel.Failure:
+                    return CheckAnnotationLevel.Failure;
+                case Octokit.GraphQL.Model.CheckAnnotationLevel.Notice:
+                    return CheckAnnotationLevel.Notice;
+                case Octokit.GraphQL.Model.CheckAnnotationLevel.Warning:
+                    return CheckAnnotationLevel.Warning;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(value), value, null);
+            }
+        }
     }
 }

src/GitHub.App/Services/PullRequestEditorService.cs

@@ -285,7 +285,7 @@ await pullRequestService.ExtractToTempFile(
         }
 
         /// <inheritdoc/>
-        public async Task<IDifferenceViewer> OpenDiff(
+        public Task<IDifferenceViewer> OpenDiff(
             IPullRequestSession session,
             string relativePath,
             IInlineCommentThreadModel thread)
@@ -294,11 +294,17 @@ public async Task<IDifferenceViewer> OpenDiff(
             Guard.ArgumentNotEmptyString(relativePath, nameof(relativePath));
             Guard.ArgumentNotNull(thread, nameof(thread));
 
-            var diffViewer = await OpenDiff(session, relativePath, thread.CommitSha, scrollToFirstDraftOrDiff: false);
+            return OpenDiff(session, relativePath, thread.CommitSha, thread.LineNumber - 1);
+        }
+
+        /// <inheritdoc/>
+        public async Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, string relativePath, string headSha, int fromLine)
+        {
+            var diffViewer = await OpenDiff(session, relativePath, headSha, scrollToFirstDraftOrDiff: false);
 
-            var param = (object)new InlineCommentNavigationParams
+            var param = (object) new InlineCommentNavigationParams
             {
-                FromLine = thread.LineNumber - 1,
+                FromLine = fromLine,
             };
 
             // HACK: We need to wait here for the inline comment tags to initialize so we can find the next inline comment.

src/GitHub.App/Services/PullRequestService.cs

@@ -115,7 +115,7 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                                                       {
                                                           Conclusion = run.Conclusion.FromGraphQl(),
                                                           Status = run.Status.FromGraphQl()
-                                                      }).ToList()
+                                                      }).ToList(),
                                               }).ToList(),
                                           Statuses = commit.Commit.Status
                                                   .Select(context =>

src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs

@@ -35,6 +35,7 @@ public sealed class GitHubPaneViewModel : ViewModelBase, IGitHubPaneViewModel, I
         static readonly Regex pullUri = CreateRoute("/:owner/:repo/pull/:number");
         static readonly Regex pullNewReviewUri = CreateRoute("/:owner/:repo/pull/:number/review/new");
         static readonly Regex pullUserReviewsUri = CreateRoute("/:owner/:repo/pull/:number/reviews/:login");
+        static readonly Regex pullCheckRunsUri = CreateRoute("/:owner/:repo/pull/:number/checkruns/:id");
 
         readonly IViewViewModelFactory viewModelFactory;
         readonly ISimpleApiClientFactory apiClientFactory;
@@ -266,6 +267,15 @@ public async Task NavigateTo(Uri uri)
                 var login = match.Groups["login"].Value;
                 await ShowPullRequestReviews(owner, repo, number, login);
             }
+            else if ((match = pullCheckRunsUri.Match(uri.AbsolutePath))?.Success == true)
+            {
+                var owner = match.Groups["owner"].Value;
+                var repo = match.Groups["repo"].Value;
+                var number = int.Parse(match.Groups["number"].Value);
+                var id = match.Groups["id"].Value;
+
+                await ShowPullRequestCheckRun(owner, repo, number, id);
+            }
             else
             {
                 throw new NotSupportedException("Unrecognised GitHub pane URL: " + uri.AbsolutePath);
@@ -319,6 +329,20 @@ public Task ShowPullRequestReviews(string owner, string repo, int number, string
                      x.User.Login == login);
         }
 
+        /// <inheritdoc/>
+        public Task ShowPullRequestCheckRun(string owner, string repo, int number, string checkRunId)
+        {
+            Guard.ArgumentNotNull(owner, nameof(owner));
+            Guard.ArgumentNotNull(repo, nameof(repo));
+
+            return NavigateTo<IPullRequestAnnotationsViewModel>(
+                x => x.InitializeAsync(LocalRepository, Connection, owner, repo, number, checkRunId),
+                x => x.RemoteRepositoryOwner == owner &&
+                     x.LocalRepository.Name == repo &&
+                     x.PullRequestNumber == number &&
+                     x.CheckRunId == checkRunId);
+        }
+
         /// <inheritdoc/>
         public Task ShowPullRequestReviewAuthoring(string owner, string repo, int number)
         {
@@ -489,8 +513,8 @@ static async Task<bool> IsValidRepository(ISimpleApiClient client)
 
         static Regex CreateRoute(string route)
         {
-            // Build RegEx from route (:foo to named group (?<foo>[\w_.-]+)).
-            var routeFormat = "^" + new Regex("(:([a-z]+))\\b").Replace(route, @"(?<$2>[\w_.-]+)") + "$";
+            // Build RegEx from route (:foo to named group (?<foo>[\w_.\-=]+)).
+            var routeFormat = "^" + new Regex("(:([a-z]+))\\b").Replace(route, @"(?<$2>[\w_.\-=]+)") + "$";
             return new Regex(routeFormat, RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase);
         }
     }