Merge pull request #2046 from github/fixes/fork-function

Fixes to Fork Repository

Author: StanleyGoldman

src/GitHub.App/SampleData/ForkRepositorySelectViewModelDesigner.cs

@@ -39,7 +39,7 @@ public ForkRepositorySelectViewModelDesigner()
 
         public string Title => null;
 
-        public ReactiveCommand<IAccount, Unit> SelectedAccount => null;
+        public ReactiveCommand<IAccount, IAccount> SelectedAccount => null;
 
         public ReactiveCommand<RemoteRepositoryModel, Unit> SwitchOrigin => null;
 

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

@@ -30,7 +30,7 @@ public class ForkRepositorySelectViewModel : ViewModelBase, IForkRepositorySelec
         public ForkRepositorySelectViewModel(IModelServiceFactory modelServiceFactory)
         {
             this.modelServiceFactory = modelServiceFactory;
-            SelectedAccount = ReactiveCommand.Create<IAccount>(_ => { });
+            SelectedAccount = ReactiveCommand.Create<IAccount, IAccount>(account => account);
             SwitchOrigin = ReactiveCommand.Create<RemoteRepositoryModel>(_ => { });
         }
 
@@ -54,11 +54,11 @@ public bool IsLoading
             private set { this.RaiseAndSetIfChanged(ref isLoading, value); }
         }
 
-        public ReactiveCommand<IAccount, Unit> SelectedAccount { get; }
+        public ReactiveCommand<IAccount, IAccount> SelectedAccount { get; }
 
         public ReactiveCommand<RemoteRepositoryModel, Unit> SwitchOrigin { get; }
 
-        public IObservable<object> Done => SelectedAccount.SelectNull();
+        public IObservable<object> Done => SelectedAccount;
 
         public async Task InitializeAsync(LocalRepositoryModel repository, IConnection connection)
         {

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

@@ -30,7 +30,7 @@ public interface IForkRepositorySelectViewModel : IDialogContentViewModel
         /// <summary>
         /// Gets a command that is executed when the user selects an item in <see cref="Accounts"/>.
         /// </summary>
-        ReactiveCommand<IAccount, Unit> SelectedAccount { get; }
+        ReactiveCommand<IAccount, IAccount> SelectedAccount { get; }
 
         /// <summary>
         /// Gets a command that is executed when the user selects an item in <see cref="ExistingForks"/>.

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

@@ -95,8 +95,8 @@
                    Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}" 
                    HorizontalAlignment="Left" />
         <StackPanel Margin="0 8" Orientation="Horizontal" HorizontalAlignment="Right">
-          <Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Margin="0 0 4 0" Click="backButton_OnClick" Content="{x:Static ghfvs:Resources.Back}"/>
-          <Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Click="repoForkButton_OnClick" Content="{x:Static ghfvs:Resources.ForkRepository}"/>
+                <Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Margin="0 0 4 0" Command="{Binding BackCommand}" Content="{x:Static ghfvs:Resources.Back}"/>
+          <Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Command="{Binding CreateFork}" Content="{x:Static ghfvs:Resources.ForkRepository}"/>
         </StackPanel>
     </StackPanel>
   </StackPanel>

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

@@ -14,15 +14,5 @@ public ForkRepositoryExecuteView()
         {
             InitializeComponent();
         }
-
-        private void repoForkButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            ((IForkRepositoryExecuteViewModel)DataContext).CreateFork.Execute();
-        }
-
-        private void backButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            ((IForkRepositoryExecuteViewModel)DataContext).BackCommand.Execute();
-        }
     }
 }

src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositorySelectView.xaml.cs

@@ -24,7 +24,7 @@ private void accountsListBox_SelectionChanged(object sender, SelectionChangedEve
 
             if (account != null)
             {
-                ((IForkRepositorySelectViewModel)DataContext).SelectedAccount.Execute(account);
+                ((IForkRepositorySelectViewModel)DataContext).SelectedAccount.Execute(account).Subscribe();
             }
         }
 
@@ -33,7 +33,7 @@ private void existingForksListBox_SelectionChanged(object sender, SelectionChang
             var repository = e.AddedItems.OfType<RemoteRepositoryModel>().FirstOrDefault();
             if (repository != null)
             {
-                ((IForkRepositorySelectViewModel)DataContext).SwitchOrigin.Execute(repository);
+                ((IForkRepositorySelectViewModel)DataContext).SwitchOrigin.Execute(repository).Subscribe();
             }
         }
     }