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

Commit c7f35bc

Browse files
authored
Merge pull request #1002 from github/fixes/pr-details-metrics
Add missing metrics back in
2 parents 5a466b7 + 8685676 commit c7f35bc

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ public override void Initialize([AllowNull] ViewWithData data)
286286
/// <param name="files">The pull request's changed files.</param>
287287
public async Task Load(IPullRequestModel pullRequest)
288288
{
289+
var firstLoad = (Model == null);
289290
Model = pullRequest;
290291
Title = Resources.PullRequestNavigationItemText + " #" + pullRequest.Number;
291292

@@ -298,7 +299,6 @@ public async Task Load(IPullRequestModel pullRequest)
298299
ChangedFilesTree = CreateChangedFilesTree(pullRequest, changes).Children.ToList();
299300

300301
var localBranches = await pullRequestsService.GetLocalBranches(repository, pullRequest).ToList();
301-
302302
IsCheckedOut = localBranches.Contains(repository.CurrentBranch);
303303

304304
if (IsCheckedOut)
@@ -363,6 +363,11 @@ public async Task Load(IPullRequestModel pullRequest)
363363

364364
IsLoading = IsBusy = false;
365365

366+
if (firstLoad)
367+
{
368+
usageTracker.IncrementPullRequestOpened().Forget();
369+
}
370+
366371
if (!isInCheckout)
367372
{
368373
pullRequestsService.RemoveUnusedRemotes(repository).Subscribe(_ => { });
@@ -480,7 +485,6 @@ IObservable<Unit> DoCheckout(object unused)
480485
return Observable.Defer(async () =>
481486
{
482487
var localBranches = await pullRequestsService.GetLocalBranches(repository, Model).ToList();
483-
484488
if (localBranches.Count > 0)
485489
{
486490
return pullRequestsService.SwitchToBranch(repository, Model);

src/GitHub.Exports/Services/IUsageTracker.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public interface IUsageTracker
1919
Task IncrementPullRequestCheckOutCount(bool fork);
2020
Task IncrementPullRequestPullCount(bool fork);
2121
Task IncrementPullRequestPushCount(bool fork);
22+
Task IncrementPullRequestOpened();
2223
Task IncrementWelcomeDocsClicks();
2324
Task IncrementWelcomeTrainingClicks();
2425
Task IncrementGitHubPaneHelpClicks();

src/GitHub.VisualStudio/Services/UsageTracker.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,13 @@ public async Task IncrementGitHubPaneHelpClicks()
195195
SaveUsage(usage);
196196
}
197197

198+
public async Task IncrementPullRequestOpened()
199+
{
200+
var usage = await LoadUsage();
201+
++usage.Model.NumberOfPullRequestsOpened;
202+
SaveUsage(usage);
203+
}
204+
198205
async Task Initialize()
199206
{
200207
// The services needed by the usage tracker are loaded when they are first needed to
@@ -346,6 +353,9 @@ static void ClearCounters(UsageModel usage, bool weekly, bool monthly)
346353
usage.NumberOfForkPullRequestsCheckedOut = 0;
347354
usage.NumberOfForkPullRequestPulls = 0;
348355
usage.NumberOfForkPullRequestPushes = 0;
356+
usage.NumberOfGitHubPaneHelpClicks = 0;
357+
usage.NumberOfWelcomeTrainingClicks = 0;
358+
usage.NumberOfWelcomeDocsClicks = 0;
349359

350360
if (weekly)
351361
usage.NumberOfStartupsWeek = 0;

src/GitHub.VisualStudio/Services/UsageTrackerDispatcher.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public UsageTrackerDispatcher([Import(typeof(SVsServiceProvider))] IServiceProvi
2626
public Task IncrementOpenInGitHubCount() => inner.IncrementOpenInGitHubCount();
2727
public Task IncrementPublishCount() => inner.IncrementPublishCount();
2828
public Task IncrementUpstreamPullRequestCount() => inner.IncrementUpstreamPullRequestCount();
29+
public Task IncrementPullRequestOpened() => inner.IncrementPullRequestOpened();
2930
public Task IncrementPullRequestCheckOutCount(bool fork) => inner.IncrementPullRequestCheckOutCount(fork);
3031
public Task IncrementPullRequestPullCount(bool fork) => inner.IncrementPullRequestPullCount(fork);
3132
public Task IncrementPullRequestPushCount(bool fork) => inner.IncrementPullRequestPushCount(fork);

0 commit comments

Comments
 (0)