Functionality to display the cirlce for non uniform states

Author: StanleyGoldman

src/GitHub.App/SampleData/PullRequestListItemViewModelDesigner.cs

@@ -17,7 +17,7 @@ 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; }

src/GitHub.App/Services/PullRequestService.cs

@@ -219,71 +219,15 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                 var checkRuns = item.LastCommit?.CheckSuites?.SelectMany(model => model.CheckRuns).ToArray();
                 var statuses = item.LastCommit?.Statuses;
 
-                var hasCheckRuns = checkRuns?.Any() ?? false;
-                var hasStatuses = statuses?.Any() ?? false;
-
-                if (!hasCheckRuns && !hasStatuses)
-                {
-                    item.Checks = PullRequestChecksState.None;
-                }
-                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 (!checksHasFailure)
-                        {
-                            checksHasCompleteSuccess = checkRuns
-                                .All(model => model.Conclusion.HasValue
-                                              && (model.Conclusion.Value == CheckConclusionState.Success
-                                                  || model.Conclusion.Value == CheckConclusionState.Neutral));
-                        }
-                    }
-
-                    var statusHasFailure = false;
-                    var statusHasCompleteSuccess = true;
-
-                    if (!checksHasFailure && hasStatuses)
-                    {
-                        statusHasFailure = item.LastCommit
-                            .Statuses
-                            .Any(status => status.State == StatusState.Failure
-                                           || status.State == StatusState.Error);
-
-                        if (!statusHasFailure)
-                        {
-                            statusHasCompleteSuccess =
-                                item.LastCommit.Statuses.All(status => status.State == StatusState.Success);
-                        }
-                    }
-
-                    if (checksHasFailure || statusHasFailure)
-                    {
-                        item.Checks = PullRequestChecksState.Failure;
-                    }
-                    else if (statusHasCompleteSuccess && checksHasCompleteSuccess)
-                    {
-                        item.Checks = PullRequestChecksState.Success;
-                    }
-                    else
-                    {
-                        item.Checks = PullRequestChecksState.Pending;
-                    }
-                }
-
+                var totalCount = 0;
                 var pendingCount = 0;
                 var successCount = 0;
                 var errorCount = 0;
 
                 if (checkRuns != null)
                 {
+                    totalCount += checkRuns.Length;
+
                     pendingCount += checkRuns.Count(model => model.Status != CheckStatusState.Completed);
 
                     successCount += checkRuns.Count(model => model.Status == CheckStatusState.Completed &&
@@ -298,6 +242,8 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
 
                 if (statuses != null)
                 {
+                    totalCount += statuses.Count;
+
                     pendingCount += statuses.Count(model =>
                         model.State == StatusState.Pending || model.State == StatusState.Expected);
 
@@ -311,6 +257,27 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                 item.ChecksSuccessCount = successCount;
                 item.ChecksErrorCount = errorCount;
 
+                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;
             }
 

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

@@ -19,7 +19,7 @@ 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;
@@ -36,7 +36,7 @@ public PullRequestListItemViewModel(PullRequestListItemModel model)
         public IActorViewModel Author { get; }
 
         /// <inheritdoc/>
-        public PullRequestChecksState Checks { get; }
+        public PullRequestChecksSummaryState ChecksSummary { get; }
 
         /// <inheritdoc/>
         public int ChecksSuccessCount { get; }

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListItemViewModel.cs

@@ -32,7 +32,7 @@ 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

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

src/GitHub.Exports/Models/PullRequestListItemModel.cs

@@ -40,7 +40,7 @@ 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

src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs

@@ -41,6 +41,18 @@ public partial class PullRequestStatusCircle : UserControl
             "InnerRadius", typeof(double), typeof(PullRequestStatusCircle),
             new PropertyMetadata((double)200, (d, args) => ((PullRequestStatusCircle)d).InnerRadius = (double)args.NewValue));
 
+        public static readonly DependencyProperty PendingColorProperty = DependencyProperty.Register(
+            "PendingColor", typeof(Brush), typeof(PullRequestStatusCircle),
+            new PropertyMetadata(Brushes.Yellow, (d, args) => ((PullRequestStatusCircle)d).PendingColor = (Brush)args.NewValue));
+
+        public static readonly DependencyProperty ErrorColorProperty = DependencyProperty.Register(
+            "ErrorColor", typeof(Brush), typeof(PullRequestStatusCircle),
+            new PropertyMetadata(Brushes.Red, (d, args) => ((PullRequestStatusCircle)d).ErrorColor = (Brush)args.NewValue));
+
+        public static readonly DependencyProperty SuccessColorProperty = DependencyProperty.Register(
+            "SuccessColor", typeof(Brush), typeof(PullRequestStatusCircle),
+            new PropertyMetadata(Brushes.Green, (d, args) => ((PullRequestStatusCircle)d).SuccessColor = (Brush)args.NewValue));
+
         public IEnumerable<Point> GeneratePoints(float percentage)
         {
             double ToRadians(float val)
@@ -242,6 +254,36 @@ public double InnerRadius
             }
         }
 
