From f61aecbe05a00d3d1bfe8146f7882344a9c97e5f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 22 May 2025 15:56:12 +0000 Subject: [PATCH 01/18] Initial plan for issue From 194ea8d6aa18071e275a6718fff0c3c44d9084d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Sat, 17 May 2025 00:25:57 +0200 Subject: [PATCH 02/18] Use the unified validation instractructure for EditForm validation --- .../EditContextDataAnnotationsExtensions.cs | 71 +++++++++++++++++++ ...crosoft.AspNetCore.Components.Forms.csproj | 1 + 2 files changed, 72 insertions(+) diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs index e15b90c0e42d..46aa41ddff24 100644 --- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs +++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs @@ -7,6 +7,9 @@ using System.Reflection; using System.Reflection.Metadata; using System.Runtime.InteropServices; +using Microsoft.AspNetCore.Http.Validation; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; [assembly: MetadataUpdateHandler(typeof(Microsoft.AspNetCore.Components.Forms.EditContextDataAnnotationsExtensions))] @@ -112,6 +115,13 @@ private void OnFieldChanged(object? sender, FieldChangedEventArgs eventArgs) private void OnValidationRequested(object? sender, ValidationRequestedEventArgs e) { var validationContext = new ValidationContext(_editContext.Model, _serviceProvider, items: null); + + if (TryValidateTypeInfo(validationContext)) + { + _editContext.NotifyValidationStateChanged(); + return; + } + var validationResults = new List(); Validator.TryValidateObject(_editContext.Model, validationContext, validationResults, true); @@ -140,6 +150,52 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs _editContext.NotifyValidationStateChanged(); } +#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. + private bool TryValidateTypeInfo(ValidationContext validationContext) + { + var options = _serviceProvider?.GetService>()?.Value; + + if (options == null || !options.TryGetValidatableTypeInfo(_editContext.Model.GetType(), out var typeInfo)) + { + return false; + } + + var validateContext = new ValidateContext + { + ValidationOptions = options, + ValidationContext = validationContext, + }; + + var validationTask = typeInfo.ValidateAsync(_editContext.Model, validateContext, CancellationToken.None); + + if (!validationTask.IsCompleted) + { + throw new InvalidOperationException("Async validation is not supported"); + } + + var validationErrors = validateContext.ValidationErrors; + + // Transfer results to the ValidationMessageStore + _messages.Clear(); + + if (validationErrors is not null && validationErrors.Count > 0) + { + foreach (var (key, value) in validationErrors) + { + var keySegments = key.Split('.'); + var container = keySegments.Length > 1 + ? GetPropertyByPath(_editContext.Model, keySegments[..^1]) + : _editContext.Model; + var fieldName = keySegments[^1]; + + _messages.Add(new FieldIdentifier(container, fieldName), value); + } + } + + return true; + } +#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. + public void Dispose() { _messages.Clear(); @@ -174,5 +230,20 @@ internal void ClearCache() { _propertyInfoCache.Clear(); } + + // TODO(OR): Replace this with more robust implementation. + private static object GetPropertyByPath(object obj, string[] path) + { + var currentObject = obj; + + foreach (string propertyName in path) + { + Type currentType = currentObject!.GetType(); + PropertyInfo propertyInfo = currentType.GetProperty(propertyName)!; + currentObject = propertyInfo.GetValue(currentObject); + } + + return currentObject!; + } } } diff --git a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj index 654c4ac2d3fe..45643f54d35e 100644 --- a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj +++ b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj @@ -11,6 +11,7 @@ + From cc518808846457a55b87b12061cbb9fb4494fdde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Sat, 17 May 2025 00:26:44 +0200 Subject: [PATCH 03/18] Add EditForm validation sample --- .../BlazorUnitedApp/BlazorUnitedApp.csproj | 9 +++ .../Samples/BlazorUnitedApp/Pages/Index.razor | 37 +--------- .../BlazorUnitedApp/Pages/ValidatedForm.razor | 70 +++++++++++++++++++ .../Samples/BlazorUnitedApp/Program.cs | 2 + .../BlazorUnitedApp/Shared/NavMenu.razor | 5 ++ .../BlazorUnitedApp/Validation/Types.cs | 41 +++++++++++ 6 files changed, 128 insertions(+), 36 deletions(-) create mode 100644 src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor create mode 100644 src/Components/Samples/BlazorUnitedApp/Validation/Types.cs diff --git a/src/Components/Samples/BlazorUnitedApp/BlazorUnitedApp.csproj b/src/Components/Samples/BlazorUnitedApp/BlazorUnitedApp.csproj index 62460261002b..cf687ec7ba1c 100644 --- a/src/Components/Samples/BlazorUnitedApp/BlazorUnitedApp.csproj +++ b/src/Components/Samples/BlazorUnitedApp/BlazorUnitedApp.csproj @@ -4,12 +4,21 @@ $(DefaultNetCoreTargetFramework) false enable + + $(InterceptorsNamespaces);Microsoft.AspNetCore.Http.Validation.Generated + true + + + + diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/Index.razor b/src/Components/Samples/BlazorUnitedApp/Pages/Index.razor index 6604c511e2ba..caa747cb9240 100644 --- a/src/Components/Samples/BlazorUnitedApp/Pages/Index.razor +++ b/src/Components/Samples/BlazorUnitedApp/Pages/Index.razor @@ -2,39 +2,4 @@ @using BlazorUnitedApp.Data; Index - -
- -
- - - - -@if (_submitted) -{ - -

Customer

-

Name: @Value!.Name

-

Street: @Value.BillingAddress.Street

-

City: @Value.BillingAddress.City

-

State: @Value.BillingAddress.State

-

Zip: @Value.BillingAddress.Zip

-} - -@code { - - public void DisplayCustomer() - { - _submitted = true; - } - - [SupplyParameterFromForm] Customer? Value { get; set; } - - protected override void OnInitialized() => Value ??= new(); - - bool _submitted = false; - public void Submit() => _submitted = true; -} +

