Fixed error when passed explicit Validator instance: System.InvalidOp…

…erationException: Cannot validate instances of type 'ModelSubType'. This validator can only validate instances of type 'ModelType'.
Liero · Feb 21, 2024 · 39564cf · 39564cf
1 parent 0ad8f73
commit 39564cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/vNext.BlazorComponents.FluentValidation/FluentValidationValidator.cs b/vNext.BlazorComponents.FluentValidation/FluentValidationValidator.cs
@@ -80,10 +80,15 @@ public virtual void ClearMessages()
         public virtual IValidator? ResolveValidator(FieldIdentifier fieldIdentifier = default)
         {
             if (EditContext == null) throw new InvalidOperationException("EditContext is null");
-            if (Validator != null) return Validator;
-
             object model = fieldIdentifier.Model ?? EditContext.Model;
-            Type interfaceValidatorType = typeof(IValidator<>).MakeGenericType(model.GetType());
+            Type modelType = model.GetType();
+
+            if (Validator != null && Validator.CanValidateInstancesOfType(modelType))
+            {
+                return Validator;
+            }
+
+            Type interfaceValidatorType = typeof(IValidator<>).MakeGenericType(modelType);
             var ctx = new ValidatorFactoryContext(interfaceValidatorType, ServiceProvider, EditContext, model, fieldIdentifier);
             return ValidatorFactory.CreateValidator(ctx);
         }

diff --git a/vNext.BlazorComponents.FluentValidation/vNext.BlazorComponents.FluentValidation.csproj b/vNext.BlazorComponents.FluentValidation/vNext.BlazorComponents.FluentValidation.csproj
@@ -5,8 +5,8 @@
 
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.1.2</Version>
-	<PackageVersion>1.1.2</PackageVersion>
+    <Version>1.1.3</Version>
+	<PackageVersion>1.1.3</PackageVersion>
     <Authors>Liero; Daniel Turan</Authors>
     <Company>vNext Software Consulting</Company>
     <PackageId>vNext.BlazorComponents.FluentValidation</PackageId>