Merge pull request #338 from github/fixes/325-create-pr-cancel-button

shana · web-flow · commit 98ff88f0f281 · 2016-06-06T19:35:18.000+02:00
Enable "Cancel" button in PR creation view
diff --git a/src/GitHub.App/SampleData/LoggedOutViewModelDesigner.cs b/src/GitHub.App/SampleData/LoggedOutViewModelDesigner.cs
@@ -9,7 +9,7 @@
 namespace GitHub.SampleData
 {
     [ExcludeFromCodeCoverage]
-    public class LoggedOutViewModelDesigner : BaseViewModelDesigner, IViewModel
+    public class LoggedOutViewModelDesigner : BaseViewModel, IViewModel
     {
         public LoggedOutViewModelDesigner()
         {
diff --git a/src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs
@@ -5,7 +5,7 @@
 namespace GitHub.SampleData
 {
     [ExcludeFromCodeCoverage]
-    public class PullRequestCreationViewModelDesigner : BaseViewModelDesigner, IPullRequestCreationViewModel
+    public class PullRequestCreationViewModelDesigner : BaseViewModel, IPullRequestCreationViewModel
     {
         public PullRequestCreationViewModelDesigner()
         {
diff --git a/src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs
@@ -4,7 +4,7 @@
 namespace GitHub.SampleData
 {
     [ExcludeFromCodeCoverage]
-    public class PullRequestDetailViewModelDesigner : BaseViewModelDesigner, IPullRequestDetailViewModel
+    public class PullRequestDetailViewModelDesigner : BaseViewModel, IPullRequestDetailViewModel
     {
         public PullRequestDetailViewModelDesigner()
         {
diff --git a/src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs
@@ -13,7 +13,7 @@
 namespace GitHub.SampleData
 {
     [ExcludeFromCodeCoverage]
-    public class PullRequestListViewModelDesigner : BaseViewModelDesigner, IPullRequestListViewModel
+    public class PullRequestListViewModelDesigner : BaseViewModel, IPullRequestListViewModel
     {
         public PullRequestListViewModelDesigner()
         {
diff --git a/src/GitHub.App/SampleData/SampleViewModels.cs b/src/GitHub.App/SampleData/SampleViewModels.cs
@@ -22,18 +22,7 @@
 namespace GitHub.SampleData
 {
     [ExcludeFromCodeCoverage]
-    public class BaseViewModelDesigner : ReactiveObject, IViewModel
-    {
-        public ICommand Cancel { get; set; }
-        public bool IsShowing { get; set; }
-        public string Title { get; set; }
-
-        public void Initialize(ViewWithData data)
-        { }
-    }
-
-    [ExcludeFromCodeCoverage]
-    public class RepositoryCreationViewModelDesigner : BaseViewModelDesigner, IRepositoryCreationViewModel
+    public class RepositoryCreationViewModelDesigner : BaseViewModel, IRepositoryCreationViewModel
     {
         public RepositoryCreationViewModelDesigner()
         {
@@ -366,7 +355,7 @@ public UriString GenerateUrl(string path = null, int startLine = -1, int endLine
         public void Refresh() { }
     }
 
-    public class RepositoryCloneViewModelDesigner : BaseViewModelDesigner, IRepositoryCloneViewModel
+    public class RepositoryCloneViewModelDesigner : BaseViewModel, IRepositoryCloneViewModel
     {
         public RepositoryCloneViewModelDesigner()
         {
diff --git a/src/GitHub.App/ViewModels/BaseViewModel.cs b/src/GitHub.App/ViewModels/BaseViewModel.cs
@@ -5,10 +5,15 @@
 
 namespace GitHub.ViewModels
 {
-    public class BaseViewModel : ReactiveObject, IViewModel
+    public class BaseViewModel : ReactiveObject, IReactiveViewModel
     {
         protected ObservableAsPropertyHelper<bool> isShowing;
 
+        public BaseViewModel()
+        {
+            CancelCommand = ReactiveCommand.Create();
+        }
+
         public ReactiveCommand<object> CancelCommand { get; protected set; }
         public ICommand Cancel { get { return CancelCommand; } }
 
diff --git a/src/GitHub.App/ViewModels/LoginControlViewModel.cs b/src/GitHub.App/ViewModels/LoginControlViewModel.cs
@@ -48,7 +48,6 @@ public LoginControlViewModel(
             AuthenticationResults = Observable.Merge(
                 loginToGitHubViewModel.Login,
                 EnterpriseLogin.Login);
-            CancelCommand = ReactiveCommand.Create();
         }
 
         ILoginToGitHubViewModel github;
diff --git a/src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs b/src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs
@@ -1,12 +1,5 @@
-﻿using GitHub.Exports;
-using NullGuard;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.ComponentModel.Composition;
+using GitHub.Exports;
 
 namespace GitHub.ViewModels
 {
diff --git a/src/GitHub.App/ViewModels/PullRequestListViewModel.cs b/src/GitHub.App/ViewModels/PullRequestListViewModel.cs
@@ -41,7 +41,6 @@ public PullRequestListViewModel(IRepositoryHost repositoryHost, ISimpleRepositor
             this.repositoryHost = repositoryHost;
             this.repository = repository;
 
-            CancelCommand = ReactiveCommand.Create();
             openPullRequestCommand = ReactiveCommand.Create();
             openPullRequestCommand.Subscribe(_ =>
             {
diff --git a/src/GitHub.App/ViewModels/TwoFactorDialogViewModel.cs b/src/GitHub.App/ViewModels/TwoFactorDialogViewModel.cs
@@ -42,7 +42,6 @@ public TwoFactorDialogViewModel(
                 (code, busy) => !string.IsNullOrEmpty(code.Value) && code.Value.Length == 6 && !busy.Value);
 
             OkCommand = ReactiveCommand.Create(canVerify);
-            CancelCommand = ReactiveCommand.Create();
             NavigateLearnMore = ReactiveCommand.Create();
             NavigateLearnMore.Subscribe(x => browser.OpenUrl(GitHubUrls.TwoFactorLearnMore));
             //TODO: ShowHelpCommand.Subscribe(x => browser.OpenUrl(twoFactorHelpUri));
diff --git a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj
@@ -106,6 +106,7 @@
     <Compile Include="ViewModels\IPullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\IPullRequestDetailViewModel.cs" />
     <Compile Include="ViewModels\IPullRequestListViewModel.cs" />
+    <Compile Include="ViewModels\IReactiveViewModel.cs" />
     <Compile Include="ViewModels\IRepositoryCreationTarget.cs" />
     <Compile Include="ViewModels\IRepositoryForm.cs" />
     <Compile Include="ViewModels\IRepositoryPublishViewModel.cs" />
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IPullRequestCreationViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/IPullRequestCreationViewModel.cs
@@ -1,7 +1,9 @@
-﻿namespace GitHub.ViewModels
+﻿using ReactiveUI;
+
+namespace GitHub.ViewModels
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1040:AvoidEmptyInterfaces")]
-    public interface IPullRequestCreationViewModel : IViewModel
+    public interface IPullRequestCreationViewModel : IReactiveViewModel
     {
     }
 }
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IReactiveViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/IReactiveViewModel.cs
@@ -0,0 +1,9 @@
+using ReactiveUI;
+
+namespace GitHub.ViewModels
+{
+    public interface IReactiveViewModel : IViewModel
+    {
+        ReactiveCommand<object> CancelCommand { get; }
+    }
+}
diff --git a/src/GitHub.VisualStudio/UI/Views/LoggedOutViewModel.cs b/src/GitHub.VisualStudio/UI/Views/LoggedOutViewModel.cs
@@ -9,10 +9,8 @@ namespace GitHub.VisualStudio.UI.Views
     [PartCreationPolicy(CreationPolicy.NonShared)]
     public class LoggedOutViewModel : BaseViewModel
     {
-        [ImportingConstructor]
         public LoggedOutViewModel()
         {
-            CancelCommand = ReactiveCommand.Create();
         }
     }
 }
diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml b/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml
@@ -298,7 +298,11 @@
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
 
-                            <Button HorizontalAlignment="Right" Content="Cancel" Grid.Column="0" Style="{StaticResource GitHubVsButton}"/>
+                            <Button Grid.Column="0"
+                                    HorizontalAlignment="Right"
+                                    Content="Cancel"
+                                    Style="{StaticResource GitHubVsButton}"
+                                    Command="{Binding Cancel}"/>
                             <Button HorizontalAlignment="Right" Margin="6,0,0,0" Content="Create pull request" Grid.Column="1" Style="{StaticResource GitHubVsPrimaryActionButton}" />
                         </Grid>
                     </StackPanel>
diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml.cs b/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml.cs
@@ -1,4 +1,5 @@
-﻿using GitHub.Exports;
+﻿using System;
+using GitHub.Exports;
 using GitHub.UI;
 using GitHub.ViewModels;
 using System.ComponentModel.Composition;
@@ -20,6 +21,7 @@ public PullRequestCreationView()
 
             this.WhenActivated(d =>
             {
+                d(ViewModel.CancelCommand.Subscribe(_ => NotifyCancel()));
             });
         }
 
diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml.cs b/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml.cs
@@ -56,7 +56,6 @@ protected void NotifyOpen(ViewWithData id)
         protected void NotifyCreate()
         {
             create.OnNext(null);
-            create.OnCompleted();
         }
 
         bool disposed;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace GitHub.SampleData`
`10`	`10`	`{`
`11`	`11`	`[ExcludeFromCodeCoverage]`
`12`		`- public class LoggedOutViewModelDesigner : BaseViewModelDesigner, IViewModel`
	`12`	`+ public class LoggedOutViewModelDesigner : BaseViewModel, IViewModel`
`13`	`13`	`{`
`14`	`14`	`public LoggedOutViewModelDesigner()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace GitHub.SampleData`
`6`	`6`	`{`
`7`	`7`	`[ExcludeFromCodeCoverage]`
`8`		`- public class PullRequestCreationViewModelDesigner : BaseViewModelDesigner, IPullRequestCreationViewModel`
	`8`	`+ public class PullRequestCreationViewModelDesigner : BaseViewModel, IPullRequestCreationViewModel`
`9`	`9`	`{`
`10`	`10`	`public PullRequestCreationViewModelDesigner()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace GitHub.SampleData`
`5`	`5`	`{`
`6`	`6`	`[ExcludeFromCodeCoverage]`
`7`		`- public class PullRequestDetailViewModelDesigner : BaseViewModelDesigner, IPullRequestDetailViewModel`
	`7`	`+ public class PullRequestDetailViewModelDesigner : BaseViewModel, IPullRequestDetailViewModel`
`8`	`8`	`{`
`9`	`9`	`public PullRequestDetailViewModelDesigner()`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`namespace GitHub.SampleData`
`14`	`14`	`{`
`15`	`15`	`[ExcludeFromCodeCoverage]`
`16`		`- public class PullRequestListViewModelDesigner : BaseViewModelDesigner, IPullRequestListViewModel`
	`16`	`+ public class PullRequestListViewModelDesigner : BaseViewModel, IPullRequestListViewModel`
`17`	`17`	`{`
`18`	`18`	`public PullRequestListViewModelDesigner()`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,18 +22,7 @@`
`22`	`22`	`namespace GitHub.SampleData`
`23`	`23`	`{`
`24`	`24`	`[ExcludeFromCodeCoverage]`
`25`		`- public class BaseViewModelDesigner : ReactiveObject, IViewModel`
`26`		`- {`
`27`		`- public ICommand Cancel { get; set; }`
`28`		`- public bool IsShowing { get; set; }`
`29`		`- public string Title { get; set; }`
`30`		`-`
`31`		`- public void Initialize(ViewWithData data)`
`32`		`- { }`
`33`		`- }`
`34`		`-`
`35`		`- [ExcludeFromCodeCoverage]`
`36`		`- public class RepositoryCreationViewModelDesigner : BaseViewModelDesigner, IRepositoryCreationViewModel`
	`25`	`+ public class RepositoryCreationViewModelDesigner : BaseViewModel, IRepositoryCreationViewModel`
`37`	`26`	`{`
`38`	`27`	`public RepositoryCreationViewModelDesigner()`
`39`	`28`	`{`
`@@ -366,7 +355,7 @@ public UriString GenerateUrl(string path = null, int startLine = -1, int endLine`
`366`	`355`	`public void Refresh() { }`
`367`	`356`	`}`
`368`	`357`
`369`		`- public class RepositoryCloneViewModelDesigner : BaseViewModelDesigner, IRepositoryCloneViewModel`
	`358`	`+ public class RepositoryCloneViewModelDesigner : BaseViewModel, IRepositoryCloneViewModel`
`370`	`359`	`{`
`371`	`360`	`public RepositoryCloneViewModelDesigner()`
`372`	`361`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,15 @@`
`5`	`5`
`6`	`6`	`namespace GitHub.ViewModels`
`7`	`7`	`{`
`8`		`- public class BaseViewModel : ReactiveObject, IViewModel`
	`8`	`+ public class BaseViewModel : ReactiveObject, IReactiveViewModel`
`9`	`9`	`{`
`10`	`10`	`protected ObservableAsPropertyHelper<bool> isShowing;`
`11`	`11`
	`12`	`+ public BaseViewModel()`
	`13`	`+ {`
	`14`	`+ CancelCommand = ReactiveCommand.Create();`
	`15`	`+ }`
	`16`	`+`
`12`	`17`	`public ReactiveCommand<object> CancelCommand { get; protected set; }`
`13`	`18`	`public ICommand Cancel { get { return CancelCommand; } }`
`14`	`19`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ public LoginControlViewModel(`
`48`	`48`	`AuthenticationResults = Observable.Merge(`
`49`	`49`	`loginToGitHubViewModel.Login,`
`50`	`50`	`EnterpriseLogin.Login);`
`51`		`- CancelCommand = ReactiveCommand.Create();`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`ILoginToGitHubViewModel github;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public PullRequestListViewModel(IRepositoryHost repositoryHost, ISimpleRepositor`
`41`	`41`	`this.repositoryHost = repositoryHost;`
`42`	`42`	`this.repository = repository;`
`43`	`43`
`44`		`- CancelCommand = ReactiveCommand.Create();`
`45`	`44`	`openPullRequestCommand = ReactiveCommand.Create();`
`46`	`45`	`openPullRequestCommand.Subscribe(_ =>`
`47`	`46`	`{`