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

Commit a611abc

Browse files
committed
Removed ValidationExtensions
As we decided that it was clearer to write out validation conditions explicitly in the VM.
1 parent 91ec2c4 commit a611abc

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<Compile Include="Caches\ImageCache.cs" />
125125
<Compile Include="Extensions\AkavacheExtensions.cs" />
126126
<Compile Include="Extensions\EnvironmentExtensions.cs" />
127-
<Compile Include="Extensions\ValidationExtensions.cs" />
128127
<Compile Include="Factories\UIFactory.cs" />
129128
<Compile Include="GlobalSuppressions.cs" />
130129
<Compile Include="Infrastructure\LoggingConfiguration.cs" />

src/GitHub.App/SampleData/SampleViewModels.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,11 @@ public RepositoryCloneViewModelDesigner()
377377
x => x
378378
);
379379

380-
BaseRepositoryPathValidator = this.CreateBaseRepositoryPathValidator();
380+
BaseRepositoryPathValidator = ReactivePropertyValidator.ForObservable(this.WhenAny(x => x.BaseRepositoryPath, x => x.Value))
381+
.IfNullOrEmpty("Please enter a repository path")
382+
.IfTrue(x => x.Length > 200, "Path too long")
383+
.IfContainsInvalidPathChars("Path contains invalid characters")
384+
.IfPathNotRooted("Please enter a valid path");
381385
}
382386

383387
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)