Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit b086078

Browse files
StanleyGoldmanStanleyGoldman
committed
Removing functionality to read CheckSuites
1 parent 42fbab6 commit b086078

26 files changed

+37
-343
lines changed

‎lib/Octokit.GraphQL.0.1.1-beta.nupkg‎

-182 KB
Binary file not shown.

‎src/GitHub.Api/GitHub.Api.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5151
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
53+
<Reference Include="Octokit.GraphQL, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
54+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Octokit.GraphQL.Core, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
56+
<Reference Include="Octokit.GraphQL.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
6060
<HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>

‎src/GitHub.Api/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
4-
<package id="Octokit.GraphQL" version="0.1.1-beta" targetFramework="net461" />
4+
<package id="Octokit.GraphQL" version="0.1.0-beta" targetFramework="net461" />
55
<package id="Serilog" version="2.5.0" targetFramework="net461" />
66
</packages>

‎src/GitHub.App/GitHub.App.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@
144144
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
145145
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
146146
</Reference>
147-
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
148-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
147+
<Reference Include="Octokit.GraphQL, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
148+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
149149
</Reference>
150-
<Reference Include="Octokit.GraphQL.Core, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
151-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
150+
<Reference Include="Octokit.GraphQL.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
151+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
152152
</Reference>
153153
<Reference Include="PresentationCore" />
154154
<Reference Include="PresentationFramework" />
@@ -230,7 +230,6 @@
230230
<Compile Include="Services\EnterpriseCapabilitiesService.cs" />
231231
<Compile Include="Services\GitHubContextService.cs" />
232232
<Compile Include="Services\GlobalConnection.cs" />
233-
<Compile Include="Services\ChecksService.cs" />
234233
<Compile Include="Services\RepositoryForkService.cs" />
235234
<Compile Include="Services\RepositoryService.cs" />
236235
<Compile Include="ViewModels\ActorViewModel.cs" />

‎src/GitHub.App/Services/ChecksService.cs‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎src/GitHub.App/Services/PullRequestService.cs‎

