Added support for collections of simple types (i.e. List<string>)

Blazored · Nov 25, 2024 · 61ba225 · 61ba225
1 parent 8afbf82
commit 61ba225
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs b/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs
@@ -99,13 +99,20 @@ private static async Task ValidateField(EditContext editContext,
         if (validator is not null)
         {
             var validationResults = await validator.ValidateAsync(new ValidationContext<object>(editContext.Model, new PropertyChain(), compositeSelector));
-            var errorMessages = validationResults.Errors
-                .Where(validationFailure => validationFailure.PropertyName == propertyPath)
-                .Select(validationFailure => validationFailure.ErrorMessage)
-                .Distinct();
+
+            List<string> errorMessages = new();
+            foreach (var validationResult in validationResults.Errors)
+            {
+                var newFieldIdentifier = ToFieldIdentifier(editContext, validationResult.PropertyName);
+                var newPropertyPath = PropertyPathHelper.ToFluentPropertyPath(editContext, newFieldIdentifier);
+                if (propertyPath == newPropertyPath)
+                {
+                    errorMessages.Add(validationResult.ErrorMessage);
+                }
+            }
 
             messages.Clear(fieldIdentifier);
-            messages.Add(fieldIdentifier, errorMessages);
+            messages.Add(fieldIdentifier, errorMessages.Distinct());
 
             editContext.NotifyValidationStateChanged();
         }
@@ -267,6 +274,13 @@ private static FieldIdentifier ToFieldIdentifier(in EditContext editContext, in
             nextTokenEnd = propertyPathAsSpan.IndexOfAny(Separators);
             if (nextTokenEnd < 0)
             {
+                // It's a collection of simple types
+                if (propertyPathAsSpan.EndsWith("]"))
+                {
+                    propertyPathAsSpan = propertyPathAsSpan.Slice(0, propertyPathAsSpan.Length - 1);
+                    return new FieldIdentifier(obj, propertyPathAsSpan.ToString());
+                }
+
                 return new FieldIdentifier(obj, propertyPathAsSpan.ToString());
             }
         }