Merge branch 'features/check-suite-annotations' into features/check-suite-annotations-inline

StanleyGoldman · StanleyGoldman · commit 9dcae6ee87ed · 2018-09-13T14:29:46.000-04:00
# Conflicts:
#	src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationsViewModel.cs
diff --git a/lib/Octokit.GraphQL.0.1.2-beta.nupkg b/lib/Octokit.GraphQL.0.1.2-beta.nupkg
diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -28,6 +28,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
+    <PackageReference Include="Octokit.GraphQL" Version="0.1.2-beta" />
   </ItemGroup>
 </Project>
diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -59,7 +59,7 @@
     <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="10.0.3" />
-    <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="Rx-Main" Version="2.2.5-custom" targetFramework="net45" />
     <PackageReference Include="Serilog" Version="2.5.0" />
diff --git a/src/GitHub.App/SampleData/PullRequestAnnotationsViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestAnnotationsViewModelDesigner.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using GitHub.App.ViewModels.GitHubPane;
@@ -17,6 +17,7 @@ public sealed class PullRequestAnnotationsViewModelDesigner : PanePageViewModelB
         public int CheckRunId { get; set; }
         public ReactiveCommand<object> NavigateToPullRequest { get; }
         public string PullRequestTitle { get; } = "Fixing stuff in this PR";
+        public string CheckSuiteName { get; } = "Awesome Check Suite";
         public string CheckRunName { get; } = "Psuedo Check Run";
         public IReadOnlyList<IPullRequestAnnotationItemViewModel> Annotations { get; } = new[]
         {
diff --git a/src/GitHub.App/SampleData/PullRequestCheckViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestCheckViewModelDesigner.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Windows.Media.Imaging;
 using GitHub.Models;
 using GitHub.ViewModels;
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -115,7 +115,8 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                                                       {
                                                           Conclusion = run.Conclusion.FromGraphQl(),
                                                           Status = run.Status.FromGraphQl()
-                                                      }).ToList()
+                                                      }).ToList(),
+                                                  ApplicationName = suite.App.Name,
                                               }).ToList(),
                                           Statuses = commit.Commit.Status
                                                   .Select(context =>
@@ -1020,6 +1021,8 @@ class LastCommitSummaryAdapter
         class CheckSuiteSummaryModel
         {
             public List<CheckRunSummaryModel> CheckRuns { get; set; }
+
+            public string ApplicationName { get; set; }
         }
 
         class CheckRunSummaryModel
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationsViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationsViewModel.cs
@@ -20,6 +20,7 @@ public class PullRequestAnnotationsViewModel : PanePageViewModelBase, IPullReque
 
         IPullRequestSession session;
         string title;
+        string checkSuiteName;
         string checkRunName;
         IReadOnlyList<IPullRequestAnnotationItemViewModel> annotations;
 
@@ -85,6 +86,13 @@ public string PullRequestTitle
             private set { this.RaiseAndSetIfChanged(ref title, value); }
         }
 
+        /// <inheritdoc/>
+        public string CheckSuiteName
+        {
+            get { return checkSuiteName; }
+            private set { this.RaiseAndSetIfChanged(ref checkSuiteName, value); }
+        }
+
         /// <inheritdoc/>
         public string CheckRunName
         {
@@ -108,13 +116,15 @@ async Task Load(PullRequestDetailModel pullRequest)
                 await Task.Delay(0);
                 PullRequestTitle = pullRequest.Title;
 
-                var checkRunModel = pullRequest
-                    .CheckSuites.SelectMany(checkSuite => checkSuite.CheckRuns.Select(checkRun => new {checkSuite, checkRun}))
-                    .First(model => model.checkRun.DatabaseId == CheckRunId);
+                var checkSuiteRun = pullRequest
+                    .CheckSuites.SelectMany(checkSuite => checkSuite.CheckRuns
+                            .Select(checkRun => new{checkSuite, checkRun}))
+                    .First(arg => arg.checkRun.DatabaseId == CheckRunId);
 
-                CheckRunName = checkRunModel.checkRun.Name;
-                Annotations = checkRunModel.checkRun.Annotations
-                    .Select(annotation => new PullRequestAnnotationItemViewModel(checkRunModel.checkSuite, checkRunModel.checkRun, annotation, session, pullRequestEditorService))
+                CheckSuiteName = checkSuiteRun.checkSuite.ApplicationName;
+                CheckRunName = checkSuiteRun.checkRun.Name;
+                Annotations = checkSuiteRun.checkRun.Annotations
+                    .Select(annotation => new PullRequestAnnotationItemViewModel(checkSuiteRun.checkSuite, checkSuiteRun.checkRun, annotation, session, pullRequestEditorService))
                     .ToArray();
             }
             finally
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Linq;
diff --git a/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestAnnotationsViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestAnnotationsViewModel.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using GitHub.Models;
 using ReactiveUI;
