Merge pull request #2145 from github/pull-request-status-circle

StanleyGoldman · web-flow · commit 7a69a150fad1 · 2019-02-01T09:02:05.000-05:00
Adding a Pull Request status circle User Control
diff --git a/src/GitHub.App/SampleData/PullRequestListItemViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestListItemViewModelDesigner.cs
@@ -17,6 +17,9 @@ public class PullRequestListItemViewModelDesigner : ViewModelBase, IPullRequestL
         public int Number { get; set; }
         public string Title { get; set; }
         public DateTimeOffset UpdatedAt { get; set; }
-        public PullRequestChecksState Checks { get; set; }
+        public PullRequestChecksSummaryState ChecksSummary { get; set; }
+        public int ChecksPendingCount { get; set; }
+        public int ChecksSuccessCount { get; set; }
+        public int ChecksErrorCount { get; set; }
     }
 }
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -223,64 +223,65 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                 item.Reviews = null;
 
                 var checkRuns = item.LastCommit?.CheckSuites?.SelectMany(model => model.CheckRuns).ToArray();
+                var statuses = item.LastCommit?.Statuses;
 
-                var hasCheckRuns = checkRuns?.Any() ?? false;
-                var hasStatuses = item.LastCommit?.Statuses?.Any() ?? false;
+                var totalCount = 0;
+                var pendingCount = 0;
+                var successCount = 0;
+                var errorCount = 0;
 
-                if (!hasCheckRuns && !hasStatuses)
+                if (checkRuns != null)
                 {
-                    item.Checks = PullRequestChecksState.None;
+                    totalCount += checkRuns.Length;
+
+                    pendingCount += checkRuns.Count(model => model.Status != CheckStatusState.Completed);
+
+                    successCount += checkRuns.Count(model => model.Status == CheckStatusState.Completed &&
+                                                                        model.Conclusion.HasValue &&
+                                                                        (model.Conclusion == CheckConclusionState.Success ||
+                                                                         model.Conclusion == CheckConclusionState.Neutral));
+                    errorCount += checkRuns.Count(model => model.Status == CheckStatusState.Completed &&
+                                                                        model.Conclusion.HasValue &&
+                                                                        !(model.Conclusion == CheckConclusionState.Success ||
+                                                                         model.Conclusion == CheckConclusionState.Neutral));
                 }
