Merge remote-tracking branch 'origin/fixes/github-fork-limit-functionality' into ui/fork-polish

Author: donokuda

src/GitHub.App/Services/RepositoryForkService.cs

@@ -41,7 +41,7 @@ public IObservable<Repository> ForkRepository(IApiClient apiClient, IRepositoryM
             log.Verbose("ForkRepository Source:{SourceOwner}/{SourceName} To:{DestinationOwner}", sourceRepository.Owner, sourceRepository.Name, repositoryFork.Organization ?? "[Current User]");
             log.Verbose("ForkRepository updateOrigin:{UpdateOrigin} addUpstream:{AddUpstream} trackMasterUpstream:{TrackMasterUpstream}", updateOrigin, addUpstream, trackMasterUpstream);
 
-            RecordForkRepositoryUsage(updateOrigin, addUpstream, trackMasterUpstream).Forget();
+            usageTracker.IncrementCounter(model => model.NumberOfReposForked).Forget();
 
             return Observable.Defer(() => apiClient.ForkRepository(sourceRepository.Owner, sourceRepository.Name, repositoryFork)
                     .ObserveOn(RxApp.MainThreadScheduler)
@@ -63,26 +63,6 @@ public IObservable<Repository> ForkRepository(IApiClient apiClient, IRepositoryM
                 });
         }
 
-        private async Task RecordForkRepositoryUsage(bool updateOrigin, bool addUpstream, bool trackMasterUpstream)
-        {
-            await usageTracker.IncrementCounter(model => model.NumberOfReposForked);
-
-            if (updateOrigin)
-            {
-                await usageTracker.IncrementCounter(model => model.NumberOfOriginsUpdatedWhenForkingRepo);
-            }
-
-            if (addUpstream)
-            {
-                await usageTracker.IncrementCounter(model => model.NumberOfUpstreamsAddedWhenForkingRepo);
-            }
-
-            if (trackMasterUpstream)
-            {
-                await usageTracker.IncrementCounter(model => model.NumberOfTrackMasterUpstreamWhenForkingRepo);
-            }
-        }
-
         public IObservable<object> SwitchRemotes(IRepositoryModel destinationRepository, bool updateOrigin, bool addUpstream, bool trackMasterUpstream)
         {
             return Observable.Defer(() => Observable.Return(new object())

src/GitHub.App/ViewModels/Dialog/ForkRepositoryExecuteViewModel.cs

@@ -125,14 +125,14 @@ public bool AddUpstream
             set { this.RaiseAndSetIfChanged(ref addUpstream, value); }
         }
 
-        bool canResetMasterTracking = true;
+        bool canResetMasterTracking;
         public bool CanResetMasterTracking
         {
             get { return canResetMasterTracking; }
             private set { this.RaiseAndSetIfChanged(ref canResetMasterTracking, value); }
         }
 
-        bool resetMasterTracking = true;
+        bool resetMasterTracking;
         public bool ResetMasterTracking
         {
             get { return resetMasterTracking; }

src/GitHub.Exports/Models/UsageModel.cs

@@ -74,9 +74,6 @@ public class MeasuresModel
             public int NumberOfGitHubConnectSectionClones { get; set; }
             public int NumberOfShowRepoForkDialogClicks { get; set; }
             public int NumberOfReposForked { get; set; }
-            public int NumberOfOriginsUpdatedWhenForkingRepo { get; set; }
-            public int NumberOfUpstreamsAddedWhenForkingRepo { get; set; }
-            public int NumberOfTrackMasterUpstreamWhenForkingRepo { get; set; }
         }
     }
 }

src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs

@@ -97,7 +97,7 @@ public override async void Invalidate()
             {
                 IsVisible = false;
 
-                if ((packageSettings?.ForkButton ?? false) && await IsAGitHubRepo())
+                if ((packageSettings?.ForkButton ?? false) && await IsAGitHubDotComRepo())
                 {
                     var connection = await ConnectionManager.GetConnection(ActiveRepo);
                     IsVisible = connection?.IsLoggedIn ?? false;

src/GitHub.VisualStudio.UI/Base/TeamExplorerItemBase.cs

@@ -141,6 +141,12 @@ protected async Task<bool> IsAGitHubRepo()
             return origin == RepositoryOrigin.DotCom || origin == RepositoryOrigin.Enterprise;
         }
 
+        protected async Task<bool> IsAGitHubDotComRepo()
+        {
+            var origin = await GetRepositoryOrigin();
+            return origin == RepositoryOrigin.DotCom;
+        }
+
         protected async Task<bool> IsUserAuthenticated()
         {
             if (SimpleApiClient == null)

src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml

@@ -46,7 +46,7 @@
       </Border>
       <Border Style="{StaticResource ItemBorder}">
         <DockPanel>
-          <CheckBox IsChecked="{Binding UpdateOrigin}"/>
+          <CheckBox IsChecked="{Binding UpdateOrigin}" IsEnabled="False" />
           <TextBlock TextWrapping="Wrap">
           Update your local repository's <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">origin</Run> to point to
           <Hyperlink><Run Text="{Binding DestinationRepository.CloneUrl, Mode=OneWay}"/></Hyperlink>
@@ -55,22 +55,13 @@
       </Border>
       <Border Style="{StaticResource ItemBorder}">
         <DockPanel>
-          <CheckBox IsChecked="{Binding AddUpstream}" IsEnabled="{Binding CanAddUpstream}" />
+          <CheckBox IsChecked="{Binding AddUpstream}" IsEnabled="False" />
           <TextBlock TextWrapping="Wrap">
             Add an <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">upstream</Run> remote pointing to 
           <Hyperlink><Run Text="{Binding SourceRepository.CloneUrl, Mode=OneWay}"/></Hyperlink>
           </TextBlock>
         </DockPanel>
       </Border>
-      <Border Style="{StaticResource ItemBorder}">
-        <DockPanel>
-          <CheckBox IsChecked="{Binding ResetMasterTracking}" IsEnabled="{Binding CanResetMasterTracking}" />
-          <TextBlock TextWrapping="Wrap">
-            Set the <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">master</Run> branch to track
-            <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">upstream/master</Run>
-          </TextBlock>
-        </DockPanel>
-      </Border>
       <Border Style="{StaticResource ItemBorder}">
         <StackPanel >
           <Button Click="repoForkButton_OnClick">Fork Repo</Button>