Functionality to display Checks on PullRequestDetailView

StanleyGoldman · StanleyGoldman · commit 9c60db13d9df · 2018-07-23T12:54:08.000-04:00
diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -268,6 +268,7 @@
     <Compile Include="ViewModels\GitHubPane\NotAGitRepositoryViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestReviewAuthoringViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestReviewCommentViewModel.cs" />
+    <Compile Include="ViewModels\GitHubPane\PullRequestCheckViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestReviewSummaryViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestReviewViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestUserReviewsViewModel.cs" />
diff --git a/src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs
@@ -95,6 +95,36 @@ public PullRequestDetailViewModelDesigner()
             };
 
             Files = new PullRequestFilesViewModelDesigner();
+
+            var defaultAvatar = "pack://application:,,,/GitHub.App;component/Images/default_user_avatar.png";
+
+            Checks = new[]
+            {
+                new PullRequestCheckViewModel
+                {
+                    Title = "continuous-integration/appveyor/branch",
+                    Description = "AppVeyor build succeeded",
+                    Status = PullRequestCheckStatusEnum.Success,
+                    AvatarUrl = defaultAvatar,
+                    Avatar = AvatarProvider.CreateBitmapImage(defaultAvatar),
+                },
+                new PullRequestCheckViewModel
+                {
+                    Title = "continuous-integration/appveyor/pr",
+                    Description = "AppVeyor building",
+                    Status = PullRequestCheckStatusEnum.Pending,
+                    AvatarUrl = defaultAvatar,
+                    Avatar = AvatarProvider.CreateBitmapImage(defaultAvatar),
+                },
+                new PullRequestCheckViewModel
+                {
+                    Title = "continuous-integration/appveyor/other",
+                    Description = "AppVeyor build failed",
+                    Status = PullRequestCheckStatusEnum.Failure,
+                    AvatarUrl = defaultAvatar,
+                    Avatar = AvatarProvider.CreateBitmapImage(defaultAvatar),
+                },
+            };
         }
 
         public PullRequestDetailModel Model { get; }
@@ -123,6 +153,8 @@ public PullRequestDetailViewModelDesigner()
         public ReactiveCommand<object> OpenOnGitHub { get; }
         public ReactiveCommand<object> ShowReview { get; }
 
+        public IReadOnlyList<IPullRequestCheckViewModel> Checks { get; }
+
         public Task InitializeAsync(ILocalRepositoryModel localRepository, IConnection connection, string owner, string repo, int number) => Task.CompletedTask;
 
         public string GetLocalFilePath(IPullRequestFileNode file)