+        public Brush PendingColor
+        {
+            get => (Brush)GetValue(PendingColorProperty);
+            set
+            {
+                SetValue(PendingColorProperty, value);
+                PendingPolygon.Fill = value;
+            }
+        }
+
+        public Brush ErrorColor
+        {
+            get => (Brush)GetValue(ErrorColorProperty);
+            set
+            {
+                SetValue(ErrorColorProperty, value);
+                ErrorPolygon.Fill = value;
+            }
+        }
+
+        public Brush SuccessColor
+        {
+            get => (Brush)GetValue(SuccessColorProperty);
+            set
+            {
+                SetValue(SuccessColorProperty, value);
+                SuccessPolygon.Fill = value;
+            }
+        }
+
         protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
         {
             base.OnRenderSizeChanged(sizeInfo);

src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml

@@ -14,7 +14,7 @@
                                                     CommentCount="4"
                                                     IsCurrent="True"
                                                     UpdatedAt="2018-01-29"
-                                                    Checks="Success">
+                                                    ChecksSummary="Success">
             <ghfvs:PullRequestListItemViewModelDesigner.Author>
                 <ghfvs:ActorViewModelDesigner Login="shana"/>
             </ghfvs:PullRequestListItemViewModelDesigner.Author>
@@ -99,12 +99,19 @@
                 <TextBlock Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 0 4 0" Visibility="{Binding CommentCount, Converter={ghfvs:CountToVisibilityConverter}}"> <ghfvs:OcticonImage Icon="comment" Width="12" Height="12" Margin="0 0 0 -2"/>
                     <Run Text="{Binding CommentCount, Mode=OneWay}" BaselineAlignment="Bottom"/>
                 </TextBlock>
+                <ghfvs:OcticonImage Icon="check" Foreground="#2cbe4e" Visibility="{Binding ChecksSummary, Converter={ghfvs:EqualsToVisibilityConverter Success}}"/>
+                <ghfvs:OcticonImage Icon="x" Foreground="#cb2431" Visibility="{Binding ChecksSummary, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
+                <ghfvs:OcticonImage Icon="primitive_dot" Foreground="#f1c647" Visibility="{Binding ChecksSummary, Converter={ghfvs:EqualsToVisibilityConverter Pending}}"/>
                 <controls:PullRequestStatusCircle 
                     Height="18" Width="18"
                     Radius="8" InnerRadius="3"
+                    Visibility="{Binding ChecksSummary, Converter={ghfvs:EqualsToVisibilityConverter Mixed}}"
                     PendingCount="{Binding ChecksPendingCount}"
+                    PendingColor="#f1c647"
                     ErrorCount="{Binding ChecksErrorCount}"
+                    ErrorColor="#cb2431"
                     SuccessCount="{Binding ChecksSuccessCount}"
+                    SuccessColor="#2cbe4e"
                     />
             </StackPanel>
         </Grid>