Merge pull request #8 from magahl/fix-validate-error-on-nested

Validating whole model every time

Author: magahl

TabBlazor.FluentValidation.Server/Pages/AsyncForm.razor

@@ -18,6 +18,11 @@
                 <InputText class="form-control" @bind-Value="Model.Directory"></InputText>
                 <ValidationMessage For="(() => Model.Directory)"></ValidationMessage>
             </div>
+            <div class="mb-3">
+                <label class="form-label">Person Name</label>
+                <InputText class="form-control" @bind-Value="Model.Owner.Name"></InputText>
+                <ValidationMessage For="(() => Model.Owner.Name)"></ValidationMessage>
+            </div>
 
             <Button Type="ButtonType.Button" Text="Save" class="mt-1" OnClick="Save"></Button>
         </TablerForm>

TabBlazor.FluentValidation.Server/Pages/AsyncForm.razor.cs

@@ -15,7 +15,7 @@ public partial class AsyncForm
 
     protected override void OnInitialized()
     {
-        Model = new Document() { Name = "Magnus", Directory = "C:/Test" };
+        Model = new Document() { Name = "Magnus", Directory = "C:/Test", Owner = new Person() { Name = "Kalle" } };
     }
 
     private async Task Save()

TabBlazor.FluentValidation.Server/Validation/Document.cs

@@ -6,6 +6,8 @@ public class Document
 {
     public string Name { get; set; }
     public string Directory { get; set; }
+
+    public Person Owner { get; set; }
 }
 
 public class DocumentValidator : AbstractValidator<Document>
@@ -25,5 +27,8 @@ public DocumentValidator()
                 return result;
             })
             .WithMessage("Directory must be C:/Temp");
+
+        RuleFor(x => x.Owner)
+            .SetValidator(new PersonValidator());
     }
 }

src/TabBlazor.FluentValidation/FluentValidationSubscription.cs

@@ -19,10 +19,10 @@ public class FluentValidationSubscription : IDisposable
     private readonly ValidationMessageStore messages;
 
     public FluentValidationSubscription(
-        EditContext editContext, 
+        EditContext editContext,
         IServiceProvider serviceProvider,
-        bool disableAssemblyScanning, 
-        IValidator validator, 
+        bool disableAssemblyScanning,
+        IValidator validator,
         FluentValidationValidator fluentValidationValidator)
     {
         this.editContext = editContext;
@@ -33,11 +33,11 @@ public FluentValidationSubscription(
 
         messages = new ValidationMessageStore(editContext);
 
-        editContext.OnValidationRequested += ValidateModel;
-        editContext.OnFieldChanged += ValidateField;
+        editContext.OnFieldChanged += (_, _) => ValidateModel();
+        editContext.OnValidationRequested += (_, _) => ValidateModel();
     }
 
-    private async void ValidateModel(object sender, ValidationRequestedEventArgs e)
+    private async void ValidateModel()
     {
         validator ??= GetValidatorForModel(serviceProvider, editContext.Model, disableAssemblyScanning);
 
@@ -75,26 +75,6 @@ private async void ValidateModel(object sender, ValidationRequestedEventArgs e)
         }
     }
 
-    private async void ValidateField(object sender, FieldChangedEventArgs e)
-    {
-        var fieldIdentifier = e.FieldIdentifier;
-        var properties = new[] { fieldIdentifier.FieldName };
-        var context = new ValidationContext<object>(fieldIdentifier.Model, new PropertyChain(),
-            new MemberNameValidatorSelector(properties));
-
-        validator ??= GetValidatorForModel(serviceProvider, fieldIdentifier.Model, disableAssemblyScanning);
-
-        if (validator is not null)
-        {
-            var validationResults = await validator.ValidateAsync(context);
-
-            messages.Clear(fieldIdentifier);
-            messages.Add(fieldIdentifier, validationResults.Errors.Select(error => error.ErrorMessage));
-
-            editContext.NotifyValidationStateChanged();
-        }
-    }
-
     private IValidator GetValidatorForModel(IServiceProvider serviceProvider, object model,
         bool disableAssemblyScanning)
     {
@@ -233,8 +213,8 @@ private FieldIdentifier ToFieldIdentifier(in EditContext editContext, in string
 
     public void Dispose()
     {
-        editContext.OnFieldChanged -= ValidateField;
-        editContext.OnValidationRequested -= ValidateModel;
+        editContext.OnFieldChanged -= (_, _) => ValidateModel();
+        editContext.OnValidationRequested -= (_, _) => ValidateModel();
         messages.Clear();
         editContext.NotifyValidationStateChanged();
     }