diff --git a/src/GitHub.App/Services/ChecksService.cs b/src/GitHub.App/Services/ChecksService.cs
@@ -71,15 +71,15 @@ public async Task<List<CheckSuiteModel>> ReadCheckSuites(
                         commit => commit.Commit.CheckSuites(null,null, null,null, null).AllPages()
                             .Select(suite => new CheckSuiteModel
                             {
-                                Conclusion = (CheckConclusionStateEnum?) suite.Conclusion,
-                                Status = (CheckStatusStateEnum) suite.Status,
+                                Conclusion = (CheckSuiteConclusionStateEnum?) suite.Conclusion,
+                                Status = (CheckSuiteStatusStateEnum) suite.Status,
                                 CreatedAt = suite.CreatedAt,
                                 UpdatedAt = suite.UpdatedAt,
                                 CheckRuns = suite.CheckRuns(null, null, null, null, null).AllPages()
                                     .Select(run => new CheckRunModel
                                     {
-                                        Conclusion = (CheckConclusionStateEnum?) run.Conclusion,
-                                        Status = (CheckStatusStateEnum) run.Status,
+                                        Conclusion = (CheckSuiteConclusionStateEnum?) run.Conclusion,
+                                        Status = (CheckSuiteStatusStateEnum) run.Status,
                                         StartedAt = run.StartedAt,
                                         CompletedAt = run.CompletedAt,
                                         Annotations = run.Annotations(null, null, null, null).AllPages()
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -164,17 +164,17 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                     {
                         checksHasFailure = item.LastCommit
                             .CheckSuites.Any(model => model.Conclusion.HasValue
-                                                      && (model.Conclusion.Value == CheckConclusionStateEnum.Failure
+                                                      && (model.Conclusion.Value == CheckSuiteConclusionStateEnum.Failure
                                                           || model.Conclusion.Value ==
-                                                          CheckConclusionStateEnum.ActionRequired));
+                                                          CheckSuiteConclusionStateEnum.ActionRequired));
 
                         if (!checksHasFailure)
                         {
                             checksHasCompleteSuccess = item.LastCommit
                                 .CheckSuites.All(model => model.Conclusion.HasValue
-                                                          && (model.Conclusion.Value == CheckConclusionStateEnum.Success
+                                                          && (model.Conclusion.Value == CheckSuiteConclusionStateEnum.Success
                                                               || model.Conclusion.Value ==
-                                                              CheckConclusionStateEnum.Neutral));
+                                                              CheckSuiteConclusionStateEnum.Neutral));
                         }
                     }
 
@@ -942,9 +942,9 @@ class LastCommitSummaryModel
 
         class CheckSuiteSummaryModel
         {
-            public CheckConclusionStateEnum? Conclusion { get; set; }
+            public CheckSuiteConclusionStateEnum? Conclusion { get; set; }
 
-            public CheckStatusStateEnum Status { get; set; }
+            public CheckSuiteStatusStateEnum Status { get; set; }
         }
     }
 
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs
@@ -0,0 +1,68 @@
+﻿using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Windows.Media.Imaging;
+using GitHub.Models;
+using GitHub.Services;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    [Export(typeof(IPullRequestCheckViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public class PullRequestCheckViewModel: IPullRequestCheckViewModel
+    {
+        const string DefaultAvatar = "pack://application:,,,/GitHub.App;component/Images/default_user_avatar.png";
+
+        public static IEnumerable<PullRequestCheckViewModel> Build(PullRequestDetailModel pullRequest)
+        {
+            return pullRequest.Statuses?.Select(model =>
+            {
+                var statusStateEnum = model.State;
+
+                PullRequestCheckStatusEnum checkStatus;
+                switch (statusStateEnum)
+                {
+                    case StatusStateEnum.Expected:
+                    case StatusStateEnum.Error:
+                    case StatusStateEnum.Failure:
+                        checkStatus = PullRequestCheckStatusEnum.Failure;
+                        break;
+                    case StatusStateEnum.Pending:
+                        checkStatus = PullRequestCheckStatusEnum.Pending;
+                        break;
+                    case StatusStateEnum.Success:
+                        checkStatus = PullRequestCheckStatusEnum.Success;
+                        break;
+                    default:
+                        throw new InvalidOperationException("Unkown PullRequestCheckStatusEnum");
+                }
+                
+                return new PullRequestCheckViewModel
+                {
+                    Title = model.Context,
+                    Description = model.Description,
+                    Status = checkStatus,
+                    DetailsUrl = model.TargetUrl,
+                    AvatarUrl = model.AvatarUrl ?? DefaultAvatar,
+                    Avatar = model.AvatarUrl != null
+                        ? new BitmapImage(new Uri(model.AvatarUrl))
+                        : AvatarProvider.CreateBitmapImage(DefaultAvatar)
+                };
+
+            }) ?? new PullRequestCheckViewModel[0];
+        }
+
+        public string Title { get; set; }
+
+        public string Description { get; set; }
+
+        public PullRequestCheckStatusEnum Status { get; set; }
+
+        public string DetailsUrl { get; set; }
+
+        public string AvatarUrl { get; set; }
+
+        public BitmapImage Avatar { get; set; }
+    }
+}
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs
@@ -56,6 +56,7 @@ public sealed class PullRequestDetailViewModel : PanePageViewModelBase, IPullReq
         bool refreshOnActivate;
         Uri webUrl;
         IDisposable sessionSubscription;
+        IReadOnlyList<IPullRequestCheckViewModel> checks;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PullRequestDetailViewModel"/> class.
@@ -305,6 +306,12 @@ public Uri WebUrl
         /// </summary>
         public ReactiveCommand<object> ShowReview { get; }
 
+        public IReadOnlyList<IPullRequestCheckViewModel> Checks
+        {
+            get { return checks; }
+            private set { this.RaiseAndSetIfChanged(ref checks, value); }
+        }
+
         /// <summary>
         /// Initializes the view model.
         /// </summary>
@@ -380,6 +387,8 @@ public async Task Load(PullRequestDetailModel pullRequest)
                 Body = !string.IsNullOrWhiteSpace(pullRequest.Body) ? pullRequest.Body : Resources.NoDescriptionProvidedMarkdown;
                 Reviews = PullRequestReviewSummaryViewModel.BuildByUser(Session.User, pullRequest).ToList();
 
+                Checks = PullRequestCheckViewModel.Build(pullRequest)?.ToList();
+
                 await Files.InitializeAsync(Session);
 
                 var localBranches = await pullRequestsService.GetLocalBranches(LocalRepository, pullRequest).ToList();
diff --git a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj
@@ -205,6 +205,7 @@
     <Compile Include="ViewModels\GitHubPane\ILoggedOutViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\INavigationViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPanePageViewModel.cs" />
+    <Compile Include="ViewModels\GitHubPane\IPullRequestCheckViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPullRequestFilesViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPullRequestListItemViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPullRequestListViewModel.cs" />
diff --git a/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestCheckViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestCheckViewModel.cs
@@ -0,0 +1,22 @@
+﻿using System.Windows.Media.Imaging;
+using GitHub.Models;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    public interface IPullRequestCheckViewModel
+    {
+        string Title { get; set; }
+        string Description { get; set; }
+        PullRequestCheckStatusEnum Status { get; set; }
+        string DetailsUrl { get; set; }
+        string AvatarUrl { get; set; }
+        BitmapImage Avatar { get; set; }
+    }
+
+    public enum PullRequestCheckStatusEnum
+    {
+        Pending,
+        Success,
+        Failure
+    }
+}
diff --git a/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestDetailViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestDetailViewModel.cs
@@ -175,6 +175,8 @@ public interface IPullRequestDetailViewModel : IPanePageViewModel, IOpenInBrowse
         /// </summary>
         ReactiveCommand<object> ShowReview { get; }
 
+        IReadOnlyList<IPullRequestCheckViewModel> Checks { get; }
+
         /// <summary>
         /// Initializes the view model.
         /// </summary>
diff --git a/src/GitHub.Exports/Models/CheckConclusionStateEnum.cs b/src/GitHub.Exports/Models/CheckConclusionStateEnum.cs
@@ -1,6 +1,6 @@
 ﻿namespace GitHub.Models
 {
-    public enum CheckConclusionStateEnum
+    public enum CheckSuiteConclusionStateEnum
     {
         ActionRequired,
         TimedOut,
diff --git a/src/GitHub.Exports/Models/CheckRunModel.cs b/src/GitHub.Exports/Models/CheckRunModel.cs
@@ -5,9 +5,9 @@ namespace GitHub.Models
 {
     public class CheckRunModel
     {
-        public CheckConclusionStateEnum? Conclusion { get; set; }
+        public CheckSuiteConclusionStateEnum? Conclusion { get; set; }
 
-        public CheckStatusStateEnum Status { get; set; }
+        public CheckSuiteStatusStateEnum Status { get; set; }
 
         public DateTimeOffset? StartedAt { get; set; }
 
diff --git a/src/GitHub.Exports/Models/CheckStatusStateEnum.cs b/src/GitHub.Exports/Models/CheckStatusStateEnum.cs
@@ -1,6 +1,6 @@
 ﻿namespace GitHub.Models
 {
-    public enum CheckStatusStateEnum
+    public enum CheckSuiteStatusStateEnum
     {
         Requested,
         Queued,
diff --git a/src/GitHub.Exports/Models/CheckSuiteModel.cs b/src/GitHub.Exports/Models/CheckSuiteModel.cs
@@ -3,14 +3,6 @@
 
 namespace GitHub.Models
 {
-    public class LastCommitModel
-    {
-        public string Id { get; set; }
-        public List<CheckSuiteModel> CheckSuites { get; set; }
-
-        public List<StatusModel> Statuses { get; set; }
-    }
-
     public enum StatusStateEnum
     {
         Expected,
@@ -29,13 +21,15 @@ public class StatusModel
         public string TargetUrl { get; set; }
 
         public string Description { get; set; }
+
+        public string AvatarUrl { get; set; }
     }
 
     public class CheckSuiteModel
     {
-        public CheckConclusionStateEnum? Conclusion { get; set; }
+        public CheckSuiteConclusionStateEnum? Conclusion { get; set; }
 
-        public CheckStatusStateEnum Status { get; set; }
+        public CheckSuiteStatusStateEnum Status { get; set; }
 
         public DateTimeOffset CreatedAt { get; set; }
 
diff --git a/src/GitHub.Exports/Models/PullRequestDetailModel.cs b/src/GitHub.Exports/Models/PullRequestDetailModel.cs
@@ -92,6 +92,8 @@ public class PullRequestDetailModel
         /// </remarks>
         public IReadOnlyList<PullRequestReviewThreadModel> Threads { get; set; }
 
-        public LastCommitModel LastCommit { get; set; }
+        public List<CheckSuiteModel> CheckSuites { get; set; }
+
+        public List<StatusModel> Statuses { get; set; }
     }
 }
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -38,7 +38,7 @@ public class PullRequestSessionService : IPullRequestSessionService
     {
         static readonly ILogger log = LogManager.ForContext<PullRequestSessionService>();
         static ICompiledQuery<PullRequestDetailModel> readPullRequest;
-        static ICompiledQuery<IEnumerable<LastCommitModel>> readCheckSuites;
+        static ICompiledQuery<IEnumerable<LastCommitAdapter>> readCheckSuites;
         static ICompiledQuery<ActorModel> readViewer;
 
         readonly IGitService gitService;
@@ -340,9 +340,10 @@ public virtual async Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddr
 
             var apiClient = await apiClientFactory.Create(address);
             var files = await apiClient.GetPullRequestFiles(owner, name, number).ToList();
-            var lastCommitModel = await GetPullRequestLastCommitModel(address, owner, name, number);
+            var lastCommitModel = await GetPullRequestLastCommitAdapter(address, owner, name, number);
 
-            result.LastCommit = lastCommitModel;
+            result.Statuses = lastCommitModel.Statuses;
+            result.CheckSuites = lastCommitModel.CheckSuites;
 
             result.ChangedFiles = files.Select(file => new PullRequestFileModel
             {
@@ -355,16 +356,15 @@ public virtual async Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddr
             return result;
         }
 
-        private async Task<LastCommitModel> GetPullRequestLastCommitModel(HostAddress address, string owner, string name, int number)
+        private async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress address, string owner, string name, int number)
         {
             if(readCheckSuites == null)
             {
                 readCheckSuites = new Query()
                 .Repository(Var(nameof(owner)), Var(nameof(name)))
                 .PullRequest(Var(nameof(number))).Commits(last: 1).Nodes.Select(
-                    commit => new LastCommitModel
+                    commit => new LastCommitAdapter
                     {
-                        Id = commit.Commit.Id.Value,
 //                        CheckSuites = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
 //                            .Select(suite => new CheckSuiteModel
 //                            {
@@ -400,7 +400,8 @@ private async Task<LastCommitModel> GetPullRequestLastCommitModel(HostAddress ad
                                     State = (StatusStateEnum)statusContext.State,
                                     Context = statusContext.Context,
                                     TargetUrl = statusContext.TargetUrl,
-                                    Description = statusContext.Description
+                                    Description = statusContext.Description,
+                                    AvatarUrl = statusContext.Creator.AvatarUrl(null)
                                 }).ToList()
                             ).SingleOrDefault()
                     }
@@ -890,5 +891,12 @@ class CommentAdapter : PullRequestReviewCommentModel
             public string OriginalCommitId { get; set; }
             public string ReplyTo { get; set; }
         }
-    }
+
+        class LastCommitAdapter
+        {
+            public List<CheckSuiteModel> CheckSuites { get; set; }
+
+            public List<StatusModel> Statuses { get; set; }
+        }
+    }   
 }
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml.cs b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml

Original file line number	Diff line number	Diff line change
`@@ -164,17 +164,17 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(`
`164`	`164`	`{`
`165`	`165`	`checksHasFailure = item.LastCommit`
`166`	`166`	`.CheckSuites.Any(model => model.Conclusion.HasValue`
`167`		`- && (model.Conclusion.Value == CheckConclusionStateEnum.Failure`
	`167`	`+ && (model.Conclusion.Value == CheckSuiteConclusionStateEnum.Failure`
`168`	`168`	`\|\| model.Conclusion.Value ==`
`169`		`- CheckConclusionStateEnum.ActionRequired));`
	`169`	`+ CheckSuiteConclusionStateEnum.ActionRequired));`
`170`	`170`
`171`	`171`	`if (!checksHasFailure)`
`172`	`172`	`{`
`173`	`173`	`checksHasCompleteSuccess = item.LastCommit`
`174`	`174`	`.CheckSuites.All(model => model.Conclusion.HasValue`
`175`		`- && (model.Conclusion.Value == CheckConclusionStateEnum.Success`
	`175`	`+ && (model.Conclusion.Value == CheckSuiteConclusionStateEnum.Success`
`176`	`176`	`\|\| model.Conclusion.Value ==`
`177`		`- CheckConclusionStateEnum.Neutral));`
	`177`	`+ CheckSuiteConclusionStateEnum.Neutral));`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`@@ -942,9 +942,9 @@ class LastCommitSummaryModel`
`942`	`942`
`943`	`943`	`class CheckSuiteSummaryModel`
`944`	`944`	`{`
`945`		`- public CheckConclusionStateEnum? Conclusion { get; set; }`
	`945`	`+ public CheckSuiteConclusionStateEnum? Conclusion { get; set; }`
`946`	`946`
`947`		`- public CheckStatusStateEnum Status { get; set; }`
	`947`	`+ public CheckSuiteStatusStateEnum Status { get; set; }`
`948`	`948`	`}`
`949`	`949`	`}`
`950`	`950`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace GitHub.Models`
`2`	`2`	`{`
`3`		`- public enum CheckConclusionStateEnum`
	`3`	`+ public enum CheckSuiteConclusionStateEnum`
`4`	`4`	`{`
`5`	`5`	`ActionRequired,`
`6`	`6`	`TimedOut,`