Merge pull request #1672 from github/fixes/fork-back-button

Adding functionality to the back button in the fork view

Author: jcansdale

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/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);
@@ -140,6 +145,7 @@ public bool ResetMasterTracking
         }
 
         string error = null;
+
         public string Error
         {
             get { return error; }

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.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml

@@ -89,7 +89,7 @@
                                Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}" 
                                HorizontalAlignment="Left" />
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                      <Button HorizontalAlignment="Right" Margin="0 0 4 0">Back</Button>
+                      <Button HorizontalAlignment="Right" Margin="0 0 4 0" Click="backButton_OnClick">Back</Button>
                       <Button HorizontalAlignment="Right" Click="repoForkButton_OnClick">Fork Repo</Button>
                     </StackPanel>
                 </Grid>

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

@@ -19,5 +19,10 @@ private void repoForkButton_OnClick(object sender, RoutedEventArgs e)
         {
             ((IForkRepositoryExecuteViewModel)DataContext).CreateFork.Execute(new object());
         }
+
+        private void backButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            ((IForkRepositoryExecuteViewModel)DataContext).BackCommand.Execute(new object());
+        }
     }
 }