-                else
-                {
-                    var checksHasFailure = false;
-                    var checksHasCompleteSuccess = true;
 
-                    if (hasCheckRuns)
-                    {
-                        checksHasFailure = checkRuns
-                            .Any(model => model.Conclusion.HasValue
-                                          && (model.Conclusion.Value == CheckConclusionState.Failure
-                                              || model.Conclusion.Value == CheckConclusionState.ActionRequired));
+                if (statuses != null)
+                {
+                    totalCount += statuses.Count;
 
-                        if (!checksHasFailure)
-                        {
-                            checksHasCompleteSuccess = checkRuns
-                                .All(model => model.Conclusion.HasValue
-                                              && (model.Conclusion.Value == CheckConclusionState.Success
-                                                  || model.Conclusion.Value == CheckConclusionState.Neutral));
-                        }
-                    }
+                    pendingCount += statuses.Count(model =>
+                        model.State == StatusState.Pending || model.State == StatusState.Expected);
 
-                    var statusHasFailure = false;
-                    var statusHasCompleteSuccess = true;
+                    successCount += statuses.Count(model => model.State == StatusState.Success);
 
-                    if (!checksHasFailure && hasStatuses)
-                    {
-                        statusHasFailure = item.LastCommit
-                            .Statuses
-                            .Any(status => status.State == StatusState.Failure
-                                           || status.State == StatusState.Error);
+                    errorCount += statuses.Count(model =>
+                        model.State == StatusState.Error || model.State == StatusState.Failure);
+                }
 
-                        if (!statusHasFailure)
-                        {
-                            statusHasCompleteSuccess =
-                                item.LastCommit.Statuses.All(status => status.State == StatusState.Success);
-                        }
-                    }
+                item.ChecksPendingCount = pendingCount;
+                item.ChecksSuccessCount = successCount;
+                item.ChecksErrorCount = errorCount;
 
-                    if (checksHasFailure || statusHasFailure)
-                    {
-                        item.Checks = PullRequestChecksState.Failure;
-                    }
-                    else if (statusHasCompleteSuccess && checksHasCompleteSuccess)
-                    {
-                        item.Checks = PullRequestChecksState.Success;
-                    }
-                    else
-                    {
-                        item.Checks = PullRequestChecksState.Pending;
-                    }
+                if (totalCount == 0)
+                {
+                    item.ChecksSummary = PullRequestChecksSummaryState.None;
+                }
+                else if (totalCount == pendingCount)
+                {
+                    item.ChecksSummary = PullRequestChecksSummaryState.Pending;
+                }
+                else if (totalCount == successCount)
+                {
+                    item.ChecksSummary = PullRequestChecksSummaryState.Success;
+                }
+                else if (totalCount == errorCount)
+                {
+                    item.ChecksSummary = PullRequestChecksSummaryState.Failure;
+                }
+                else
+                {
+                    item.ChecksSummary = PullRequestChecksSummaryState.Mixed;
                 }
 
                 item.LastCommit = null;
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestListItemViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestListItemViewModel.cs
@@ -19,7 +19,10 @@ public PullRequestListItemViewModel(PullRequestListItemModel model)
         {
             Id = model.Id;
             Author = new ActorViewModel(model.Author);
-            Checks = model.Checks;
+            ChecksSummary = model.ChecksSummary;
+            ChecksErrorCount = model.ChecksErrorCount;
+            ChecksPendingCount = model.ChecksPendingCount;
+            ChecksSuccessCount = model.ChecksSuccessCount;
             CommentCount = model.CommentCount;
             Number = model.Number;
             Title = model.Title;
@@ -33,7 +36,16 @@ public PullRequestListItemViewModel(PullRequestListItemModel model)
         public IActorViewModel Author { get; }
 
         /// <inheritdoc/>
-        public PullRequestChecksState Checks { get; }
+        public PullRequestChecksSummaryState ChecksSummary { get; }
+
+        /// <inheritdoc/>
+        public int ChecksSuccessCount { get; }
+
+        /// <inheritdoc/>
+        public int ChecksPendingCount { get; }
+
+        /// <inheritdoc/>
+        public int ChecksErrorCount { get; }
 
         /// <inheritdoc/>
         public int CommentCount { get; }
diff --git a/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListItemViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListItemViewModel.cs
@@ -32,6 +32,21 @@ public interface IPullRequestListItemViewModel : IIssueListItemViewModelBase
         /// <summary>
         /// Gets the pull request checks and statuses summary
         /// </summary>
-        PullRequestChecksState Checks { get; }
+        PullRequestChecksSummaryState ChecksSummary { get; }
+
+        /// <summary>
+        /// Gets the number of pending checks and statuses
+        /// </summary>
+        int ChecksPendingCount { get; }
+
+        /// <summary>
+        /// Gets the number of successful checks and statuses
+        /// </summary>
+        int ChecksSuccessCount { get; }
+
+        /// <summary>
+        /// Gets the number of erroneous checks and statuses
+        /// </summary>
+        int ChecksErrorCount { get; }
     }
 }
diff --git a/src/GitHub.Exports/Models/IPullRequestModel.cs b/src/GitHub.Exports/Models/IPullRequestModel.cs
@@ -13,9 +13,10 @@ public enum PullRequestStateEnum
         Merged,
     }
 