Lines changed: 10 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
9696
LastCommit = pr.Commits(null, null, 1, null).Nodes.Select(commit =>
9797
new LastCommitSummaryModel
9898
{
99-
// CheckSuites = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
100-
// .Select(suite => new CheckSuiteSummaryModel
101-
// {
102-
// Conclusion = (CheckConclusionStateEnum?)suite.Conclusion,
103-
// Status = (CheckStatusStateEnum)suite.Status,
104-
// }).ToList(),
10599
Statuses = commit.Commit.Status
106100
.Select(context =>
107101
context.Contexts.Select(statusContext => new StatusSummaryModel
@@ -140,65 +134,36 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
140134

141135
var result = await graphql.Run(readPullRequests, vars);
142136

143-
foreach (ListItemAdapter item in result.Items)
137+
foreach (var item in result.Items.Cast<ListItemAdapter>())
144138
{
145139
item.CommentCount += item.Reviews.Sum(x => x.Count);
146140
item.Reviews = null;
147141

148-
var hasCheckSuites = item.LastCommit.CheckSuites != null
149-
&& item.LastCommit.CheckSuites.Any();
150-
151142
var hasStatuses = item.LastCommit.Statuses != null
152143
&& item.LastCommit.Statuses.Any();
153144

154-
if (!hasCheckSuites && !hasStatuses)
145+
if (!hasStatuses)
155146
{
156147
item.Checks = PullRequestChecksEnum.None;
157148
}
158149
else
159150
{
160-
var checksHasFailure = false;
161-
var checksHasCompleteSuccess = true;
162-
163-
if (hasCheckSuites)
164-
{
165-
checksHasFailure = item.LastCommit
166-
.CheckSuites.Any(model => model.Conclusion.HasValue
167-
&& (model.Conclusion.Value == CheckSuiteConclusionStateEnum.Failure
168-
|| model.Conclusion.Value ==
169-
CheckSuiteConclusionStateEnum.ActionRequired));
170-
171-
if (!checksHasFailure)
172-
{
173-
checksHasCompleteSuccess = item.LastCommit
174-
.CheckSuites.All(model => model.Conclusion.HasValue
175-
&& (model.Conclusion.Value == CheckSuiteConclusionStateEnum.Success
176-
|| model.Conclusion.Value ==
177-
CheckSuiteConclusionStateEnum.Neutral));
178-
}
179-
}
151+
var statusHasFailure = item.LastCommit
152+
.Statuses
153+
.Any(status => status.State == StatusStateEnum.Failure);
180154

181-
var statusHasFailure = false;
182155
var statusHasCompleteSuccess = true;
183-
184-
if (!checksHasFailure && hasStatuses)
156+
if (!statusHasFailure)
185157
{
186-
statusHasFailure = item.LastCommit
187-
.Statuses
188-
.Any(status => status.State == StatusStateEnum.Failure);
189-
190-
if (!statusHasFailure)
191-
{
192-
statusHasCompleteSuccess =
193-
item.LastCommit.Statuses.All(status => status.State == StatusStateEnum.Success);
194-
}
158+
statusHasCompleteSuccess =
159+
item.LastCommit.Statuses.All(status => status.State == StatusStateEnum.Success);
195160
}
196161

197-
if (checksHasFailure || statusHasFailure)
162+
if (statusHasFailure)
198163
{
199164
item.Checks = PullRequestChecksEnum.Failure;
200165
}
201-
else if (statusHasCompleteSuccess && checksHasCompleteSuccess)
166+
else if (statusHasCompleteSuccess)
202167
{
203168
item.Checks = PullRequestChecksEnum.Success;
204169
}
@@ -935,17 +900,8 @@ class ReviewAdapter
935900

936901
class LastCommitSummaryModel
937902
{
938-
public List<CheckSuiteSummaryModel> CheckSuites { get; set; }
939-
940903
public List<StatusSummaryModel> Statuses { get; set; }
941904
}
942-
943-
class CheckSuiteSummaryModel
944-
{
945-
public CheckSuiteConclusionStateEnum? Conclusion { get; set; }
946-
947-
public CheckSuiteStatusStateEnum Status { get; set; }
948-
}
949905
}
950906

951907
public class StatusSummaryModel

‎src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public sealed class PullRequestDetailViewModel : PanePageViewModelBase, IPullReq
3838
readonly IUsageTracker usageTracker;
3939
readonly ITeamExplorerContext teamExplorerContext;
4040
readonly ISyncSubmodulesCommand syncSubmodulesCommand;
41-
private IChecksService checksService;
4241
IModelService modelService;
4342
PullRequestDetailModel model;
4443
IActorViewModel author;
@@ -75,8 +74,7 @@ public PullRequestDetailViewModel(
7574
IUsageTracker usageTracker,
7675
ITeamExplorerContext teamExplorerContext,
7776
IPullRequestFilesViewModel files,
78-
ISyncSubmodulesCommand syncSubmodulesCommand,
79-
IChecksService checksService)
77+
ISyncSubmodulesCommand syncSubmodulesCommand)
8078
{
8179
Guard.ArgumentNotNull(pullRequestsService, nameof(pullRequestsService));
8280
Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
@@ -91,7 +89,6 @@ public PullRequestDetailViewModel(
9189
this.usageTracker = usageTracker;
9290
this.teamExplorerContext = teamExplorerContext;
9391
this.syncSubmodulesCommand = syncSubmodulesCommand;
94-
this.checksService = checksService;
9592
Files = files;
9693

9794
Checkout = ReactiveCommand.CreateAsyncObservable(

‎src/GitHub.App/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50728" targetFramework="net461" />
2222
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net461" />
2323
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
24-
<package id="Octokit.GraphQL" version="0.1.1-beta" targetFramework="net461" />
24+
<package id="Octokit.GraphQL" version="0.1.0-beta" targetFramework="net461" />
2525
<package id="Rothko" version="0.0.3-ghfvs" targetFramework="net461" />
2626
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
2727
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />

‎src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
<Compile Include="Models\IInlineCommentThreadModel.cs" />
176176
<Compile Include="Models\IPullRequestSessionFile.cs" />
177177
<Compile Include="Models\PullRequestTextBufferInfo.cs" />
178-
<Compile Include="Services\IChecksService.cs" />
179178
<Compile Include="Services\IModelService.cs" />
180179
<Compile Include="Services\IGistPublishService.cs" />
181180
<Compile Include="Services\IPullRequestEditorService.cs" />

‎src/GitHub.Exports.Reactive/Services/IChecksService.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)