@@ -54,6 +54,11 @@ public interface IPullRequestAnnotationsViewModel : IPanePageViewModel
         /// </summary>
         IReadOnlyList<IPullRequestAnnotationItemViewModel> Annotations { get; }
 
+        /// <summary>
+        /// Name of the Check Suite.
+        /// </summary>
+        string CheckSuiteName { get; }
+
         /// <summary>
         /// Initializes the view model.
         /// </summary>
diff --git a/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestCheckViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestCheckViewModel.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Windows.Media.Imaging;
 using GitHub.Models;
 using ReactiveUI;
diff --git a/src/GitHub.Exports/Models/CheckSuiteModel.cs b/src/GitHub.Exports/Models/CheckSuiteModel.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 
 namespace GitHub.Models
@@ -17,5 +17,7 @@ public class CheckSuiteModel
         /// The check runs associated with a check suite.
         /// </summary>
         public List<CheckRunModel> CheckRuns { get; set; }
+
+        public string ApplicationName { get; set; }
     }
 }
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -382,11 +382,11 @@
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
+    <Reference Include="Octokit.GraphQL, Version=0.1.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.1.2-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
     </Reference>
-    <Reference Include="Octokit.GraphQL.Core, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
+    <Reference Include="Octokit.GraphQL.Core, Version=0.1.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.1.2-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
@@ -808,7 +808,8 @@ async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress addres
                                                           StartLine = annotation.Location.Start.Line,
                                                           EndLine = annotation.Location.End.Line,
                                                       }).ToList()
-                                              }).ToList()
+                                              }).ToList(),
+                                          ApplicationName = suite.App.Name,
                                       }).ToList(),
                                   Statuses = commit.Commit.Status
                                       .Select(context =>
diff --git a/src/GitHub.InlineReviews/packages.config b/src/GitHub.InlineReviews/packages.config
@@ -34,7 +34,7 @@
   <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
   <package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="Octokit.GraphQL" version="0.1.1-beta" targetFramework="net461" />
+  <package id="Octokit.GraphQL" version="0.1.2-beta" targetFramework="net461" />
   <package id="Rx-Core" version="2.2.5-custom" targetFramework="net461" />
   <package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net461" />
   <package id="Rx-Linq" version="2.2.5-custom" targetFramework="net461" />
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -251,11 +251,11 @@
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
+    <Reference Include="Octokit.GraphQL, Version=0.1.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.1.2-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
     </Reference>
-    <Reference Include="Octokit.GraphQL.Core, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
+    <Reference Include="Octokit.GraphQL.Core, Version=0.1.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.1.2-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
     </Reference>
     <Reference Include="rothko, Version=0.0.3.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll</HintPath>
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestAnnotationsView.xaml b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestAnnotationsView.xaml
@@ -27,6 +27,9 @@
     <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel>
             <StackPanel DockPanel.Dock="Top" Margin="8 0" Orientation="Vertical">
+                    <TextBlock FontSize="16" VerticalAlignment="Center">
+                        <Run FontWeight="SemiBold" Text="{Binding CheckSuiteName, Mode=OneWay}"/>
+                    </TextBlock>
                 <TextBlock FontSize="16" VerticalAlignment="Center">
                         <Run FontWeight="SemiBold" Text="{Binding CheckRunName, Mode=OneWay}"/>
                         <Run>for</Run>
diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config
@@ -37,7 +37,7 @@
   <package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net461" developmentDependency="true" />
   <package id="Microsoft.VSSDK.Vsixsigntool" version="14.1.24720" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="Octokit.GraphQL" version="0.1.1-beta" targetFramework="net461" />
+  <package id="Octokit.GraphQL" version="0.1.2-beta" targetFramework="net461" />
   <package id="Rothko" version="0.0.3-ghfvs" targetFramework="net461" />
   <package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Windows.Media.Imaging;`
`3`	`3`	`using GitHub.Models;`
`4`	`4`	`using GitHub.ViewModels;`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,8 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(`
`115`	`115`	`{`
`116`	`116`	`Conclusion = run.Conclusion.FromGraphQl(),`
`117`	`117`	`Status = run.Status.FromGraphQl()`
`118`		`- }).ToList()`
	`118`	`+ }).ToList(),`
	`119`	`+ ApplicationName = suite.App.Name,`
`119`	`120`	`}).ToList(),`
`120`	`121`	`Statuses = commit.Commit.Status`
`121`	`122`	`.Select(context =>`
`@@ -1020,6 +1021,8 @@ class LastCommitSummaryAdapter`
`1020`	`1021`	`class CheckSuiteSummaryModel`
`1021`	`1022`	`{`
`1022`	`1023`	`public List<CheckRunSummaryModel> CheckRuns { get; set; }`
	`1024`	`+`
	`1025`	`+ public string ApplicationName { get; set; }`
`1023`	`1026`	`}`
`1024`	`1027`
`1025`	`1028`	`class CheckRunSummaryModel`