-    public enum PullRequestChecksState
+    public enum PullRequestChecksSummaryState
     {
         None,
+        Mixed,
         Pending,
         Success,
         Failure
diff --git a/src/GitHub.Exports/Models/PullRequestListItemModel.cs b/src/GitHub.Exports/Models/PullRequestListItemModel.cs
@@ -40,7 +40,22 @@ public class PullRequestListItemModel
         /// <summary>
         /// Gets the pull request checks and statuses summary
         /// </summary>
-        public PullRequestChecksState Checks { get; set; }
+        public PullRequestChecksSummaryState ChecksSummary { get; set; }
+
+        /// <summary>
+        /// Gets the number of pending checks and statuses
+        /// </summary>
+        public int ChecksPendingCount { get; set; }
+
+        /// <summary>
+        /// Gets the number of successful checks and statuses
+        /// </summary>
+        public int ChecksSuccessCount { get; set; }
+
+        /// <summary>
+        /// Gets the number of erroneous checks and statuses
+        /// </summary>
+        public int ChecksErrorCount { get; set; }
 
         /// <summary>
         /// Gets or sets the date/time at which the pull request was last updated.
diff --git a/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml b/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml
@@ -0,0 +1,53 @@
+﻿<UserControl x:Class="GitHub.VisualStudio.UI.Controls.PullRequestStatusCircle"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="250" d:DesignWidth="250">
+    <Grid>
+        <Polygon Grid.Row="0" Grid.Column="0" Name="PendingPolygon" 
+                     StrokeThickness="0" Fill="Yellow" 
+                     Points="0,0 250,0 250,250 0,250">
+            <Polygon.Clip>
+                <CombinedGeometry GeometryCombineMode="Exclude">
+                    <CombinedGeometry.Geometry1>
+                        <EllipseGeometry Center="125 125" RadiusX="125" RadiusY="125" />
+                    </CombinedGeometry.Geometry1>
+                    <CombinedGeometry.Geometry2>
+                        <EllipseGeometry Center="125 125" RadiusX="100" RadiusY="100" />
+                    </CombinedGeometry.Geometry2>
+                </CombinedGeometry>
+            </Polygon.Clip>
+        </Polygon>
+        <Polygon Grid.Row="0" Grid.Column="0" Name="SuccessPolygon"
+                     StrokeThickness="0" Fill="Green"
+                     Points="125,125 125,0 250,0 250,250 0,250 0,216.50635094611">
+            <Polygon.Clip>
+                <CombinedGeometry GeometryCombineMode="Exclude">
+                    <CombinedGeometry.Geometry1>
+                        <EllipseGeometry Center="125 125" RadiusX="125" RadiusY="125" />
+                    </CombinedGeometry.Geometry1>
+                    <CombinedGeometry.Geometry2>
+                        <EllipseGeometry Center="125 125" RadiusX="100" RadiusY="100" />
+                    </CombinedGeometry.Geometry2>
+                </CombinedGeometry>
+            </Polygon.Clip>
+        </Polygon>
+        <Polygon Grid.Row="0" Grid.Column="0" Name="ErrorPolygon"
+                     StrokeThickness="0" Fill="Red" 
+                     Points="125,125 125,0 250,0 250,197.168783648703">
+            <Polygon.Clip>
+                <CombinedGeometry GeometryCombineMode="Exclude">
+                    <CombinedGeometry.Geometry1>
+                        <EllipseGeometry Center="125 125" RadiusX="125" RadiusY="125" />
+                    </CombinedGeometry.Geometry1>
+                    <CombinedGeometry.Geometry2>
+                        <EllipseGeometry Center="125 125" RadiusX="100" RadiusY="100" />
+                    </CombinedGeometry.Geometry2>
+                </CombinedGeometry>
+            </Polygon.Clip>
+        </Polygon>
+    </Grid>
+</UserControl>
diff --git a/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs b/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs
diff --git a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ public class PullRequestListItemViewModelDesigner : ViewModelBase, IPullRequestL`
`17`	`17`	`public int Number { get; set; }`
`18`	`18`	`public string Title { get; set; }`
`19`	`19`	`public DateTimeOffset UpdatedAt { get; set; }`
`20`		`- public PullRequestChecksState Checks { get; set; }`
	`20`	`+ public PullRequestChecksSummaryState ChecksSummary { get; set; }`
	`21`	`+ public int ChecksPendingCount { get; set; }`
	`22`	`+ public int ChecksSuccessCount { get; set; }`
	`23`	`+ public int ChecksErrorCount { get; set; }`
`21`	`24`	`}`
`22`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@ public enum PullRequestStateEnum`
`13`	`13`	`Merged,`
`14`	`14`	`}`
`15`	`15`
`16`		`- public enum PullRequestChecksState`
	`16`	`+ public enum PullRequestChecksSummaryState`
`17`	`17`	`{`
`18`	`18`	`None,`
	`19`	`+ Mixed,`
`19`	`20`	`Pending,`
`20`	`21`	`Success,`
`21`	`22`	`Failure`