Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit d29fb98

Browse files
grokysJasmine
authored and
Jasmine
committed
Removed ValidationExtensions
As we decided that it was clearer to write out validation conditions explicitly in the VM.
1 parent 670b185 commit d29fb98

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

src/GitHub.App/Extensions/ValidationExtensions.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/GitHub.App/GitHub.App.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
<Compile Include="Extensions\AkavacheExtensions.cs" />
119119
<Compile Include="Extensions\EnvironmentExtensions.cs" />
120120
<Compile Include="Extensions\ValidationExtensions.cs" />
121+
<Compile Include="Factories\UIFactory.cs" />
121122
<Compile Include="GlobalSuppressions.cs" />
122123
<Compile Include="Infrastructure\LoggingConfiguration.cs" />
123124
<Compile Include="Models\PullRequestModel.cs" />

src/GitHub.App/SampleData/SampleViewModels.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,11 @@ public RepositoryCloneViewModelDesigner()
447447
x => x
448448
);
449449

450-
BaseRepositoryPathValidator = this.CreateBaseRepositoryPathValidator();
450+
BaseRepositoryPathValidator = ReactivePropertyValidator.ForObservable(this.WhenAny(x => x.BaseRepositoryPath, x => x.Value))
451+
.IfNullOrEmpty("Please enter a repository path")
452+
.IfTrue(x => x.Length > 200, "Path too long")
453+
.IfContainsInvalidPathChars("Path contains invalid characters")
454+
.IfPathNotRooted("Please enter a valid path");
451455
}
452456

453457
public IReactiveCommand<Unit> CloneCommand

src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ public RepositoryCreationViewModel(
8080

8181
browseForDirectoryCommand.Subscribe(_ => ShowBrowseForDirectoryDialog());
8282

83-
BaseRepositoryPathValidator = this.CreateBaseRepositoryPathValidator();
83+
BaseRepositoryPathValidator = ReactivePropertyValidator.ForObservable(this.WhenAny(x => x.BaseRepositoryPath, x => x.Value))
84+
.IfNullOrEmpty("Please enter a repository path")
85+
.IfTrue(x => x.Length > 200, "Path too long")
86+
.IfContainsInvalidPathChars("Path contains invalid characters")
87+
.IfPathNotRooted("Please enter a valid path");
8488

8589
var nonNullRepositoryName = this.WhenAny(
8690
x => x.RepositoryName,

0 commit comments

Comments
 (0)