diff --git a/src/GitHub.App/SampleData/SampleViewModels.cs b/src/GitHub.App/SampleData/SampleViewModels.cs index 9a2a430e9f..91be7fe6c1 100644 --- a/src/GitHub.App/SampleData/SampleViewModels.cs +++ b/src/GitHub.App/SampleData/SampleViewModels.cs @@ -29,7 +29,6 @@ public RepositoryCreationViewModelDesigner() RepositoryName = "Hello-World"; Description = "A description"; KeepPrivate = true; - CanKeepPrivate = true; Accounts = new ReactiveList { new AccountDesigner { Login = "shana" }, @@ -80,12 +79,6 @@ public ReactiveCommand BrowseForDirectory private set; } - public bool CanKeepPrivate - { - get; - private set; - } - public ReactiveCommand CreateRepository { get; @@ -146,24 +139,6 @@ public IAccount SelectedAccount set; } - public bool ShowUpgradePlanWarning - { - get; - private set; - } - - public bool ShowUpgradeToMicroPlanWarning - { - get; - private set; - } - - public ICommand UpgradeAccountPlan - { - get; - private set; - } - public IReadOnlyList GitIgnoreTemplates { get; private set; diff --git a/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs b/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs index d2dca35e3c..24b5a7d04c 100644 --- a/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs +++ b/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs @@ -39,7 +39,6 @@ public class RepositoryCreationViewModel : RepositoryFormViewModel, IRepositoryC readonly IModelServiceFactory modelServiceFactory; readonly IRepositoryCreationService repositoryCreationService; readonly ObservableAsPropertyHelper isCreating; - readonly ObservableAsPropertyHelper canKeepPrivate; readonly IOperatingSystem operatingSystem; readonly IUsageTracker usageTracker; ObservableAsPropertyHelper> accounts; @@ -96,10 +95,6 @@ public RepositoryCreationViewModel( CreateRepository = InitializeCreateRepositoryCommand(); - canKeepPrivate = CanKeepPrivateObservable.CombineLatest(CreateRepository.IsExecuting, - (canKeep, publishing) => canKeep && !publishing) - .ToProperty(this, x => x.CanKeepPrivate); - isCreating = CreateRepository.IsExecuting .ToProperty(this, x => x.IsCreating); @@ -128,11 +123,6 @@ public string BaseRepositoryPath /// public bool IsCreating { get { return isCreating.Value; } } - /// - /// If the repo can be made private (depends on the user plan) - /// - public bool CanKeepPrivate { get { return canKeepPrivate.Value; } } - IReadOnlyList gitIgnoreTemplates; public IReadOnlyList GitIgnoreTemplates { diff --git a/src/GitHub.App/ViewModels/RepositoryFormViewModel.cs b/src/GitHub.App/ViewModels/RepositoryFormViewModel.cs index 6aa13f02b1..bd69c9b141 100644 --- a/src/GitHub.App/ViewModels/RepositoryFormViewModel.cs +++ b/src/GitHub.App/ViewModels/RepositoryFormViewModel.cs @@ -17,17 +17,6 @@ public abstract class RepositoryFormViewModel : ViewModelBase protected RepositoryFormViewModel() { - CanKeepPrivateObservable = this.WhenAny( - x => x.SelectedAccount.IsEnterprise, - x => x.SelectedAccount.IsOnFreePlan, - x => x.SelectedAccount.HasMaximumPrivateRepositories, - (isEnterprise, isOnFreePlan, hasMaxPrivateRepos) => - isEnterprise.Value || (!isOnFreePlan.Value && !hasMaxPrivateRepos.Value)); - - CanKeepPrivateObservable - .Where(x => !x) - .Subscribe(x => KeepPrivate = false); - safeRepositoryName = this.WhenAny(x => x.RepositoryName, x => x.Value) .Select(x => x != null ? GetSafeRepositoryName(x) : null) .ToProperty(this, x => x.SafeRepositoryName); @@ -85,14 +74,6 @@ public IAccount SelectedAccount set { this.RaiseAndSetIfChanged(ref selectedAccount, value); } } - public bool ShowUpgradePlanWarning { get; private set; } - - public bool ShowUpgradeToMicroPlanWarning { get; private set; } - - public ICommand UpgradeAccountPlan { get; private set; } - - protected IObservable CanKeepPrivateObservable { get; private set; } - // These are the characters which are permitted when creating a repository name on GitHub The Website static readonly Regex invalidRepositoryCharsRegex = new Regex(@"[^0-9A-Za-z_\.\-]", RegexOptions.ECMAScript); diff --git a/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs b/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs index 276cbeec1f..0dddb5f67f 100644 --- a/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs +++ b/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs @@ -31,7 +31,6 @@ public class RepositoryPublishViewModel : RepositoryFormViewModel, IRepositoryPu readonly IModelServiceFactory modelServiceFactory; readonly ObservableAsPropertyHelper> accounts; readonly ObservableAsPropertyHelper isHostComboBoxVisible; - readonly ObservableAsPropertyHelper canKeepPrivate; readonly ObservableAsPropertyHelper title; readonly IUsageTracker usageTracker; @@ -91,11 +90,6 @@ public RepositoryPublishViewModel( InitializeValidation(); PublishRepository = InitializePublishRepositoryCommand(); - - canKeepPrivate = CanKeepPrivateObservable.CombineLatest(PublishRepository.IsExecuting, - (canKeep, publishing) => canKeep && !publishing) - .ToProperty(this, x => x.CanKeepPrivate); - PublishRepository.IsExecuting.Subscribe(x => IsBusy = x); var defaultRepositoryName = repositoryPublishService.LocalRepositoryName; @@ -116,7 +110,6 @@ public RepositoryPublishViewModel( } public string Title { get { return title.Value; } } - public bool CanKeepPrivate { get { return canKeepPrivate.Value; } } public ReactiveCommand PublishRepository { get; private set; } public IReadOnlyObservableCollection Connections { get; private set; } diff --git a/src/GitHub.Exports.Reactive/ViewModels/IRepositoryForm.cs b/src/GitHub.Exports.Reactive/ViewModels/IRepositoryForm.cs index 6047d41daf..efb15369e7 100644 --- a/src/GitHub.Exports.Reactive/ViewModels/IRepositoryForm.cs +++ b/src/GitHub.Exports.Reactive/ViewModels/IRepositoryForm.cs @@ -41,18 +41,5 @@ public interface IRepositoryForm : IViewModel /// Indicates whether the created repository should be private or not. /// bool KeepPrivate { get; set; } - - /// - /// Indicates whether the user can create a private repository. This is false if the user is not a paid - /// account or if the user has run out of repositories for their current plan. - /// - bool CanKeepPrivate { get; } - bool ShowUpgradeToMicroPlanWarning { get; } - bool ShowUpgradePlanWarning { get; } - - /// - /// Command that opens a browser to a page for upgrading the user's plan. - /// - ICommand UpgradeAccountPlan { get; } } } diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml index 85b55ea5ae..81ab178240 100644 --- a/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml +++ b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml @@ -244,7 +244,6 @@ Padding="8,0,0,0" Style="{DynamicResource BlueRoundedCheckBox}" IsChecked="{Binding KeepPrivate}" - IsEnabled="{Binding CanKeepPrivate}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PrivateRepositoryCheckBox}" /> diff --git a/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml index c607de8f70..9f8647106d 100644 --- a/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml +++ b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml @@ -129,26 +129,9 @@ - - - - - - - - - + Content="{x:Static ghfvs:Resources.makePrivateContent}" + AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TeamExplorerPrivateRepositoryCheckBox}" />