Only run rules for property being validated

Blazored · Dec 6, 2023 · a76ede9 · a76ede9
1 parent c2efc1c
commit a76ede9
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs b/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs
@@ -17,6 +17,9 @@ public static void AddFluentValidation(this EditContext editContext, IServicePro
         bool disableAssemblyScanning, IValidator? validator, FluentValidationValidator fluentValidationValidator)
     {
         ArgumentNullException.ThrowIfNull(editContext, nameof(editContext));
+
+        ValidatorOptions.Global.ValidatorSelectors.CompositeValidatorSelectorFactory =
+            (selectors) => new IntersectingCompositeValidatorSelector(selectors);
 
         var messages = new ValidationMessageStore(editContext);
 
@@ -89,17 +92,26 @@ private static async Task ValidateField(EditContext editContext,
 
         if (fluentValidationValidator.ValidateOptions is not null)
         {
-            context = ValidationContext<object>.CreateWithOptions(editContext.Model,
-                (options) => { fluentValidationValidator.ValidateOptions(options); });
+            context = ValidationContext<object>.CreateWithOptions(editContext.Model, (options) =>
+            {
+                fluentValidationValidator.ValidateOptions(options);
+                options.IncludeProperties(propertyPath);
+            });
         }
         else if (fluentValidationValidator.Options is not null)
         {
-            context = ValidationContext<object>.CreateWithOptions(editContext.Model,
-                (options) => { fluentValidationValidator.Options(options); });
+            context = ValidationContext<object>.CreateWithOptions(editContext.Model, (options) =>
+            {
+                fluentValidationValidator.Options(options);
+                options.IncludeProperties(propertyPath);
+            });
         }
         else
         {
-            context = new ValidationContext<object>(editContext.Model);
+            context = ValidationContext<object>.CreateWithOptions(editContext.Model, (options) =>
+            {
+                options.IncludeProperties(propertyPath);
+            });
         }
 
         validator ??= GetValidatorForModel(serviceProvider, editContext.Model, disableAssemblyScanning);
@@ -108,7 +120,6 @@ private static async Task ValidateField(EditContext editContext,
         {
             var validationResults = await validator.ValidateAsync(context);
             var errorMessages = validationResults.Errors
-                .Where(validationFailure => validationFailure.PropertyName == propertyPath)
                 .Select(validationFailure => validationFailure.ErrorMessage)
                 .Distinct();
 

diff --git a/src/Blazored.FluentValidation/IntersectingCompositeValidatorSelector.cs b/src/Blazored.FluentValidation/IntersectingCompositeValidatorSelector.cs
@@ -0,0 +1,16 @@
+using FluentValidation;
+using FluentValidation.Internal;
+
+namespace Blazored.FluentValidation;
+
+internal class IntersectingCompositeValidatorSelector : IValidatorSelector {
+    private readonly IEnumerable<IValidatorSelector> _selectors;
+
+    public IntersectingCompositeValidatorSelector(IEnumerable<IValidatorSelector> selectors) {
+        _selectors = selectors;
+    }
+
+    public bool CanExecute(IValidationRule rule, string propertyPath, IValidationContext context) {
+        return _selectors.All(s => s.CanExecute(rule, propertyPath, context));
+    }
+}