Welcome to Blazor

diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor b/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor new file mode 100644 index 000000000000..c97f5597672f --- /dev/null +++ b/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor @@ -0,0 +1,70 @@ +@page "/validated-form" +@rendermode InteractiveServer + +@using System.ComponentModel.DataAnnotations +@using System.Text.Json +@using BlazorUnitedApp.Validation + +Validated Form + +

Validated Form

+ + +
@StatusMessage
+ + + + +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ + + + +@code +{ + private string? StatusMessage; + private string? StatusClass; + + private GuestbookEntry Model = new GuestbookEntry(); + + protected void HandleValidSubmit() + { + StatusClass = "alert-info"; + StatusMessage = DateTime.Now + " Handle valid submit"; + } + + protected void HandleInvalidSubmit() + { + StatusClass = "alert-danger"; + StatusMessage = DateTime.Now + " Handle invalid submit"; + } +} diff --git a/src/Components/Samples/BlazorUnitedApp/Program.cs b/src/Components/Samples/BlazorUnitedApp/Program.cs index 6492f3fb3e50..9fb1293a52ab 100644 --- a/src/Components/Samples/BlazorUnitedApp/Program.cs +++ b/src/Components/Samples/BlazorUnitedApp/Program.cs @@ -13,6 +13,8 @@ builder.Services.AddSingleton(); +builder.Services.AddValidation(); + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor b/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor index 3801dfc18932..99a708e11b31 100644 --- a/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor +++ b/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor @@ -14,6 +14,11 @@ Home +
+ + Validated form + +
Counter diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs b/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs new file mode 100644 index 000000000000..f07e6f7cdf0a --- /dev/null +++ b/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs @@ -0,0 +1,41 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Http.Validation; + +namespace BlazorUnitedApp.Validation; + +#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. +[ValidatableType] +#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. +public class GuestbookEntry +{ + [Required] + public Author Author { get; set; } = new Author(); + + [Required] + public string? Text { get; set; } +} + +public class Author +{ + [Required] + public string? Name { get; set; } + + [EmailAddress] + public string? Email { get; set; } + + public Address Address { get; set; } = new Address(); + + [Range(0, 150)] + public int? Age { get; set; } +} + +public class Address +{ + [Required] + public string? City { get; set; } + + public string? Street { get; set; } +} From 5bcdebad4445a78e026b3ec010d4c62f57802e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Mon, 19 May 2025 14:33:18 +0200 Subject: [PATCH 04/18] Add support for enumerable collections --- .../EditContextDataAnnotationsExtensions.cs | 98 ++++++++++++++----- .../BlazorUnitedApp/Pages/ValidatedForm.razor | 53 ++++++++-- .../BlazorUnitedApp/Validation/Types.cs | 9 ++ 3 files changed, 128 insertions(+), 32 deletions(-) diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs index 46aa41ddff24..57fa4d460468 100644 --- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs +++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs @@ -1,12 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Collections; using System.Collections.Concurrent; using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; +using System.Linq; using System.Reflection; using System.Reflection.Metadata; using System.Runtime.InteropServices; +using System.Text.RegularExpressions; using Microsoft.AspNetCore.Http.Validation; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; @@ -18,7 +21,7 @@ namespace Microsoft.AspNetCore.Components.Forms; /// /// Extension methods to add DataAnnotations validation to an . /// -public static class EditContextDataAnnotationsExtensions +public static partial class EditContextDataAnnotationsExtensions { /// /// Adds DataAnnotations validation support to the . @@ -62,7 +65,7 @@ private static void ClearCache(Type[]? _) } #pragma warning restore IDE0051 // Remove unused private members - private sealed class DataAnnotationsEventSubscriptions : IDisposable + private sealed partial class DataAnnotationsEventSubscriptions : IDisposable { private static readonly ConcurrentDictionary<(Type ModelType, string FieldName), PropertyInfo?> _propertyInfoCache = new(); @@ -85,6 +88,7 @@ public DataAnnotationsEventSubscriptions(EditContext editContext, IServiceProvid } } + // TODO(OR): Should this also use ValidatablePropertyInfo.ValidateAsync? [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Model types are expected to be defined in assemblies that do not get trimmed.")] private void OnFieldChanged(object? sender, FieldChangedEventArgs eventArgs) { @@ -180,15 +184,13 @@ private bool TryValidateTypeInfo(ValidationContext validationContext) if (validationErrors is not null && validationErrors.Count > 0) { - foreach (var (key, value) in validationErrors) + foreach (var (fieldPath, messages) in validationErrors) { - var keySegments = key.Split('.'); - var container = keySegments.Length > 1 - ? GetPropertyByPath(_editContext.Model, keySegments[..^1]) - : _editContext.Model; - var fieldName = keySegments[^1]; + var dotSegments = fieldPath.Split('.'); + var fieldName = dotSegments[^1]; + var fieldContainer = GetFieldContainer(_editContext.Model, dotSegments[..^1]); - _messages.Add(new FieldIdentifier(container, fieldName), value); + _messages.Add(new FieldIdentifier(fieldContainer, fieldName), messages); } } @@ -196,6 +198,67 @@ private bool TryValidateTypeInfo(ValidationContext validationContext) } #pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. + // TODO(OR): Replace this with a more robust implementation or a different approach. Ideally, collect references during the validation process itself. + private static object GetFieldContainer(object obj, string[] dotSegments) + { + // The method does not check nullity and index bounds everywhere as the path is constructed internally and assumed to be correct. + object currentObject = obj; + + for (int i = 0; i < dotSegments.Length; i++) + { + string segment = dotSegments[i]; + + if (currentObject == null) + { + string traversedPath = string.Join(".", dotSegments.Take(i)); + throw new ArgumentException($"Cannot access segment '{segment}' because the path '{traversedPath}' resolved to null."); + } + + Match match = _pathSegmentRegex.Match(segment); + if (!match.Success) + { + throw new ArgumentException($"Invalid path segment: '{segment}'."); + } + + string propertyName = match.Groups[1].Value; + string? indexStr = match.Groups[2].Success ? match.Groups[2].Value : null; + + Type currentType = currentObject.GetType(); + PropertyInfo propertyInfo = currentType.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase); + object propertyValue = propertyInfo!.GetValue(currentObject)!; + + if (indexStr != null) // Indexed access + { + if (!int.TryParse(indexStr, out int index)) + { + throw new ArgumentException($"Invalid index '{indexStr}' in segment '{segment}'."); + } + + if (propertyValue is Array array) + { + currentObject = array.GetValue(index)!; + } + else if (propertyValue is IList list) + { + currentObject = list[index]!; + } + else if (propertyValue is IEnumerable enumerable) + { + currentObject = enumerable.Cast().ElementAt(index); + } + else + { + throw new ArgumentException($"Property '{propertyName}' is not an array, list, or enumerable. Cannot access by index in segment '{segment}'."); + } + } + else // Simple property access + { + currentObject = propertyValue; + } + } + return currentObject!; + } + public void Dispose() { _messages.Clear(); @@ -231,19 +294,10 @@ internal void ClearCache() _propertyInfoCache.Clear(); } - // TODO(OR): Replace this with more robust implementation. - private static object GetPropertyByPath(object obj, string[] path) - { - var currentObject = obj; - - foreach (string propertyName in path) - { - Type currentType = currentObject!.GetType(); - PropertyInfo propertyInfo = currentType.GetProperty(propertyName)!; - currentObject = propertyInfo.GetValue(currentObject); - } + private static readonly Regex _pathSegmentRegex = PathSegmentRegexGen(); - return currentObject!; - } + // Regex to parse "PropertyName" or "PropertyName[index]" + [GeneratedRegex(@"^([a-zA-Z_]\w*)(?:\[(\d+)\])?$", RegexOptions.Compiled)] + private static partial Regex PathSegmentRegexGen(); } } diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor b/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor index c97f5597672f..2a68d3451134 100644 --- a/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor +++ b/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor @@ -11,10 +11,10 @@
@StatusMessage
- + - +
@@ -41,27 +41,60 @@
- - - + + +
+ + + @for (int i = 0; i < Model.Messages.Count; i++) + { + var itemIndex = i; +
+
Item @(itemIndex + 1)
+
+ + + +
+ +
+ } + + + - + - + @code { private string? StatusMessage; private string? StatusClass; - + + private List> ListModel = new List> { new List
{ new Address { City = "Brno" }, new Address { } } }; + private GuestbookEntry Model = new GuestbookEntry(); - + + private void AddMessage() + { + Model.Messages.Add(new Message()); + } + + private void RemoveItem(int index) + { + if (index >= 0 && index < Model.Messages.Count) + { + Model.Messages.RemoveAt(index); + } + } + protected void HandleValidSubmit() { StatusClass = "alert-info"; StatusMessage = DateTime.Now + " Handle valid submit"; } - + protected void HandleInvalidSubmit() { StatusClass = "alert-danger"; diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs b/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs index f07e6f7cdf0a..9673c283a023 100644 --- a/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs +++ b/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs @@ -15,6 +15,15 @@ public class GuestbookEntry public Author Author { get; set; } = new Author(); [Required] + public string? Title { get; set; } + + public List Messages { get; set; } = []; +} + +public class Message +{ + [Required] + [StringLength(50, ErrorMessage = "Name is too long.")] public string? Text { get; set; } } From 2ed691eaaa085c1528d80cb73fb946d4f20276e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Mon, 19 May 2025 16:06:07 +0200 Subject: [PATCH 05/18] Add more complex demo --- .../Pages/ComplexFormPage.razor | 182 ++++++++++++++++++ .../BlazorUnitedApp/Pages/ValidatedForm.razor | 103 ---------- .../BlazorUnitedApp/Shared/NavMenu.razor | 4 +- .../Validation/AddressModel.cs | 16 ++ .../Validation/CustomerModel.cs | 19 ++ .../Validation/OrderItemModel.cs | 16 ++ .../BlazorUnitedApp/Validation/OrderModel.cs | 23 +++ .../BlazorUnitedApp/Validation/Types.cs | 50 ----- 8 files changed, 258 insertions(+), 155 deletions(-) create mode 100644 src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor delete mode 100644 src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor create mode 100644 src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs create mode 100644 src/Components/Samples/BlazorUnitedApp/Validation/CustomerModel.cs create mode 100644 src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs create mode 100644 src/Components/Samples/BlazorUnitedApp/Validation/OrderModel.cs delete mode 100644 src/Components/Samples/BlazorUnitedApp/Validation/Types.cs diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor b/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor new file mode 100644 index 000000000000..b6b2b294c91d --- /dev/null +++ b/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor @@ -0,0 +1,182 @@ +@page "/complex-form" +@rendermode InteractiveServer + +@using System.ComponentModel.DataAnnotations +@using BlazorUnitedApp.Validation + +Validated Order Form + +

Validated Order Form

+ + + + +
+

Order Details

+
+ + + +
+ +
+ +

Customer Details

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+ +
Shipping Address
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+
+ +
+ +

Order Items

+ @if (order.OrderItems.Any()) + { + for (int i = 0; i < order.OrderItems.Count; i++) + { + var itemIndex = i; +
+
+ Item @(itemIndex + 1) + +
+
+
+ + + +
+
+
+ + + +
+
+ + + +
+
+
+
+ } + } + else + { +

No order items. Add one below.

+ } + + + +
+ +
+ +
+ + +
+ + +@if (submitted) +{ + +} + +@if (submitFailed) +{ + +} + + +@code { + private OrderModel order = new OrderModel(); + private bool submitted = false; + private bool submitFailed = false; + + private void HandleValidSubmit() + { + Console.WriteLine("Form submitted successfully!"); + // Here you would typically process the order + // For demo purposes, we'll just display a success message + submitted = true; + submitFailed = false; + // To see the data in console: + // System.Text.Json.JsonSerializer.Serialize(order); + } + + private void HandleInvalidSubmit() + { + Console.WriteLine("Form submission failed due to validation errors."); + submitted = false; + submitFailed = true; + } + + private void AddOrderItem() + { + order.OrderItems.Add(new OrderItemModel()); + submitted = false; // Reset submission status + submitFailed = false; + } + + private void RemoveOrderItem(int index) + { + if (index >= 0 && index < order.OrderItems.Count) + { + order.OrderItems.RemoveAt(index); + } + submitted = false; // Reset submission status + submitFailed = false; + } +} diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor b/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor deleted file mode 100644 index 2a68d3451134..000000000000 --- a/src/Components/Samples/BlazorUnitedApp/Pages/ValidatedForm.razor +++ /dev/null @@ -1,103 +0,0 @@ -@page "/validated-form" -@rendermode InteractiveServer - -@using System.ComponentModel.DataAnnotations -@using System.Text.Json -@using BlazorUnitedApp.Validation - -Validated Form - -

Validated Form

- - -
@StatusMessage
- - - - -
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
- - - @for (int i = 0; i < Model.Messages.Count; i++) - { - var itemIndex = i; -
-
Item @(itemIndex + 1)
-
- - - -
- -
- } - - - - - - - -@code -{ - private string? StatusMessage; - private string? StatusClass; - - private List> ListModel = new List> { new List
{ new Address { City = "Brno" }, new Address { } } }; - - private GuestbookEntry Model = new GuestbookEntry(); - - private void AddMessage() - { - Model.Messages.Add(new Message()); - } - - private void RemoveItem(int index) - { - if (index >= 0 && index < Model.Messages.Count) - { - Model.Messages.RemoveAt(index); - } - } - - protected void HandleValidSubmit() - { - StatusClass = "alert-info"; - StatusMessage = DateTime.Now + " Handle valid submit"; - } - - protected void HandleInvalidSubmit() - { - StatusClass = "alert-danger"; - StatusMessage = DateTime.Now + " Handle invalid submit"; - } -} diff --git a/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor b/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor index 99a708e11b31..b5e52b76837d 100644 --- a/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor +++ b/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor @@ -15,8 +15,8 @@
- - Validated form + + Form validation
diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs b/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs new file mode 100644 index 000000000000..cc3361da5265 --- /dev/null +++ b/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs @@ -0,0 +1,16 @@ +using System.ComponentModel.DataAnnotations; + +namespace BlazorUnitedApp.Validation; + +public class AddressModel +{ + [Required(ErrorMessage = "Street is required.")] + public string? Street { get; set; } + + [Required(ErrorMessage = "City is required.")] + public string? City { get; set; } + + [Required(ErrorMessage = "Zip Code is required.")] + [StringLength(10, MinimumLength = 5, ErrorMessage = "Zip Code must be between 5 and 10 characters.")] + public string? ZipCode { get; set; } +} diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/CustomerModel.cs b/src/Components/Samples/BlazorUnitedApp/Validation/CustomerModel.cs new file mode 100644 index 000000000000..ef7bc94ebc50 --- /dev/null +++ b/src/Components/Samples/BlazorUnitedApp/Validation/CustomerModel.cs @@ -0,0 +1,19 @@ +using System.ComponentModel.DataAnnotations; + +namespace BlazorUnitedApp.Validation; + +public class CustomerModel +{ + [Required(ErrorMessage = "Full Name is required.")] + public string? FullName { get; set; } + + [Required(ErrorMessage = "Email is required.")] + [EmailAddress(ErrorMessage = "Invalid Email Address.")] + public string? Email { get; set; } + + [Required(ErrorMessage = "Age is required.")] + [Range(18, 99, ErrorMessage = "Age must be between 18 and 99.")] + public int? Age { get; set; } + + public AddressModel ShippingAddress { get; set; } = new AddressModel(); +} diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs b/src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs new file mode 100644 index 000000000000..5088c9e97b47 --- /dev/null +++ b/src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs @@ -0,0 +1,16 @@ +using System.ComponentModel.DataAnnotations; + +namespace BlazorUnitedApp.Validation; + +public class OrderItemModel +{ + [Required(ErrorMessage = "Product Name is required.")] + public string? ProductName { get; set; } + + [Range(1, 100, ErrorMessage = "Quantity must be between 1 and 100.")] + public int Quantity { get; set; } = 1; + + [Range(0.01, 1000.00, ErrorMessage = "Price must be between $0.01 and $1000.00.")] + [DataType(DataType.Currency)] + public decimal Price { get; set; } = 0.01m; +} diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/OrderModel.cs b/src/Components/Samples/BlazorUnitedApp/Validation/OrderModel.cs new file mode 100644 index 000000000000..342101fbe332 --- /dev/null +++ b/src/Components/Samples/BlazorUnitedApp/Validation/OrderModel.cs @@ -0,0 +1,23 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Http.Validation; + +namespace BlazorUnitedApp.Validation; + +#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. +[ValidatableType] +#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. +public class OrderModel +{ + [Required(ErrorMessage = "Order Name is required.")] + [StringLength(100, ErrorMessage = "Order Name cannot be longer than 100 characters.")] + public string? OrderName { get; set; } + + public CustomerModel CustomerDetails { get; set; } = new CustomerModel(); + + public List OrderItems { get; set; } = new List(); + + public OrderModel() + { + OrderItems.Add(new OrderItemModel()); + } +} diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs b/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs deleted file mode 100644 index 9673c283a023..000000000000 --- a/src/Components/Samples/BlazorUnitedApp/Validation/Types.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System.ComponentModel.DataAnnotations; -using Microsoft.AspNetCore.Http.Validation; - -namespace BlazorUnitedApp.Validation; - -#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. -[ValidatableType] -#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. -public class GuestbookEntry -{ - [Required] - public Author Author { get; set; } = new Author(); - - [Required] - public string? Title { get; set; } - - public List Messages { get; set; } = []; -} - -public class Message -{ - [Required] - [StringLength(50, ErrorMessage = "Name is too long.")] - public string? Text { get; set; } -} - -public class Author -{ - [Required] - public string? Name { get; set; } - - [EmailAddress] - public string? Email { get; set; } - - public Address Address { get; set; } = new Address(); - - [Range(0, 150)] - public int? Age { get; set; } -} - -public class Address -{ - [Required] - public string? City { get; set; } - - public string? Street { get; set; } -} From 4d0634f4ed12e6b4c396e09f780e1a8ffa3cca3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Mon, 19 May 2025 16:35:58 +0200 Subject: [PATCH 06/18] Improve demo --- .../Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor | 7 ------- .../Samples/BlazorUnitedApp/Validation/AddressModel.cs | 3 --- 2 files changed, 10 deletions(-) diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor b/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor index b6b2b294c91d..e21d7b14f0e1 100644 --- a/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor +++ b/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor @@ -6,8 +6,6 @@ Validated Order Form -

Validated Order Form

- @@ -48,11 +46,6 @@
-
- - - -
diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs b/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs index cc3361da5265..a78076c26e5c 100644 --- a/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs +++ b/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs @@ -7,9 +7,6 @@ public class AddressModel [Required(ErrorMessage = "Street is required.")] public string? Street { get; set; } - [Required(ErrorMessage = "City is required.")] - public string? City { get; set; } - [Required(ErrorMessage = "Zip Code is required.")] [StringLength(10, MinimumLength = 5, ErrorMessage = "Zip Code must be between 5 and 10 characters.")] public string? ZipCode { get; set; } From 460e60520dce9961361b9649e906c284ee73b465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Mon, 19 May 2025 22:53:40 +0200 Subject: [PATCH 07/18] Suppress trimming warnings, refactor --- .../EditContextDataAnnotationsExtensions.cs | 29 +++++++++++-------- .../Validation/AddressModel.cs | 3 ++ .../Validation/OrderItemModel.cs | 3 ++ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs index 57fa4d460468..9b3e065eb222 100644 --- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs +++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs @@ -120,12 +120,17 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs { var validationContext = new ValidationContext(_editContext.Model, _serviceProvider, items: null); - if (TryValidateTypeInfo(validationContext)) + if (!TryValidateTypeInfo(validationContext)) { - _editContext.NotifyValidationStateChanged(); - return; + ValidateWithDefaultValidator(validationContext); } + _editContext.NotifyValidationStateChanged(); + } + + [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Model types are expected to be defined in assemblies that do not get trimmed.")] + private void ValidateWithDefaultValidator(ValidationContext validationContext) + { var validationResults = new List(); Validator.TryValidateObject(_editContext.Model, validationContext, validationResults, true); @@ -150,8 +155,6 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs _messages.Add(new FieldIdentifier(_editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!); } } - - _editContext.NotifyValidationStateChanged(); } #pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. @@ -199,9 +202,10 @@ private bool TryValidateTypeInfo(ValidationContext validationContext) #pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. // TODO(OR): Replace this with a more robust implementation or a different approach. Ideally, collect references during the validation process itself. + [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Model types are expected to be defined in assemblies that do not get trimmed.")] private static object GetFieldContainer(object obj, string[] dotSegments) { - // The method does not check nullity and index bounds everywhere as the path is constructed internally and assumed to be correct. + // The method does not check all possiblle null access and index bound errors as the path is constructed internally and assumed to be correct. object currentObject = obj; for (int i = 0; i < dotSegments.Length; i++) @@ -224,10 +228,14 @@ private static object GetFieldContainer(object obj, string[] dotSegments) string? indexStr = match.Groups[2].Success ? match.Groups[2].Value : null; Type currentType = currentObject.GetType(); - PropertyInfo propertyInfo = currentType.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase); + PropertyInfo propertyInfo = currentType!.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance)!; object propertyValue = propertyInfo!.GetValue(currentObject)!; - if (indexStr != null) // Indexed access + if (indexStr == null) // Simple property access + { + currentObject = propertyValue; + } + else // Indexed access { if (!int.TryParse(indexStr, out int index)) { @@ -251,10 +259,7 @@ private static object GetFieldContainer(object obj, string[] dotSegments) throw new ArgumentException($"Property '{propertyName}' is not an array, list, or enumerable. Cannot access by index in segment '{segment}'."); } } - else // Simple property access - { - currentObject = propertyValue; - } + } return currentObject!; } diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs b/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs index a78076c26e5c..5c86af8d8cc9 100644 --- a/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs +++ b/src/Components/Samples/BlazorUnitedApp/Validation/AddressModel.cs @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + using System.ComponentModel.DataAnnotations; namespace BlazorUnitedApp.Validation; diff --git a/src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs b/src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs index 5088c9e97b47..cfc1879bebcd 100644 --- a/src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs +++ b/src/Components/Samples/BlazorUnitedApp/Validation/OrderItemModel.cs @@ -1,3 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + using System.ComponentModel.DataAnnotations; namespace BlazorUnitedApp.Validation; From 9cd6c5dbb83070ea795ee1ad85927189a4e3f3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Wed, 21 May 2025 15:25:12 +0200 Subject: [PATCH 08/18] Add OnValidationError event to ValidateContext, use it to get field container instances in Blazor validation --- .../EditContextDataAnnotationsExtensions.cs | 26 +++++++++++++------ .../src/ValidatableParameterInfo.cs | 6 ++--- src/Validation/src/ValidatablePropertyInfo.cs | 10 +++---- src/Validation/src/ValidatableTypeInfo.cs | 4 +-- src/Validation/src/ValidateContext.cs | 16 +++++++++--- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs index 9b3e065eb222..bb349a5ff517 100644 --- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs +++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs @@ -173,6 +173,10 @@ private bool TryValidateTypeInfo(ValidationContext validationContext) ValidationContext = validationContext, }; + var containerMapping = new Dictionary(); + + validateContext.OnValidationError += (key, _, container) => containerMapping[key] = container; + var validationTask = typeInfo.ValidateAsync(_editContext.Model, validateContext, CancellationToken.None); if (!validationTask.IsCompleted) @@ -187,11 +191,16 @@ private bool TryValidateTypeInfo(ValidationContext validationContext) if (validationErrors is not null && validationErrors.Count > 0) { - foreach (var (fieldPath, messages) in validationErrors) + foreach (var (fieldKey, messages) in validationErrors) { - var dotSegments = fieldPath.Split('.'); - var fieldName = dotSegments[^1]; - var fieldContainer = GetFieldContainer(_editContext.Model, dotSegments[..^1]); + // Reverse mapping based on storing references during validation + var fieldContainer = containerMapping[fieldKey] ?? _editContext.Model; + + // Alternative: Reverse mapping based on object graph walk + //var fieldContainer = GetFieldContainer(_editContext.Model, fieldKey); + + var lastDotIndex = fieldKey.LastIndexOf('.'); + var fieldName = lastDotIndex >= 0 ? fieldKey[(lastDotIndex + 1)..] : fieldKey; _messages.Add(new FieldIdentifier(fieldContainer, fieldName), messages); } @@ -201,12 +210,13 @@ private bool TryValidateTypeInfo(ValidationContext validationContext) } #pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. - // TODO(OR): Replace this with a more robust implementation or a different approach. Ideally, collect references during the validation process itself. + // TODO(OR): Replace this with a more robust implementation or a different approach. E.g. collect references during the validation process itself. [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Model types are expected to be defined in assemblies that do not get trimmed.")] - private static object GetFieldContainer(object obj, string[] dotSegments) + private static object GetFieldContainer(object obj, string fieldKey) { - // The method does not check all possiblle null access and index bound errors as the path is constructed internally and assumed to be correct. - object currentObject = obj; + // The method does not check all possible null access and index bound errors as the path is constructed internally and assumed to be correct. + var dotSegments = fieldKey.Split('.')[..^1]; + var currentObject = obj; for (int i = 0; i < dotSegments.Length; i++) { diff --git a/src/Validation/src/ValidatableParameterInfo.cs b/src/Validation/src/ValidatableParameterInfo.cs index 8481887ff8ce..100f593acb42 100644 --- a/src/Validation/src/ValidatableParameterInfo.cs +++ b/src/Validation/src/ValidatableParameterInfo.cs @@ -77,7 +77,7 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context, if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null) { var key = string.IsNullOrEmpty(context.CurrentValidationPath) ? Name : $"{context.CurrentValidationPath}.{Name}"; - context.AddValidationError(key, [result.ErrorMessage]); + context.AddValidationError(key, [result.ErrorMessage], null); return; } } @@ -92,13 +92,13 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context, if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null) { var key = string.IsNullOrEmpty(context.CurrentValidationPath) ? Name : $"{context.CurrentValidationPath}.{Name}"; - context.AddOrExtendValidationErrors(key, [result.ErrorMessage]); + context.AddOrExtendValidationErrors(key, [result.ErrorMessage], null); } } catch (Exception ex) { var key = string.IsNullOrEmpty(context.CurrentValidationPath) ? Name : $"{context.CurrentValidationPath}.{Name}"; - context.AddValidationError(key, [ex.Message]); + context.AddValidationError(key, [ex.Message], null); } } diff --git a/src/Validation/src/ValidatablePropertyInfo.cs b/src/Validation/src/ValidatablePropertyInfo.cs index b73a8968fd62..872670cb3e18 100644 --- a/src/Validation/src/ValidatablePropertyInfo.cs +++ b/src/Validation/src/ValidatablePropertyInfo.cs @@ -85,14 +85,14 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context, if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null) { - context.AddValidationError(context.CurrentValidationPath, [result.ErrorMessage]); + context.AddValidationError(context.CurrentValidationPath, [result.ErrorMessage], value); context.CurrentValidationPath = originalPrefix; // Restore prefix return; } } // Validate any other attributes - ValidateValue(propertyValue, context.CurrentValidationPath, validationAttributes); + ValidateValue(propertyValue, context.CurrentValidationPath, validationAttributes, value); // Check if we've reached the maximum depth before validating complex properties if (context.CurrentDepth >= context.ValidationOptions.MaxDepth) @@ -150,7 +150,7 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context, context.CurrentValidationPath = originalPrefix; } - void ValidateValue(object? val, string errorPrefix, ValidationAttribute[] validationAttributes) + void ValidateValue(object? val, string errorPrefix, ValidationAttribute[] validationAttributes, object? container) { for (var i = 0; i < validationAttributes.Length; i++) { @@ -160,12 +160,12 @@ void ValidateValue(object? val, string errorPrefix, ValidationAttribute[] valida var result = attribute.GetValidationResult(val, context.ValidationContext); if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null) { - context.AddOrExtendValidationErrors(errorPrefix.TrimStart('.'), [result.ErrorMessage]); + context.AddOrExtendValidationErrors(errorPrefix.TrimStart('.'), [result.ErrorMessage], container); } } catch (Exception ex) { - context.AddOrExtendValidationErrors(errorPrefix.TrimStart('.'), [ex.Message]); + context.AddOrExtendValidationErrors(errorPrefix.TrimStart('.'), [ex.Message], container); } } } diff --git a/src/Validation/src/ValidatableTypeInfo.cs b/src/Validation/src/ValidatableTypeInfo.cs index 936a30d52d3b..afb192f2929f 100644 --- a/src/Validation/src/ValidatableTypeInfo.cs +++ b/src/Validation/src/ValidatableTypeInfo.cs @@ -109,13 +109,13 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context, var key = string.IsNullOrEmpty(originalPrefix) ? memberName : $"{originalPrefix}.{memberName}"; - context.AddOrExtendValidationError(key, validationResult.ErrorMessage); + context.AddOrExtendValidationError(key, validationResult.ErrorMessage, value); } if (!validationResult.MemberNames.Any()) { // If no member names are specified, then treat this as a top-level error - context.AddOrExtendValidationError(string.Empty, validationResult.ErrorMessage); + context.AddOrExtendValidationError(string.Empty, validationResult.ErrorMessage, value); } } } diff --git a/src/Validation/src/ValidateContext.cs b/src/Validation/src/ValidateContext.cs index b27408ce4844..747fa96b69a5 100644 --- a/src/Validation/src/ValidateContext.cs +++ b/src/Validation/src/ValidateContext.cs @@ -60,14 +60,20 @@ public sealed class ValidateContext /// public int CurrentDepth { get; set; } - internal void AddValidationError(string key, string[] error) + /// + /// Optional event raised when a validation error is reported. + /// + public event Action? OnValidationError; + + internal void AddValidationError(string key, string[] error, object? container) { ValidationErrors ??= []; ValidationErrors[key] = error; + OnValidationError?.Invoke(key, error, container); } - internal void AddOrExtendValidationErrors(string key, string[] errors) + internal void AddOrExtendValidationErrors(string key, string[] errors, object? container) { ValidationErrors ??= []; @@ -82,9 +88,11 @@ internal void AddOrExtendValidationErrors(string key, string[] errors) { ValidationErrors[key] = errors; } + + OnValidationError?.Invoke(key, errors, container); } - internal void AddOrExtendValidationError(string key, string error) + internal void AddOrExtendValidationError(string key, string error, object? container) { ValidationErrors ??= []; @@ -96,5 +104,7 @@ internal void AddOrExtendValidationError(string key, string error) { ValidationErrors[key] = [error]; } + + OnValidationError?.Invoke(key, [error], container); } } From ccf29e57fca753de0e86c938a14248332a9c74c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Rozto=C4=8Dil?= Date: Wed, 21 May 2025 16:28:11 +0200 Subject: [PATCH 09/18] Simplify the sample form --- .../EditContextDataAnnotationsExtensions.cs | 6 +- .../Pages/ComplexFormPage.razor | 58 ++++++++----------- .../Validation/CustomerModel.cs | 4 -- .../Validation/OrderItemModel.cs | 4 -- 4 files changed, 27 insertions(+), 45 deletions(-) diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs index bb349a5ff517..b487eff8deea 100644 --- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs +++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs @@ -193,10 +193,12 @@ private bool TryValidateTypeInfo(ValidationContext validationContext) { foreach (var (fieldKey, messages) in validationErrors) { - // Reverse mapping based on storing references during validation + // Reverse mapping based on storing references during validation. + // With this approach, we could skip iterating over ValidateContext.ValidationErrors and pass the errors + // directly to ValidationMessageStore in the OnValidationError handler. var fieldContainer = containerMapping[fieldKey] ?? _editContext.Model; - // Alternative: Reverse mapping based on object graph walk + // Alternative: Reverse mapping based on object graph walk. //var fieldContainer = GetFieldContainer(_editContext.Model, fieldKey); var lastDotIndex = fieldKey.LastIndexOf('.'); diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor b/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor index e21d7b14f0e1..525cd26a2fa4 100644 --- a/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor +++ b/src/Components/Samples/BlazorUnitedApp/Pages/ComplexFormPage.razor @@ -8,7 +8,7 @@ - +

Order Details

@@ -32,24 +32,21 @@
-
- - - -
Shipping Address
-
- - - -
-
- - - +
+
+ + + +
+
+ + + +
@@ -70,22 +67,17 @@
-
- - - -
-
+
+ + + +
+
-
- - - -
@@ -95,7 +87,7 @@ {

No order items. Add one below.

} - +
@@ -118,7 +110,7 @@
    @foreach (var item in order.OrderItems) { -
  • @item.Quantity x @item.ProductName at @item.Price.ToString("C")
    • +
  • @item.Quantity x @item.ProductName
    • }
@@ -126,7 +118,7 @@ @if (submitFailed) { -