Merge pull request #1864 from github/features/check-suite-annotations

Check Run Annotations

Author: grokys

lib/Octokit.GraphQL.0.1.1-beta.nupkg

@@ -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.Api/GitHub.Api.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/GitHub.App.csproj

@@ -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/CommentThreadViewModelDesigner.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/InlineAnnotationViewModelDesigner.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/PullRequestAnnotationItemViewModelDesigner.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/PullRequestAnnotationsViewModelDesigner.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/PullRequestCheckViewModelDesigner.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/PullRequestDetailViewModelDesigner.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,