Merge pull request #1659 from github/fixes/github-fork-limit-functionality

Limiting functionality in the beta repo fork functionality

Author: jcansdale

src/GitHub.App/Models/Account.cs

@@ -80,7 +80,7 @@ public Account(Octokit.Account account, IObservable<BitmapSource> bitmapSource)
 
         public long PrivateReposInPlan { get; private set; }
 
-        public string AvatarUrl { get; private set; }
+        public string AvatarUrl { get; set; }
 
         public BitmapSource Avatar
         {

src/GitHub.App/SampleData/ForkRepositoryExecuteViewModelDesigner.cs

@@ -30,6 +30,8 @@ public ForkRepositoryExecuteViewModelDesigner()
 
         public IObservable<object> Done => null;
 
+        public IObservable<object> Back => null;
+
         public string Title => null;
 
         public IRepositoryModel SourceRepository { get; set; }
@@ -40,6 +42,8 @@ public ForkRepositoryExecuteViewModelDesigner()
 
         public IReactiveCommand<Repository> CreateFork => null;
 
+        public IReactiveCommand<object> BackCommand => null;
+
         public bool ResetMasterTracking { get; set; } = true;
 
         public bool AddUpstream { get; set; } = true;

src/GitHub.App/SampleData/ForkRepositorySelectViewModelDesigner.cs

@@ -14,11 +14,11 @@ public ForkRepositorySelectViewModelDesigner()
         {
             Accounts = new[]
             {
-                new AccountDesigner { Login = "Myself" },
-                new AccountDesigner { Login = "MyOrg1" },
-                new AccountDesigner { Login = "MyOrg2" },
-                new AccountDesigner { Login = "MyOrg3" },
-                new AccountDesigner { Login = "a-long-org-name" },
+                new AccountDesigner { Login = "Myself", AvatarUrl = "https://identicons.github.com/myself.png" },
+                new AccountDesigner { Login = "MyOrg1", AvatarUrl = "https://identicons.github.com/myorg1.png" },
+                new AccountDesigner { Login = "MyOrg2", AvatarUrl = "https://identicons.github.com/myorg2.png"  },
+                new AccountDesigner { Login = "MyOrg3", AvatarUrl = "https://identicons.github.com/myorg3.png"  },
+                new AccountDesigner { Login = "a-long-org-name", AvatarUrl = "https://identicons.github.com/a-long-org-name.png"  },
             };
 
             ExistingForks = new[]

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

@@ -45,6 +45,7 @@ IRepositoryForkService repositoryForkService
                 .Subscribe(tuple => CanResetMasterTracking = tuple.Item1 && tuple.Item2);
 
             CreateFork = ReactiveCommand.CreateAsyncObservable(OnCreateFork);
+            BackCommand = ReactiveCommand.Create();
         }
 
         public IRepositoryModel SourceRepository { get; private set; }
@@ -55,10 +56,14 @@ IRepositoryForkService repositoryForkService
 
         public IReactiveCommand<Repository> CreateFork { get; }
 
+        public IReactiveCommand<object> BackCommand { get; }
+
         public string Title => Resources.ForkRepositoryTitle;
 
         public IObservable<object> Done => CreateFork.Where(repository => repository != null);
 
+        public IObservable<object> Back => BackCommand.AsObservable();
+
         public async Task InitializeAsync(ILocalRepositoryModel sourceRepository, IAccount destinationAccount, IConnection connection)
         {
             var modelService = await modelServiceFactory.CreateAsync(connection);
@@ -125,21 +130,22 @@ 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; }
             set { this.RaiseAndSetIfChanged(ref resetMasterTracking, value); }
         }
 
         string error = null;
+
         public string Error
         {
             get { return error; }

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

@@ -108,6 +108,14 @@ void BuildAccounts(IReadOnlyList<IAccount> accessibleAccounts, ILocalRepositoryM
 
             Accounts = readOnlyList.Where(arg => arg.Fork == null).Select(arg => arg.Account).ToList();
             ExistingForks = readOnlyList.Where(arg => arg.Fork != null).Select(arg => arg.Fork).ToList();
+
+            // HACK: Our avatar cache only provides avatars in a very small size, but we want to 
+            // display them 100x100 in the Fork view. For now, wse the AvatarUrl directly to get
+            // the avatar, appending "s=100" to the URL to get the correct size.
+            foreach (Account account in Accounts)
+            {
+                account.AvatarUrl += "&s=100";
+            }
         }
     }
 }

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

@@ -33,6 +33,7 @@ public ForkRepositoryViewModel(
 
             selectPage.SwitchOrigin.Subscribe(x => ShowSwitchRepositoryPath((IRemoteRepositoryModel)x));
             selectPage.Done.Subscribe(x => ShowExecutePage((IAccount)x).Forget());
+            executePage.Back.Subscribe(x => ShowSelectPage().Forget());
         }
 
         public ILocalRepositoryModel Repository { get; private set; }
@@ -47,7 +48,12 @@ public async Task InitializeAsync(ILocalRepositoryModel repository, IConnection
         {
             Repository = repository;
             Connection = connection;
-            await selectPage.InitializeAsync(repository, connection);
+            await ShowSelectPage();
+        }
+
+        async Task ShowSelectPage()
+        {
+            await selectPage.InitializeAsync(Repository, Connection);
             Content = selectPage;
         }
 

src/GitHub.Exports.Reactive/ViewModels/Dialog/IForkRepositoryExecuteViewModel.cs

@@ -23,6 +23,8 @@ public interface IForkRepositoryExecuteViewModel : IDialogContentViewModel
         /// </summary>
         IReactiveCommand<Repository> CreateFork { get; }
 
+        IReactiveCommand<object> BackCommand { get; }
+
         bool ResetMasterTracking { get; set; }
 
         bool AddUpstream { get; set; }
@@ -34,6 +36,7 @@ public interface IForkRepositoryExecuteViewModel : IDialogContentViewModel
         bool CanResetMasterTracking { get; }
 
         string Error { get; }
+        IObservable<object> Back { get; }
 
         /// <summary>
         /// Initializes the view model.

src/GitHub.Exports/Models/UsageModel.cs

@@ -73,9 +73,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; }
             public int ExecuteGoToSolutionOrPullRequestFileCommand { get; set; }
             public int NumberOfPRDetailsNavigateToEditor { get; set; } // Should rename to NumberOfNavigateToEditor
             public int NumberOfNavigateToPullRequestFileDiff { 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;