From 8d7b3ef73eb373bd133c52a375c978e60119c49a Mon Sep 17 00:00:00 2001 From: Tony-ST0754 <6914529@qq.com> Date: Fri, 9 Oct 2026 18:12:19 +0800 Subject: [PATCH 01/17] =?UTF-8?q?feat(table):=E6=96=B0=E5=A2=9EKeepAdding?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E7=94=A8=E6=9D=A5=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、给`Table`组件新增参数`KeepAdding`，用来处理新增数据时是否能连续新增，即编辑弹窗不关闭连续新增 2、在连续新增时，如果需要全部保留或部分保留上一轮的信息，可通过组件中`OnAddAsync`回调来处理 3、由于要在不关闭编辑弹窗的情况下继续新增数据，因此，在弹窗中`Popup`、`Drawer`模式中，既要考虑下一轮新增时编辑弹窗中的绑定验证的模型是否成功创建或创建异常，还要考虑弹窗关闭时的清理问题，整体对`Popup`、`Drawer`模式的弹窗改动比较大 3.1、给`ITableEditDialogOption`及相应的`...DialogOption`新增`KeepOpenAfterSave`参数，用来告知编辑弹窗保存成功后是否继续保存弹窗为打开状态，新增`CreateNextModelAsync`回调供弹窗内部配合`KeepOpenAfterSave`参数使用，作用为连续新增时创建新的绑定模型 3.2、新增`DialogCloseContext`类，用来负责弹窗关闭相关的职责处理，`Popup`、`Drawer`模式，使用统一关闭状态；关闭检查按所属窗口执行，逐个等待回调并尊重否决结要，避免重复关闭及旧窗口清理误伤新窗口 3.3、关闭状态、检查和收尾按当前展示实例管理，保存后的回调或刷新失败时，显示错误并禁止重复保存当前记录，同时不允许初始化下一条记录。 3.4、编辑弹窗的关闭逻辑，由原来的直接关闭，变更为判断是否允许关闭 3.5、连续新增时，保存成功后创建下一条模型，重建表单状态；正文、编辑项和Footer使用同一当前模型 3.6、保存、创建下一条期间禁止重复提交和关闭；忽略旧表单、旧展示及组件销毁后的异步提交 3.7、保存未成功时允许重试；已实际保存、但后续处理失败时阻止重复保存。下一条初始化失败会提示错误，允许正常关闭并清理。 --- .../Components/Dialog/Dialog.razor | 2 +- .../Components/Dialog/Dialog.razor.cs | 79 +- .../Components/Dialog/EditDialog.razor | 8 +- .../Components/Dialog/EditDialog.razor.cs | 223 ++- .../Components/Dialog/EditDialogOption.cs | 10 + .../Components/Drawer/Drawer.razor | 4 +- .../Components/Drawer/Drawer.razor.cs | 69 +- .../Components/Drawer/DrawerContainer.cs | 38 +- .../Components/Drawer/DrawerOption.cs | 2 + .../Components/Drawer/DrawerService.cs | 12 +- .../Components/Modal/DialogCloseContext.cs | 105 ++ .../Components/Modal/Modal.razor.cs | 124 +- .../Components/Modal/Modal.razor.js | 242 ++-- .../Components/Modal/ModalDialog.razor | 174 +-- .../Components/Modal/ModalDialog.razor.cs | 11 +- .../Table/ITableEditDialogOption.cs | 12 + .../Components/Table/Table.razor.Toolbar.cs | 195 ++- .../Components/Table/TableEditDrawerOption.cs | 10 + .../Extensions/DrawerExtensions.cs | 36 +- .../TableEditDialogOptionExtensions.cs | 2 + src/BootstrapBlazor/Locales/en.json | 4 +- src/BootstrapBlazor/Locales/zh.json | 4 +- .../Components/EditDialogLifecycleTest.cs | 1194 +++++++++++++++++ test/UnitTest/Components/EditDialogTest.cs | 239 ++++ test/UnitTest/Components/TableDialogTest.cs | 511 +++++++ test/UnitTest/Components/TableDrawerTest.cs | 97 ++ test/UnitTest/Services/DrawerServiceTest.cs | 188 +++ 27 files changed, 3274 insertions(+), 321 deletions(-) create mode 100644 src/BootstrapBlazor/Components/Modal/DialogCloseContext.cs create mode 100644 test/UnitTest/Components/EditDialogLifecycleTest.cs diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor b/src/BootstrapBlazor/Components/Dialog/Dialog.razor index 53b5bb91b97..837c3555f87 100644 --- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor +++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor @@ -2,7 +2,7 @@ @inherits BootstrapComponentBase @for (var index = 0; index < DialogParameters.Keys.Count; index++) { diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs index 7d555585284..c0c31b6ef0d 100644 --- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs +++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs @@ -18,10 +18,9 @@ public partial class Dialog : IDisposable [NotNull] private Modal? _modal = null; private Func? _onShownAsync = null; - private Func? _onCloseAsync = null; - private Func>? _onClosingAsync = null; - - private readonly Dictionary, (bool IsKeyboard, bool IsBackdrop, Func? OnCloseCallback)> DialogParameters = []; + private readonly Dictionary, + (bool IsKeyboard, bool IsBackdrop, bool? IsFade, Func? OnShownCallback, + Func? OnCloseCallback, Func>? OnClosingCallback)> DialogParameters = []; private Dictionary? _currentParameter; private bool _isKeyboard = false; private bool _isBackdrop = false; @@ -59,37 +58,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender) private async Task Show(DialogOption option) { - _onShownAsync = async () => - { - if (option.OnShownAsync != null) - { - await option.OnShownAsync(); - } - }; - - _onCloseAsync = async () => - { - // Remove current DialogParameter - if (_currentParameter != null) - { - DialogParameters.Remove(_currentParameter, out var v); - if (v.OnCloseCallback != null) - { - await v.OnCloseCallback(); - } - - // Support for multiple dialogs - var p = DialogParameters.LastOrDefault(); - _currentParameter = p.Key; - _isKeyboard = p.Value.IsKeyboard; - _isBackdrop = p.Value.IsBackdrop; - - StateHasChanged(); - } - }; - - _onClosingAsync = option.OnClosingAsync; - + _onShownAsync = option.OnShownAsync; _isKeyboard = option.IsKeyboard; _isBackdrop = option.IsBackdrop; _isFade = option.IsFade; @@ -159,11 +128,41 @@ private async Task Show(DialogOption option) _currentParameter = parameters; // Add ModalDialog to the container - DialogParameters.Add(parameters, (_isKeyboard, _isBackdrop, option.OnCloseAsync)); + DialogParameters.Add(parameters, (_isKeyboard, _isBackdrop, _isFade, option.OnShownAsync, option.OnCloseAsync, option.OnClosingAsync)); await InvokeAsync(StateHasChanged); } - private static RenderFragment RenderDialog(int index, Dictionary parameter) => builder => + private async Task CloseAsync(Dictionary parameter) + { + // Remove current DialogParameter + if (!DialogParameters.Remove(parameter, out var settings)) + { + return; + } + // Support for multiple dialogs + if (ReferenceEquals(_currentParameter, parameter)) + { + var current = DialogParameters.LastOrDefault(); + _currentParameter = current.Key; + _isKeyboard = current.Value.IsKeyboard; + _isBackdrop = current.Value.IsBackdrop; + _isFade = current.Value.IsFade; + _onShownAsync = current.Value.OnShownCallback; + } + try + { + if (settings.OnCloseCallback != null) + { + await settings.OnCloseCallback(); + } + } + finally + { + StateHasChanged(); + } + } + + private RenderFragment RenderDialog(int index, Dictionary parameter) => builder => { if (index > 0) { @@ -173,6 +172,12 @@ private static RenderFragment RenderDialog(int index, Dictionary builder.OpenComponent(100 + index); builder.AddMultipleAttributes(101 + index, parameter); builder.SetKey(parameter); + builder.AddComponentReferenceCapture(102 + index, component => + { + var dialog = (ModalDialog)component; + dialog.OnClosingCallback = DialogParameters[parameter].OnClosingCallback; + dialog.OnCloseCallback = () => CloseAsync(parameter); + }); builder.CloseComponent(); }; diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor index 4591eee23fa..0cb96f46210 100644 --- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor +++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor @@ -3,14 +3,18 @@ @inherits DialogBase @attribute [BootstrapModuleAutoLoader("Dialog/EditDialog.razor.js", AutoInvokeInit = false, AutoInvokeDispose = false)] - + @if (_saveError != null) + { + + } @if (BodyTemplate != null) {
- @BodyTemplate(Model) + @BodyTemplate(_currentModel)
@RenderFooter diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs index 8a5b2038403..6294dd322ef 100644 --- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs +++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Components.Forms; using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Logging; namespace BootstrapBlazor.Components; @@ -67,13 +68,27 @@ public partial class EditDialog public string? CloseConfirmContent { get; set; } /// - /// 获得/设置 保存回调委托 返回 false 时保持编辑弹窗 返回 true 时关闭编辑弹窗 - /// Gets or sets Save Callback Delegate. Return false to keep edit dialog, true to close it + /// 获得/设置 保存回调委托 返回 false 时保持编辑弹窗，返回 true 时根据 决定是否关闭编辑弹窗。开始关闭或组件释放后忽略延迟完成验证的提交 + /// Gets or sets Save Callback Delegate. Return false to keep the edit dialog, or true to determine whether to close it based on . Submissions whose validation completes after closing starts or component disposal are ignored /// [Parameter] [EditorRequired] public Func>? OnSaveAsync { get; set; } + /// + /// 获得/设置 保存成功后是否保持编辑弹窗打开，默认为 false + /// Gets or sets whether to keep the edit dialog open after a successful save. Default is false + /// + [Parameter] + public bool KeepOpenAfterSave { get; set; } + + /// + /// 获得/设置 保存成功后获取下一个编辑模型的异步回调方法。初始化失败时显示错误并阻止重复保存当前模型 + /// Gets or sets the async callback that provides the next edit model after a successful save. Initialization failures are displayed and prevent saving the current model again + /// + [Parameter] + public Func>? CreateNextModelAsync { get; set; } + /// /// 获得/设置 关闭按钮图标 /// Gets or sets Close Button Icon @@ -130,6 +145,12 @@ public partial class EditDialog [CascadingParameter] private Modal? Modal { get; set; } + [CascadingParameter] + private ModalDialog? ModalDialog { get; set; } + + [CascadingParameter] + private Drawer? Drawer { get; set; } + [Inject] [NotNull] private IStringLocalizer>? Localizer { get; set; } @@ -145,7 +166,21 @@ public partial class EditDialog [NotNull] private IIconTheme? IconTheme { get; set; } + [Inject, NotNull] + private ILogger>? Logger { get; set; } + private bool _hasFieldValueChanged; + private bool _isBusy; + private bool _isDisposed; + private string? _saveError; + private TModel? _parameterModel; + private object? _parameterPresentation; + private TModel _currentModel = default!; + private ValidateForm _validateForm = default!; + + internal bool IsBusy => _isBusy; + + private DialogCloseContext? CloseContext => Drawer?.CloseContext ?? ModalDialog?.CloseContext ?? Modal?.CloseContext; /// /// @@ -154,7 +189,7 @@ protected override void OnInitialized() { base.OnInitialized(); - Modal?.RegisterOnClosingCallback(OnClosingCallback); + CloseContext?.Register(this, OnClosingCallback, () => _isBusy); } /// @@ -170,6 +205,17 @@ protected override void OnParametersSet() throw new InvalidOperationException($"参数 {nameof(Model)} 未赋值; {nameof(Model)} can not be null."); } + var modelChanged = !IsSameModel(_parameterModel, Model); + var presentation = CloseContext?.Presentation; + if (modelChanged || !ReferenceEquals(_parameterPresentation, presentation)) + { + _parameterModel = Model; + _parameterPresentation = presentation; + _currentModel = Model; + _hasFieldValueChanged = false; + _saveError = null; + } + CloseButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.DialogCloseButtonIcon); SaveButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.DialogSaveButtonIcon); @@ -187,6 +233,11 @@ protected override void OnParametersSet() private async Task OnClosingCallback() { + if (_isBusy) + { + return false; + } + var ret = true; if (BootstrapBlazorOptions.Value.GetEditDialogShowConfirmSwal(ShowCloseConfirm, _hasFieldValueChanged)) { @@ -199,25 +250,152 @@ private async Task OnClosingCallback() ret = await SwalService.ShowModal(op); } - return ret; + return ret && !_isBusy; } - private async Task OnValidSubmitAsync(EditContext context) + /// + /// 检查编辑弹窗是否允许关闭，保存或切换模型期间不允许关闭 + /// Checks whether the edit dialog can close. Closing is blocked while saving or switching models + /// + public Task CanCloseAsync() => OnClosingCallback(); + + private static bool IsSameModel(TModel? first, TModel? second) => typeof(TModel).IsValueType + ? EqualityComparer.Default.Equals(first, second) + : ReferenceEquals(first, second); + + private Func GetSubmitCallback() { - if (OnSaveAsync != null) + var presentation = CloseContext?.Presentation; + return context => OnValidSubmitAsync(context, presentation); + } + + private async Task OnValidSubmitAsync(EditContext context, object? presentation) + { + if (_isDisposed || CloseContext?.IsClosing == true + || !ReferenceEquals(presentation, CloseContext?.Presentation)) { - await ToggleLoading(true); - var save = await OnSaveAsync(context); - await ToggleLoading(false); + Logger.LogWarning("Ignoring a submission from a closing or disposed edit dialog."); + return; + } - if (save) + var onSaveAsync = OnSaveAsync; + if (_isBusy || _saveError != null || onSaveAsync == null) + { + return; + } + + if (!ReferenceEquals(context.Model, _validateForm.Model)) + { + Logger.LogWarning("Ignoring a submission from an obsolete edit model."); + return; + } + + var close = false; + var parameterModel = _parameterModel; + bool IsCurrent() => !_isDisposed && CloseContext?.IsClosing != true + && ReferenceEquals(presentation, CloseContext?.Presentation) + && IsSameModel(parameterModel, _parameterModel); + var saveState = new EditDialogSaveState(); + context.Properties[typeof(EditDialogSaveState)] = saveState; + _isBusy = true; + try + { + await InvokeAsync(StateHasChanged); + close = await SaveAsync(context, saveState, onSaveAsync, IsCurrent); + } + catch (Exception exception) when (saveState.IsSaved) + { + if (IsCurrent()) { _hasFieldValueChanged = false; + _saveError = Localizer["SavePostProcessingError"]; } + Logger.LogError(exception, "The current item was saved, but completing the edit operation failed."); + throw; + } + finally + { + context.Properties.Remove(typeof(EditDialogSaveState)); + _isBusy = false; + await InvokeAsync(StateHasChanged); + } + + if (close && CloseAsync != null) + { + await CloseAsync(); + } + } + + private async Task SaveAsync(EditContext context, EditDialogSaveState saveState, + Func> onSaveAsync, Func isCurrent) + { + if (!CheckCurrentSave(isCurrent)) + { + return false; + } + var close = false; + try + { + await ToggleLoading(true); + if (!CheckCurrentSave(isCurrent)) + { + return false; + } + if (await onSaveAsync(context)) + { + saveState.IsSaved = true; + if (!CheckCurrentSave(isCurrent)) + { + return false; + } + _hasFieldValueChanged = false; + if (KeepOpenAfterSave && CreateNextModelAsync != null) + { + await InitializeNextModelAsync(CreateNextModelAsync, isCurrent); + } + else + { + close = !KeepOpenAfterSave; + } + } + } + finally + { + await ToggleLoading(false); + } + return close; + } - if (save && CloseAsync != null) + private bool CheckCurrentSave(Func isCurrent) + { + var current = isCurrent(); + if (!current) + { + Logger.LogWarning("Ignoring the continuation of an obsolete or disposed edit operation."); + } + return current; + } + + private async Task InitializeNextModelAsync(Func> createModelAsync, Func isCurrent) + { + try + { + var model = await createModelAsync(); + if (model == null) + { + throw new InvalidOperationException($"{nameof(CreateNextModelAsync)} must return a non-null model."); + } + if (CheckCurrentSave(isCurrent)) { - await CloseAsync(); + _currentModel = model; + } + } + catch (Exception exception) + { + Logger.LogError(exception, "The current item was saved, but initializing the next edit model failed."); + if (isCurrent()) + { + _saveError = Localizer["NextModelInitializationError"]; } } } @@ -244,7 +422,7 @@ public async ValueTask ToggleLoading(bool state) { if (FooterTemplate != null) { - builder.AddContent(1, FooterTemplate(Model)); + builder.AddContent(1, FooterTemplate(_currentModel)); } else { @@ -254,6 +432,7 @@ public async ValueTask ToggleLoading(bool state) builder.AddAttribute(21, nameof(Button.Icon), CloseButtonIcon); builder.AddAttribute(22, nameof(Button.Text), CloseButtonText); builder.AddAttribute(23, nameof(Button.OnClickWithoutRender), OnCloseAsync); + builder.AddAttribute(24, nameof(Button.IsDisabled), _isBusy); builder.CloseComponent(); } builder.OpenComponent public Func>? OnEditAsync { get; set; } + /// + /// + /// + public bool KeepOpenAfterSave { get; set; } + + /// + /// + /// + public Func>? CreateNextModelAsync { get; set; } + /// /// /// diff --git a/src/BootstrapBlazor/Components/Drawer/Drawer.razor b/src/BootstrapBlazor/Components/Drawer/Drawer.razor index 3a6351594f0..50798bef580 100644 --- a/src/BootstrapBlazor/Components/Drawer/Drawer.razor +++ b/src/BootstrapBlazor/Components/Drawer/Drawer.razor @@ -14,7 +14,9 @@ { - @ChildContent + + @ChildContent + } diff --git a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs index 6ee290af702..c21181f109d 100644 --- a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs +++ b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs @@ -54,6 +54,10 @@ public partial class Drawer : IClosable /// 获得/设置 抽屉是否打开 默认 false 未打开 /// Gets or sets Whether Drawer is Open. Default is false /// + /// + /// 通过参数关闭会使旧编辑提交失效，但不触发关闭回调；需要关闭检查与回调时，请调用 。 + /// Closing through this parameter invalidates old edit submissions without invoking close callbacks. Use when close checks and callbacks are required. + /// [Parameter] public bool IsOpen { get; set; } @@ -167,12 +171,26 @@ public partial class Drawer : IClosable private bool _firstOpened; + internal DialogCloseContext CloseContext { get; } = new(); + /// /// /// protected override void OnParametersSet() { base.OnParametersSet(); + if (CloseContext.IsClosing && !CloseContext.IsClosed) + { + IsOpen = false; + } + else if (IsOpen) + { + CloseContext.Reopen(); + } + else + { + CloseContext.Closed(); + } // 启用延迟渲染时 首次打开后才渲染 ChildContent 防止不可见状态下子组件脚本测量尺寸失效 // When lazy load is enabled, render ChildContent after first opened to prevent child component scripts from measuring size incorrectly while hidden @@ -232,28 +250,59 @@ public async Task OnContainerClick() [JSInvokable] public async Task Close() { - if (OnClosingAsync != null && !await OnClosingAsync()) + var onClosingAsync = OnClosingAsync; + var onCloseAsync = OnCloseAsync; + var isOpenChanged = IsOpenChanged; + if (!await CloseContext.TryCloseAsync(onClosingAsync)) { return; } IsOpen = false; - var animation = await InvokeAsync("execute", Id, false); - if (animation) + try + { + var animation = await InvokeAsync("execute", Id, false); + if (animation) + { + await Task.Delay(300); + } + } + finally { - await Task.Delay(300); + await CompleteCloseAsync(onCloseAsync, isOpenChanged); } - if (OnCloseAsync != null) + } + + private async Task CompleteCloseAsync(Func? onCloseAsync, EventCallback isOpenChanged) + { + try { - await OnCloseAsync(); + if (onCloseAsync != null) + { + await onCloseAsync(); + } } - if (IsOpenChanged.HasDelegate) + finally { - await IsOpenChanged.InvokeAsync(IsOpen); + CloseContext.Closed(); + if (isOpenChanged.HasDelegate) + { + await isOpenChanged.InvokeAsync(false); + } + else + { + StateHasChanged(); + } } - else + } + + /// + protected override async ValueTask DisposeAsync(bool disposing) + { + if (disposing) { - StateHasChanged(); + CloseContext.Closed(); } + await base.DisposeAsync(disposing); } } diff --git a/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs b/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs index 03ca6277798..d36e0c2d25e 100644 --- a/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs +++ b/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs @@ -18,6 +18,8 @@ public class DrawerContainer : ComponentBase, IDisposable private DrawerService? DrawerService { get; set; } private DrawerOption? _option; + private object? _presentation; + private object? _configuration; /// /// OnInitialized 方法 @@ -46,6 +48,13 @@ protected override void BuildRenderTree(RenderTreeBuilder builder) private async Task Show(DrawerOption option) { + var configuration = (object?)option.ConfigureParameters ?? option; + if (!ReferenceEquals(_configuration, configuration) + || option.Drawer?.CloseContext.IsCloseRequested == true) + { + _presentation = new object(); + } + _configuration = configuration; _option = option; await InvokeAsync(StateHasChanged); } @@ -53,7 +62,7 @@ private async Task Show(DrawerOption option) private void RenderDrawer(RenderTreeBuilder builder, DrawerOption option) { builder.OpenComponent(0); - builder.SetKey(option); + builder.SetKey(_presentation); if (!string.IsNullOrEmpty(option.Class)) { @@ -66,6 +75,8 @@ private void RenderDrawer(RenderTreeBuilder builder, DrawerOption option) private Dictionary GetParameters(DrawerOption option) { + var presentation = _presentation; + var onCloseAsync = option.OnCloseAsync; var parameters = new Dictionary() { [nameof(Drawer.IsOpen)] = true, @@ -75,7 +86,7 @@ private Dictionary GetParameters(DrawerOption option) [nameof(Drawer.ShowBackdrop)] = option.ShowBackdrop, [nameof(Drawer.Placement)] = option.Placement, [nameof(Drawer.AllowResize)] = option.AllowResize, - [nameof(Drawer.OnCloseAsync)] = new Func(() => OnCloseAsync(option)) + [nameof(Drawer.OnCloseAsync)] = new Func(() => OnCloseAsync(presentation, onCloseAsync)) }; if (!string.IsNullOrEmpty(option.Width)) { @@ -106,18 +117,29 @@ private Dictionary GetParameters(DrawerOption option) { parameters.Add(nameof(Drawer.BodyContext), option.BodyContext); } + option.ConfigureParameters?.Invoke(parameters); return parameters; } - private async Task OnCloseAsync(DrawerOption option) + private async Task OnCloseAsync(object? presentation, Func? onCloseAsync) { - if (option.OnCloseAsync != null) + try { - await option.OnCloseAsync(); + if (onCloseAsync != null) + { + await onCloseAsync(); + } + } + finally + { + if (ReferenceEquals(_presentation, presentation)) + { + _option = null; + _presentation = null; + _configuration = null; + } + StateHasChanged(); } - - _option = null; - StateHasChanged(); } /// diff --git a/src/BootstrapBlazor/Components/Drawer/DrawerOption.cs b/src/BootstrapBlazor/Components/Drawer/DrawerOption.cs index 0f6b73c9c0d..872fb75a405 100644 --- a/src/BootstrapBlazor/Components/Drawer/DrawerOption.cs +++ b/src/BootstrapBlazor/Components/Drawer/DrawerOption.cs @@ -111,6 +111,8 @@ public class DrawerOption : IClosable /// internal Drawer? Drawer { get; set; } + internal Action>? ConfigureParameters { get; set; } + /// /// 关闭抽屉弹窗方法 /// Close Drawer Method diff --git a/src/BootstrapBlazor/Components/Drawer/DrawerService.cs b/src/BootstrapBlazor/Components/Drawer/DrawerService.cs index f548ffde0e4..cf90149dc68 100644 --- a/src/BootstrapBlazor/Components/Drawer/DrawerService.cs +++ b/src/BootstrapBlazor/Components/Drawer/DrawerService.cs @@ -16,5 +16,15 @@ public class DrawerService : BootstrapServiceBase /// Show Method /// /// DrawerOption 实例DrawerOption instance - public Task Show(DrawerOption option) => Invoke(option); + public Task Show(DrawerOption option) + { + option.ConfigureParameters = null; + return Invoke(option); + } + + internal Task Show(DrawerOption option, Action> configureParameters) + { + option.ConfigureParameters = configureParameters; + return Invoke(option); + } } diff --git a/src/BootstrapBlazor/Components/Modal/DialogCloseContext.cs b/src/BootstrapBlazor/Components/Modal/DialogCloseContext.cs new file mode 100644 index 00000000000..6afd2b85ef2 --- /dev/null +++ b/src/BootstrapBlazor/Components/Modal/DialogCloseContext.cs @@ -0,0 +1,105 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the Apache 2.0 License +// See the LICENSE file in the project root for more information. +// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone + +namespace BootstrapBlazor.Components; + +internal sealed class DialogCloseContext +{ + private enum CloseState + { + Open, + Checking, + Closing, + Closed + } + + private CloseState _state; + private readonly Dictionary> CanCloseAsync, Func IsBusy)> _editors = []; + + internal bool IsClosing => _state is CloseState.Closing or CloseState.Closed; + + internal bool IsClosed => _state == CloseState.Closed; + + internal bool IsCloseRequested => _state != CloseState.Open; + + internal object Presentation { get; private set; } = new(); + + internal void Register(IComponent editor, Func> canCloseAsync, Func isBusy) + => _editors[editor] = (canCloseAsync, isBusy); + + internal void UnRegister(IComponent editor) => _editors.Remove(editor); + + internal async Task TryCloseAsync(Func>? onClosingAsync, Func? isCurrent = null) + { + if (_state != CloseState.Open || _editors.Values.Any(editor => editor.IsBusy())) + { + return false; + } + + _state = CloseState.Checking; + var presentation = Presentation; + bool IsChecking() => _state == CloseState.Checking && ReferenceEquals(presentation, Presentation); + try + { + foreach (var editor in _editors.Values.ToArray()) + { + if (!IsChecking() || !await editor.CanCloseAsync()) + { + return false; + } + } + if (!IsChecking() + || !await InvokeClosingAsync(onClosingAsync) + || !IsChecking() + || _editors.Values.Any(editor => editor.IsBusy()) + || isCurrent?.Invoke() == false) + { + return false; + } + + _state = CloseState.Closing; + return true; + } + finally + { + if (IsChecking()) + { + _state = CloseState.Open; + } + } + } + + internal static async Task InvokeClosingAsync(Func>? callbacks) + { + var result = true; + if (callbacks != null) + { + foreach (Func> callback in callbacks.GetInvocationList()) + { + result &= await callback(); + } + } + return result; + } + + internal void Closed() => _state = CloseState.Closed; + + internal void CancelClose(object presentation) + { + if (_state == CloseState.Closing && ReferenceEquals(presentation, Presentation)) + { + _state = CloseState.Open; + } + } + + internal void Reopen() + { + if (IsClosed) + { + Presentation = new object(); + _state = CloseState.Open; + } + } +} diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs index 607d066b66f..fc10ba066fd 100644 --- a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs +++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs @@ -33,6 +33,11 @@ public partial class Modal : IClosable protected List Dialogs { get; } = new(8); private readonly ConcurrentDictionary> _shownCallbackCache = []; + private Func>? _registeredClosingCallbacks; + private (ModalDialog? Dialog, DialogCloseContext Context, object Presentation, string Request)? _closingWindow; + private ModalDialog? _closedDialog; + + internal DialogCloseContext CloseContext { get; } = new(); /// /// 获得/设置 是否在后台关闭弹出窗口，默认为 false @@ -88,6 +93,8 @@ public partial class Modal : IClosable [Parameter] public Func>? OnClosingAsync { get; set; } + internal bool IsClosing => (_closingWindow?.Context ?? CloseContext).IsClosing; + /// /// 获得后台关闭弹出窗口的设置 /// Gets the background close popup setting @@ -135,6 +142,10 @@ internal void RemoveDialog(ModalDialog dialog) { // Remove the current popup Dialogs.Remove(dialog); + if (ReferenceEquals(_closedDialog, dialog)) + { + _closedDialog = null; + } if (Dialogs.Count > 0) { @@ -177,10 +188,20 @@ public async Task ShownCallback() public async Task CloseCallback() { // Remove the current popup - var dialog = Dialogs.FirstOrDefault(d => d.IsShown); + var closingWindow = _closingWindow; + var dialog = closingWindow.HasValue ? closingWindow.Value.Dialog : Dialogs.FirstOrDefault(d => d.IsShown); + var closeContext = closingWindow?.Context ?? dialog?.CloseContext ?? CloseContext; + _closingWindow = null; + if (closeContext.IsClosed) + { + return; + } + var onCloseAsync = dialog?.OnCloseCallback ?? OnCloseAsync; + closeContext.Closed(); if (dialog != null) { Dialogs.Remove(dialog); + _closedDialog = dialog; } // Support for multi-level popups @@ -189,9 +210,9 @@ public async Task CloseCallback() ResetShownDialog(Dialogs.Last()); } - if (OnCloseAsync != null) + if (onCloseAsync != null) { - await OnCloseAsync(); + await onCloseAsync(); } } @@ -200,16 +221,54 @@ public async Task CloseCallback() /// Callback method when the popup before close, called by JSInvoke /// [JSInvokable] - public async Task BeforeCloseCallback() + public Task BeforeCloseCallback() => BeforeCloseAsync(null); + + /// + /// 检查浏览器关闭请求并记录请求标识 + /// Checks a browser close request and records its identity + /// + [JSInvokable] + public Task BeforeCloseWithRequestCallback(string request) => BeforeCloseAsync(request); + + private async Task BeforeCloseAsync(string? request) { - var result = true; - if (OnClosingAsync != null) + if (_closingWindow.HasValue) { - result = await OnClosingAsync(); + return false; + } + + var dialog = Dialogs.FirstOrDefault(d => d.IsShown); + var closeContext = dialog?.CloseContext ?? CloseContext; + var callbacks = OnClosingAsync + dialog?.OnClosingCallback + _registeredClosingCallbacks; + var result = await closeContext.TryCloseAsync(callbacks, + () => !_closingWindow.HasValue && ReferenceEquals(dialog, Dialogs.FirstOrDefault(d => d.IsShown))); + if (result) + { + _closingWindow = (dialog, closeContext, closeContext.Presentation, request ?? Guid.NewGuid().ToString("N")); } return result; } + /// + /// 恢复未完成的浏览器关闭请求 + /// Recovers a browser close request that failed before closing + /// + [JSInvokable] + public Task CloseFailedCallback(string request) + { + RecoverClose(request); + return Task.CompletedTask; + } + + private void RecoverClose(string request) + { + if (_closingWindow is { } window && window.Request == request) + { + window.Context.CancelClose(window.Presentation); + _closingWindow = null; + } + } + /// /// 切换弹出窗口状态的方法 /// Method to toggle the popup state @@ -224,9 +283,33 @@ public async Task Toggle() /// 显示弹出窗口的方法 /// Method to show the popup /// + /// + /// 显示新窗口前等待旧窗口的关闭动画结束，但不等待新窗口的显示动画完成。 + /// Waits for the previous hide animation before showing a new window, but does not await the new show animation. + /// public async Task Show() { await ModuleInitTask.Task; + var dialog = Dialogs.FirstOrDefault(d => d.IsShown); + if (dialog?.CloseContext.IsClosing == true && !dialog.CloseContext.IsClosed + || dialog == null && CloseContext.IsClosing && !CloseContext.IsClosed + || _closingWindow.HasValue && ReferenceEquals(dialog, _closingWindow.Value.Dialog)) + { + return; + } + if (dialog == null && _closedDialog != null) + { + AddDialog(_closedDialog); + dialog = _closedDialog; + _closedDialog = null; + } + var reopening = dialog?.CloseContext.IsClosed == true || CloseContext.IsClosed; + dialog?.CloseContext.Reopen(); + CloseContext.Reopen(); + if (reopening) + { + await InvokeAsync(StateHasChanged); + } await InvokeVoidAsync("execute", Id, "show"); } @@ -234,12 +317,33 @@ public async Task Show() /// 关闭当前弹出窗口的方法 /// Method to close the current popup /// + /// + /// 隐藏调用失败时释放本次未完成的关闭请求，并继续向上传播异常。 + /// If hiding fails, releases the unfinished close request and propagates the exception. + /// public async Task Close() { + if (Dialogs.Count == 0 && !await InvokeAsync("isShown", Id)) + { + if (!_closingWindow.HasValue && !CloseContext.IsCloseRequested) + { + await DialogCloseContext.InvokeClosingAsync(OnClosingAsync + _registeredClosingCallbacks); + } + return; + } var result = await BeforeCloseCallback(); if (result) { - await InvokeVoidAsync("execute", Id, "hide"); + var window = _closingWindow!.Value; + try + { + await InvokeVoidAsync("execute", Id, "hide"); + } + catch + { + RecoverClose(window.Request); + throw; + } } } @@ -287,7 +391,7 @@ public void UnRegisterShownCallback(IComponent component) /// public void RegisterOnClosingCallback(Func> onClosingCallback) { - OnClosingAsync += onClosingCallback; + _registeredClosingCallbacks += onClosingCallback; } /// @@ -301,6 +405,6 @@ public void RegisterOnClosingCallback(Func> onClosingCallback) /// public void UnRegisterOnClosingCallback(Func> onClosingCallback) { - OnClosingAsync -= onClosingCallback; + _registeredClosingCallbacks -= onClosingCallback; } } diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.js b/src/BootstrapBlazor/Components/Modal/Modal.razor.js index 37cf133b0cf..bf5f3a9bb7e 100644 --- a/src/BootstrapBlazor/Components/Modal/Modal.razor.js +++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.js @@ -8,41 +8,57 @@ export function init(id, invoke, shownCallback, closeCallback) { invoke, shownCallback, closeCallback, - pop: () => { - if (modal) { - modal.hide(); + pop: () => modal.close(), + onShown: () => invoke.invokeMethodAsync(shownCallback), + onHide: e => { + if (!modal.approvedHide) { + e.preventDefault(); + modal.close(); } }, - originalStyle: null + onHidden: e => { + e.stopPropagation(); + restoreBodyStyle(modal); + invoke.invokeMethodAsync(closeCallback) + }, + originalStyle: null, + showRequest: 0, + closeRequest: 0 } Data.set(id, modal) - EventHandler.on(el, 'shown.bs.modal', () => { - invoke.invokeMethodAsync(shownCallback) - }) - EventHandler.on(el, 'hidden.bs.modal', e => { - e.stopPropagation(); - invoke.invokeMethodAsync(closeCallback) - }) + EventHandler.on(el, 'shown.bs.modal', modal.onShown) + EventHandler.on(el, 'hide.bs.modal', modal.onHide) + EventHandler.on(el, 'hidden.bs.modal', modal.onHidden) EventHandler.on(window, 'popstate', modal.pop) - modal.show = () => { - backupBodyStyle(modal); + modal.show = async () => { + const request = ++modal.showRequest; + if (modal.hiding) { + await modal.hiding; + } + if (Data.get(id) !== modal || request !== modal.showRequest) { + return; + } const dialogs = el.querySelectorAll('.modal-dialog') - if (dialogs.length === 1) { - let backdrop = el.getAttribute('data-bs-backdrop') !== 'static' - if (!backdrop) { - backdrop = 'static' - } + if (dialogs.length === 0) { + return; + } + backupBodyStyle(modal); + if (dialogs.length === 1 || !modal.modal?._isShown) { + const backdrop = el.getAttribute('data-bs-backdrop') === 'static' ? 'static' : true if (!modal.modal) { modal.modal = bootstrap.Modal.getOrCreateInstance(el) // hack: fix focusin event modal.modal._focustrap._handleFocusin = e => { } } - modal.modal._dialog = dialogs[0] - modal.modal._config.keyboard = el.getAttribute('data-bs-keyboard') === 'true' - modal.modal._config.backdrop = backdrop + modal.modal._dialog = [...dialogs].filter(dialog => !dialog.classList.contains('d-none')).pop() ?? dialogs[0] + modal.modal._config.keyboard = dialogs.length === 1 && el.getAttribute('data-bs-keyboard') === 'true' + modal.modal._config.backdrop = dialogs.length === 1 ? backdrop : 'static' + if (dialogs.length > 1) { + modal.handlerKeyboardAndBackdrop() + } modal.modal.show() } else { @@ -56,62 +72,100 @@ export function init(id, invoke, shownCallback, closeCallback) { } } - modal.hide = () => { - if (el.children.length === 1) { - modal.modal.hide(); - restoreBodyStyle(modal); + modal.hide = async () => { + if (modal.modal?._isTransitioning && modal.modal._isShown) { + await new Promise(resolve => { + modal.cancelPendingHide = resolve; + EventHandler.one(el, 'shown.bs.modal', resolve); + }); + EventHandler.off(el, 'shown.bs.modal', modal.cancelPendingHide); + delete modal.cancelPendingHide; + if (Data.get(id) !== modal) { + return; + } } - else { - modal.invoke.invokeMethodAsync(modal.closeCallback) + if (el.children.length !== 1) { + return modal.invoke.invokeMethodAsync(modal.closeCallback) } - } - - modal.toggle = () => { - if (modal.modal) { - modal.modal.toggle() + if (!modal.modal._isShown) { + return; } - else { - modal.show() + modal.hiding = new Promise(resolve => { + const finishHide = () => { + EventHandler.off(el, 'hidden.bs.modal', finishHide); + delete modal.hiding; + delete modal.finishHide; + resolve(); + }; + modal.finishHide = finishHide; + EventHandler.one(el, 'hidden.bs.modal', finishHide); + }); + modal.approvedHide = true; + try { + modal.modal.hide(); + if (modal.modal._isShown) { + throw new Error("The modal hide request was not completed."); + } + } + catch (error) { + modal.finishHide?.(); + throw error; + } + finally { + modal.approvedHide = false; } } + modal.toggle = () => el.classList.contains('show') ? modal.close() : modal.show() + modal.close = async () => { - const close = await invoke.invokeMethodAsync("BeforeCloseCallback"); - if (close) { - modal.hide(); + if (!el.classList.contains('show')) { + return; + } + const request = String(++modal.closeRequest); + if (!await invoke.invokeMethodAsync("BeforeCloseWithRequestCallback", request)) { + return; + } + try { + return await modal.hide(); + } + catch (error) { + if (Data.get(id) === modal) { + await invoke.invokeMethodAsync("CloseFailedCallback", request); + } + throw error; } } modal.handlerKeyboardAndBackdrop = () => { - if (!modal.hook_keyboard_backdrop) { - modal.hook_keyboard_backdrop = true; - - modal.handlerEscape = async e => { - if (e.key === 'Escape') { - const keyboard = el.getAttribute('data-bs-keyboard') - if (keyboard === 'true') { - modal.close(); - } - } + if (modal.hook_keyboard_backdrop) { + return; + } + modal.hook_keyboard_backdrop = true; + + modal.handlerEscape = e => { + if (e.key === 'Escape' && el.querySelectorAll('.modal-dialog').length > 1 + && el.getAttribute('data-bs-keyboard') === 'true') { + modal.close(); } + } - EventHandler.on(document, 'keyup', modal.handlerEscape) - EventHandler.on(el, 'click', e => { - if (e.target.closest('.modal-dialog') === null) { - const backdrop = el.getAttribute('data-bs-backdrop') - if (backdrop !== 'static') { - modal.close(); - } - else if (modal.modal) { - const dialogs = [...el.querySelectorAll('.modal-dialog')].filter(d => !d.classList.contains('d-none')); - if (dialogs.length > 0) { - modal.modal._dialog = dialogs[dialogs.length - 1]; - modal.modal._triggerBackdropTransition(); - } - } + EventHandler.on(document, 'keyup', modal.handlerEscape) + EventHandler.on(el, 'click', e => { + if (el.querySelectorAll('.modal-dialog').length === 1 || e.target.closest('.modal-dialog') !== null) { + return; + } + if (el.getAttribute('data-bs-backdrop') !== 'static') { + modal.close(); + } + else if (modal.modal) { + const dialogs = [...el.querySelectorAll('.modal-dialog')].filter(d => !d.classList.contains('d-none')); + if (dialogs.length > 0) { + modal.modal._dialog = dialogs[dialogs.length - 1]; + modal.modal._triggerBackdropTransition(); } - }) - } + } + }) } modal.disposeDrag = () => { @@ -126,40 +180,60 @@ export function init(id, invoke, shownCallback, closeCallback) { export function execute(id, method) { const modal = Data.get(id) if (method === 'show') { - modal.show() + return modal.show() } else if (method === 'hide') { - modal.hide() + return modal.hide() } else if (method === 'toggle') { - modal.toggle() + return modal.toggle() } } +export function isShown(id) { + return Data.get(id)?.modal?._isShown ?? false; +} + export function dispose(id) { const modal = Data.get(id) Data.remove(id) - if (modal) { - EventHandler.off(modal.el, 'shown.bs.modal') - EventHandler.off(modal.el, 'hidden.bs.modal') - EventHandler.off(modal.el, 'click') + if (!modal) { + return; + } + modal.cancelPendingHide?.(); + const dialog = modal.modal; + const pendingTransition = modal.hiding ?? (dialog?._isTransitioning && dialog._isShown + ? new Promise(resolve => EventHandler.one(modal.el, 'shown.bs.modal', resolve)) + : null); + // Bootstrap animation callbacks still access the instance until shown/hidden. + EventHandler.off(modal.el, 'shown.bs.modal', modal.onShown) + EventHandler.off(modal.el, 'hide.bs.modal', modal.onHide) + EventHandler.off(modal.el, 'hidden.bs.modal', modal.onHidden) + EventHandler.off(modal.el, 'click') + + if (modal.hook_keyboard_backdrop) { + EventHandler.off(document, 'keyup', modal.handlerEscape) + } - if (modal.hook_keyboard_backdrop) { - EventHandler.off(document, 'keyup', modal.handlerEscape) + EventHandler.off(window, 'popstate', modal.pop) + const disposeDialog = () => { + if (!dialog) { + return; } - - EventHandler.off(window, 'popstate', modal.pop) - const dialog = modal.modal; - if (dialog) { - if (document.body.classList.contains('modal-open')) { - dialog._backdrop._config.isAnimated = false; - dialog._hideModal(); - } - - restoreBodyStyle(modal); - dialog.dispose() + if (document.body.classList.contains('modal-open')) { + dialog._backdrop._config.isAnimated = false; + dialog._hideModal(); } + + restoreBodyStyle(modal); + dialog.dispose() + }; + if (pendingTransition) { + pendingTransition.then(disposeDialog); + } + else { + disposeDialog(); } } @@ -172,6 +246,6 @@ const backupBodyStyle = modal => { const restoreBodyStyle = modal => { if (modal.originalStyle !== null) { document.body.style.cssText = modal.originalStyle; - delete modal.originalStyle; + modal.originalStyle = null; } } diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor index 8407aa0b193..761793a352e 100644 --- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor +++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor @@ -2,98 +2,100 @@ @inherits BootstrapModuleComponentBase @attribute [BootstrapModuleAutoLoader("Modal/ModalDialog.razor.js", JSObjectReference = true)] -
-
- @if (ShowHeader) - { -
- @if (HeaderTemplate != null) - { - @HeaderTemplate - } - else - { -
@Title
- } -
- @if (HeaderToolbarTemplate != null) + +
+
+ @if (ShowHeader) + { +
+ @if (HeaderTemplate != null) { - @HeaderToolbarTemplate + @HeaderTemplate } - @if (ShowPrintButtonInHeader) + else { - +
@Title
} - @if (ShowExportPdfButtonInHeader) - { - - - - } - @if (ShowMaximizeButton) - { - - } - @if (ShowHeaderCloseButton) - { - - } -
-
- } - - - -
- @RenderBodyTemplate() +
+ @if (HeaderToolbarTemplate != null) + { + @HeaderToolbarTemplate + } + @if (ShowPrintButtonInHeader) + { + + } + @if (ShowExportPdfButtonInHeader) + { + + + + } + @if (ShowMaximizeButton) + { + + } + @if (ShowHeaderCloseButton) + { + + }
- @if (ShowFooter) - { -
- @if (FooterContentTemplate != null) - { -
- @FooterContentTemplate -
- } - @if (ShowCloseButton) - { - - } - @if (ShowPrintButton) - { - - } - @if (ShowExportPdfButton) - { - - - - } - @if (ShowSaveButton) - { - - } - @if (FooterTemplate != null) - { - @FooterTemplate - } +
+ } + + + +
+ @RenderBodyTemplate()
- } - @if (ShowResize) - { - - - - } + @if (ShowFooter) + { +
+ @if (FooterContentTemplate != null) + { +
+ @FooterContentTemplate +
+ } + @if (ShowCloseButton) + { + + } + @if (ShowPrintButton) + { + + } + @if (ShowExportPdfButton) + { + + + + } + @if (ShowSaveButton) + { + + } + @if (FooterTemplate != null) + { + @FooterTemplate + } +
+ } + @if (ShowResize) + { + + + + } + - +
-
+ diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs index e426c2c6d94..ef7c5d1e2ea 100644 --- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs +++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs @@ -356,6 +356,12 @@ public partial class ModalDialog private DialogResult _result = DialogResult.Close; private bool _firstRender = true; + internal DialogCloseContext CloseContext { get; } = new(); + + internal Func>? OnClosingCallback { get; set; } + + internal Func? OnCloseCallback { get; set; } + /// /// /// @@ -510,11 +516,12 @@ private RenderFragment RenderBodyTemplate() => builder => /// protected override async ValueTask DisposeAsync(bool disposing) { - await base.DisposeAsync(disposing); - if (disposing) { + CloseContext.Closed(); Modal.RemoveDialog(this); } + + await base.DisposeAsync(disposing); } } diff --git a/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs b/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs index 023838a3ff6..e6018436237 100644 --- a/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs +++ b/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs @@ -115,6 +115,18 @@ public interface ITableEditDialogOption ///
Func>? OnEditAsync { get; set; } + /// + /// 获得/设置 保存成功后是否保持编辑弹窗打开，默认为 false + /// Gets or sets whether to keep the edit dialog open after a successful save. Default is false + /// + bool KeepOpenAfterSave { get; set; } + + /// + /// 获得/设置 保存成功后获取下一个编辑模型的异步回调方法。初始化失败时显示错误并阻止重复保存当前模型 + /// Gets or sets the async callback that provides the next edit model after a successful save. Initialization failures are displayed and prevent saving the current model again + /// + Func>? CreateNextModelAsync { get; set; } + /// /// 获得/设置 关闭弹窗回调方法 /// Gets or sets close dialog callback method diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index c19cd8ef620..b7d3aed9b9f 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -38,6 +38,21 @@ public partial class Table [Parameter] public bool ShowAddButton { get; set; } = true; + /// + /// 获得/设置 新增保存成功后是否保持编辑弹窗或抽屉并继续新增 默认为 false，仅在 Popup 与 Drawer 模式下生效 + /// Gets or sets whether to keep the edit dialog or drawer open and continue adding after a successful add. Default is false. Applies to Popup and Drawer modes only + /// + /// + /// 数据实际保存后，后续回调或刷新失败时，显示错误并禁止重复保存当前记录；不会初始化下一条记录。关闭时仍将当前记录视为已保存。 + /// If callbacks or refresh fail after the data is actually saved, an error is displayed and resaving the current record is blocked without initializing another record. Closing still treats the current record as saved. + /// 若外部 OnSaveAsync 回调在实际提交后自身抛出异常，则无法推断提交结果，调用方应使用事务或幂等保存。 + /// If an external OnSaveAsync callback throws after committing, its commit result cannot be inferred; the caller should use transactions or idempotent saves. + /// 仅使用 Items 时，保存后回调仍先于数据源更新执行；更新前失败可重试，更新后失败则禁止重复保存。 + /// With Items alone, post-save callbacks still run before the source update. Failures before the update allow retry; failures after it block resaving. + /// + [Parameter] + public bool KeepAdding { get; set; } + /// /// 获得/设置 是否显示编辑按钮 默认为 true 行内是否显示请使用 与 /// Gets or sets Whether to show Edit Button. Default true. Use and for in-row display @@ -742,8 +757,16 @@ protected async Task CancelSave() /// /// /// - protected async Task SaveModelAsync(EditContext context, ItemChangedType changedType) + /// + /// 仅使用 Items 时，此方法不更新数据源；调用方在实际更新后记录保存状态。 + /// With Items alone, this method does not update the source; the caller records the saved state after the actual update. + /// + protected Task SaveModelAsync(EditContext context, ItemChangedType changedType) + => SaveModelAsync(context, changedType, null); + + private async Task SaveModelAsync(EditContext context, ItemChangedType changedType, Action? onSaved) { + var itemsOnly = Items != null && OnSaveAsync == null && DynamicContext == null; bool valid; if (DynamicContext != null) { @@ -756,6 +779,12 @@ protected async Task SaveModelAsync(EditContext context, ItemChangedType c valid = await InternalOnSaveAsync((TItem)context.Model, changedType); } + if (!itemsOnly || !valid) + { + EditDialogSaveState.SetSaved(context, valid); + onSaved?.Invoke(valid); + } + // 回调外部自定义方法 // Callback external custom method if (OnAfterSaveAsync != null) @@ -895,14 +924,15 @@ protected async Task SaveAsync(EditContext context, ItemChangedType changedType) [Parameter] public Dialog? EditDialog { get; set; } - private async Task AddItem(EditContext context) + private async Task AddItem(EditContext context, Action onSaved) { var index = InsertRowMode == InsertRowMode.First ? 0 : Rows.Count; Rows.Insert(index, (TItem)context.Model); + onSaved(); await UpdateRow(); } - private async Task EditItem(EditContext context) + private async Task EditItem(EditContext context, Action onSaved) { var entity = Rows.FirstOrDefault(i => this.Equals(i, (TItem)context.Model)); if (entity != null) @@ -910,6 +940,7 @@ private async Task EditItem(EditContext context) var index = Rows.IndexOf(entity); Rows.RemoveAt(index); Rows.Insert(index, (TItem)context.Model); + onSaved(); await UpdateRow(); } } @@ -957,10 +988,8 @@ private void AppendOptions(ITableEditDialogOption option, ItemChangedType /// protected async Task ShowEditDialog(ItemChangedType changedType) { - var saved = false; - // 用于判断是否未保存数据直接点击关闭取消数据保存操作 - var triggerFromSave = false; + var saved = false; var option = new EditDialogOption() { Class = "modal-dialog-table", @@ -974,21 +1003,19 @@ protected async Task ShowEditDialog(ItemChangedType changedType) ShowConfirmCloseSwal = ShowCloseConfirm, CloseConfirmTitle = CloseConfirmTitle, CloseConfirmContent = CloseConfirmContent, - OnCloseAsync = async () => - { - if (triggerFromSave == false && OnAfterCancelSaveAsync != null) - { - await OnAfterCancelSaveAsync(); - } - await OnCloseEditDialogCallbackAsync(saved); - }, + KeepOpenAfterSave = changedType == ItemChangedType.Add && KeepAdding, + OnCloseAsync = () => CloseEditDialogAsync(saved), OnEditAsync = async context => { - saved = await OnSaveEditCallbackAsync(context, changedType); + var result = await OnSaveEditCallbackAsync(context, changedType, result => saved = result); // 已保存数据 - triggerFromSave = saved; - return saved; + return result; + }, + CreateNextModelAsync = async () => + { + saved = false; + return await CreateNextEditModelAsync(); } }; AppendOptions(option, changedType); @@ -1007,18 +1034,13 @@ protected async Task ShowEditDrawer(ItemChangedType changedType) ShowConfirmCloseSwal = ShowCloseConfirm, CloseConfirmTitle = CloseConfirmTitle, CloseConfirmContent = CloseConfirmContent, - OnCloseAsync = async () => - { - if (OnAfterCancelSaveAsync != null) - { - await OnAfterCancelSaveAsync(); - } - await OnCloseEditDialogCallbackAsync(saved); - }, - OnEditAsync = async context => + KeepOpenAfterSave = changedType == ItemChangedType.Add && KeepAdding, + OnCloseAsync = () => CloseEditDialogAsync(saved), + OnEditAsync = context => OnSaveEditCallbackAsync(context, changedType, result => saved = result), + CreateNextModelAsync = async () => { - saved = await OnSaveEditCallbackAsync(context, changedType); - return saved; + saved = false; + return await CreateNextEditModelAsync(); } }; AppendOptions(editOption, changedType); @@ -1038,64 +1060,121 @@ protected async Task ShowEditDrawer(ItemChangedType changedType) await DrawerService.ShowEditDrawer(editOption, option); } + private async Task CreateNextEditModelAsync() + { + await InternalOnAddAsync(); + if (EditModel == null) + { + throw new InvalidOperationException($"{nameof(OnAddAsync)} must return a non-null model."); + } + await OnSelectedRowsChanged(); + return EditModel; + } + + private async Task CloseEditDialogAsync(bool saved) + { + try + { + if (!saved && OnAfterCancelSaveAsync != null) + { + await OnAfterCancelSaveAsync(); + } + } + finally + { + await OnCloseEditDialogCallbackAsync(saved); + } + } + private async Task OnCloseEditDialogCallbackAsync(bool saved) { - if (EditDialogCloseAsync != null) + try { - await EditDialogCloseAsync(EditModel, saved); + if (EditDialogCloseAsync != null) + { + await EditDialogCloseAsync(EditModel, saved); + } + } + finally + { + if (!saved) + { + await CancelEditModelAsync(); + } } + } - if (!saved) + private async Task CancelEditModelAsync() + { + var dataService = DataService ?? InjectDataService; + if (dataService is IEntityFrameworkCoreDataService ef) { - var dataService = DataService ?? InjectDataService; - if (dataService is IEntityFrameworkCoreDataService ef) + // EFCore + await ToggleLoading(true); + try { - // EFCore - await ToggleLoading(true); await ef.CancelAsync(); + } + finally + { await ToggleLoading(false); } } } - private async Task OnSaveEditCallbackAsync(EditContext context, ItemChangedType changedType) + private async Task OnSaveEditCallbackAsync(EditContext context, ItemChangedType changedType, Action onSaved) { bool saved; await ToggleLoading(true); - if (IsTracking) + try { - saved = true; - if (changedType == ItemChangedType.Add) + if (IsTracking) { - var index = InsertRowMode == InsertRowMode.First ? 0 : Rows.Count; - Rows.Insert(index, EditModel); + saved = true; + if (changedType == ItemChangedType.Add) + { + var index = InsertRowMode == InsertRowMode.First ? 0 : Rows.Count; + Rows.Insert(index, EditModel); + } + EditDialogSaveState.SetSaved(context, true); + onSaved(true); + await InvokeItemsChanged(); + await InvokeAsync(StateHasChanged); } - await InvokeItemsChanged(); - } - else - { - saved = await SaveModelAsync(context, changedType); - if (saved) + else { - if (Items != null) + void MarkSaved() + { + EditDialogSaveState.SetSaved(context, true); + onSaved(true); + } + saved = await SaveModelAsync(context, changedType, onSaved); + if (saved) { - if (changedType == ItemChangedType.Add) + if (Items != null) { - await AddItem(context); + if (changedType == ItemChangedType.Add) + { + await AddItem(context, MarkSaved); + } + else if (changedType == ItemChangedType.Update) + { + await EditItem(context, MarkSaved); + } + await InvokeAsync(StateHasChanged); } - else if (changedType == ItemChangedType.Update) + else { - await EditItem(context); + await QueryAsync(); } } - else - { - await QueryAsync(); - } } + return saved; + } + finally + { + await ToggleLoading(false); } - await ToggleLoading(false); - return saved; } /// diff --git a/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs b/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs index 9eba8849cb3..47564170369 100644 --- a/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs +++ b/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs @@ -113,6 +113,16 @@ public class TableEditDrawerOption : ITableEditDialogOption /// public Func>? OnEditAsync { get; set; } + /// + /// + /// + public bool KeepOpenAfterSave { get; set; } + + /// + /// + /// + public Func>? CreateNextModelAsync { get; set; } + /// /// /// diff --git a/src/BootstrapBlazor/Extensions/DrawerExtensions.cs b/src/BootstrapBlazor/Extensions/DrawerExtensions.cs index 11a0fab2037..ddf66e11da0 100644 --- a/src/BootstrapBlazor/Extensions/DrawerExtensions.cs +++ b/src/BootstrapBlazor/Extensions/DrawerExtensions.cs @@ -24,14 +24,40 @@ public static class DrawerExtensions /// option instance /// /// - /// 配置类实例 - /// option instance + /// 配置类实例，编辑内容与关闭回调在当前展示的组件参数中组合，不改写原配置 + /// option instance. Edit content and close callbacks are composed in the current display's component parameters without modifying the original configuration /// public static async Task ShowEditDrawer(this DrawerService service, TableEditDrawerOption editDialogOption, DrawerOption option) { var parameters = editDialogOption.ToParameter(); - parameters.Add(nameof(EditDialog.OnCloseAsync), editDialogOption.OnCloseAsync); - option.ChildContent = BootstrapDynamicComponent.CreateComponent>(parameters).Render(); - await service.Show(option); + RenderFragment content = builder => + { + builder.OpenComponent>(0); + foreach (var parameter in parameters) + { + builder.AddAttribute(1, parameter.Key, parameter.Value); + } + builder.CloseComponent(); + }; + await service.Show(option, drawerParameters => + { + var containerCloseAsync = (Func)drawerParameters[nameof(Drawer.OnCloseAsync)]; + var editCloseAsync = editDialogOption.OnCloseAsync; + drawerParameters[nameof(Drawer.ChildContent)] = content; + drawerParameters[nameof(Drawer.OnCloseAsync)] = new Func(async () => + { + try + { + if (editCloseAsync != null) + { + await editCloseAsync(); + } + } + finally + { + await containerCloseAsync(); + } + }); + }); } } diff --git a/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs b/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs index e3d26237da4..48c674670bf 100644 --- a/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs +++ b/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs @@ -42,6 +42,8 @@ public static class TableEditDialogOptionExtensions [nameof(EditDialog.LabelWidth)] = option.LabelWidth, [nameof(EditDialog.BodyTemplate)] = option.DialogBodyTemplate, [nameof(EditDialog.FooterTemplate)] = option.DialogFooterTemplate, + [nameof(EditDialog.KeepOpenAfterSave)] = option.KeepOpenAfterSave, + [nameof(EditDialog.CreateNextModelAsync)] = option.CreateNextModelAsync, [nameof(EditDialog.OnSaveAsync)] = new Func>(async context => { var ret = false; diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json index bba7c671b16..cb7ce0ec6c8 100644 --- a/src/BootstrapBlazor/Locales/en.json +++ b/src/BootstrapBlazor/Locales/en.json @@ -266,7 +266,9 @@ "CloseButtonText": "Close", "SaveButtonText": "Save", "CloseConfirmTitle": "Warning", - "CloseConfirmContent": "The form has been changed. Are you sure you continue to close it?" + "CloseConfirmContent": "The form has been changed. Are you sure you continue to close it?", + "NextModelInitializationError": "The current item was saved, but initializing the next item failed. Close this window to cancel the unsaved item, then add a new item again.", + "SavePostProcessingError": "The current item was saved, but subsequent processing failed. Close and reopen this window; do not save the current item again." }, "BootstrapBlazor.Components.TableColumnFilter": { "ClearButtonText": "Clear", diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json index 8b70a11853e..e562d0f181a 100644 --- a/src/BootstrapBlazor/Locales/zh.json +++ b/src/BootstrapBlazor/Locales/zh.json @@ -266,7 +266,9 @@ "CloseButtonText": "关闭", "SaveButtonText": "保存", "CloseConfirmTitle": "请注意", - "CloseConfirmContent": "表单内容已更改，确定要继续关闭吗？" + "CloseConfirmContent": "表单内容已更改，确定要继续关闭吗？", + "NextModelInitializationError": "当前数据已保存，但下一条数据初始化失败。请关闭窗口以取消未保存的数据，再重新新增。", + "SavePostProcessingError": "本次数据已保存，但后续处理失败。请关闭窗口后重新打开，不要重复保存这条数据。" }, "BootstrapBlazor.Components.TableColumnFilter": { "ClearButtonText": "重置", diff --git a/test/UnitTest/Components/EditDialogLifecycleTest.cs b/test/UnitTest/Components/EditDialogLifecycleTest.cs new file mode 100644 index 00000000000..a9fec165ab2 --- /dev/null +++ b/test/UnitTest/Components/EditDialogLifecycleTest.cs @@ -0,0 +1,1194 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the Apache 2.0 License +// See the LICENSE file in the project root for more information. +// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone + +using Microsoft.AspNetCore.Components.Forms; +using TestContext = Xunit.TestContext; + +namespace UnitTest.Components; + +public class EditDialogLifecycleTest : BootstrapBlazorTestBase +{ + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task BoundDrawerClose_RejectsOldValidation(bool reopen) + { + var model = new TableDialogTest.DelayedValidationModel(); + var saved = 0; + var closed = 0; + var changed = 0; + var cut = Context.Render(pb => + { + pb.Add(a => a.IsOpen, true); + pb.Add(a => a.OnCloseAsync, () => + { + closed++; + return Task.CompletedTask; + }); + pb.Add(a => a.IsOpenChanged, value => changed++); + pb.AddChildContent>(editor => + { + editor.Add(a => a.Model, model); + editor.Add(a => a.ShowCloseConfirm, false); + editor.Add(a => a.KeepOpenAfterSave, true); + editor.Add(a => a.BodyTemplate, item => builder => builder.AddContent(0, item.Name)); + editor.Add(a => a.OnSaveAsync, context => + { + saved++; + return Task.FromResult(false); + }); + }); + }); + var form = cut.FindComponent().Instance; + var submit = cut.InvokeAsync(() => form.OnSubmit.InvokeAsync(form.EditContext!)); + try + { + await model.Started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + cut.Render(pb => pb.Add(a => a.IsOpen, false)); + if (reopen) + { + cut.Render(pb => pb.Add(a => a.IsOpen, true)); + } + model.Continue.TrySetResult(); + await submit; + Assert.Equal(0, saved); + Assert.Equal(0, closed); + Assert.Equal(0, changed); + if (reopen) + { + var currentForm = cut.FindComponent().Instance; + await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(model))); + Assert.Equal(1, saved); + } + } + finally + { + model.Continue.TrySetResult(); + await submit; + } + } + + [Fact] + public async Task PopupHideFailure_AllowsRetryInsteadOfPermanentClosing() + { + var failure = new InvalidOperationException("Hide failed"); + var hide = Context.JSInterop.SetupVoid("execute", invocation => + invocation.Arguments.Count == 2 && invocation.Arguments[1] is string method && method == "hide"); + hide.SetException(failure); + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + var modal = cut.FindComponent().Instance; + Assert.Same(failure, await Assert.ThrowsAsync(() => cut.InvokeAsync(modal.Close))); + Assert.Single(cut.FindComponents>()); + hide.SetVoidResult(); + await cut.InvokeAsync(modal.Close); + await cut.InvokeAsync(modal.CloseCallback); + Assert.Empty(cut.FindComponents>()); + } + + [Fact] + public async Task BoundDrawerReopen_DoesNotAcceptPreviousCloseCheck() + { + var first = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var second = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var checks = 0; + var closed = 0; + var cut = Context.Render(pb => + { + pb.Add(a => a.IsOpen, true); + pb.Add(a => a.OnClosingAsync, () => ++checks == 1 ? first.Task : second.Task); + pb.Add(a => a.OnCloseAsync, () => + { + closed++; + return Task.CompletedTask; + }); + }); + var oldClose = cut.InvokeAsync(cut.Instance.Close); + cut.WaitForAssertion(() => Assert.Equal(1, checks)); + cut.Render(pb => pb.Add(a => a.IsOpen, false)); + cut.Render(pb => pb.Add(a => a.IsOpen, true)); + var currentClose = cut.InvokeAsync(cut.Instance.Close); + try + { + cut.WaitForAssertion(() => Assert.Equal(2, checks)); + first.TrySetResult(true); + await oldClose; + Assert.True(cut.Instance.IsOpen); + Assert.Equal(0, closed); + await cut.InvokeAsync(cut.Instance.Close); + Assert.Equal(2, checks); + second.TrySetResult(true); + await currentClose; + Assert.False(cut.Instance.IsOpen); + Assert.Equal(1, closed); + } + finally + { + first.TrySetResult(false); + second.TrySetResult(false); + await Task.WhenAll(oldClose, currentClose); + } + } + + [Fact] + public async Task PopupLateHideFailure_DoesNotRecoverNewClosingTarget() + { + var hide = Context.JSInterop.SetupVoid("execute", invocation => + invocation.Arguments.Count == 2 && invocation.Arguments[1] is string method && method == "hide"); + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + var modal = cut.FindComponent().Instance; + var closing = cut.InvokeAsync(modal.Close); + try + { + cut.WaitForAssertion(() => Assert.Single(hide.Invocations)); + var next = new Foo(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = next, ShowConfirmCloseSwal = false + })); + await cut.InvokeAsync(modal.CloseCallback); + Assert.Same(next, cut.FindComponent>().Instance.Model); + Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("next"))); + hide.SetException(new InvalidOperationException("Late hide failure")); + await Assert.ThrowsAsync(() => closing); + Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); + await cut.InvokeAsync(modal.CloseCallback); + Assert.Empty(cut.FindComponents>()); + } + finally + { + hide.SetVoidResult(); + } + } + + [Fact] + public async Task BrowserHideFailure_OnlyRecoversMatchingUnclosedRequest() + { + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + var modal = cut.FindComponent().Instance; + Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("first"))); + await cut.InvokeAsync(() => modal.CloseFailedCallback("unrelated")); + Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); + await cut.InvokeAsync(() => modal.CloseFailedCallback("first")); + Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("retry"))); + await cut.InvokeAsync(modal.CloseCallback); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("next"))); + await cut.InvokeAsync(() => modal.CloseFailedCallback("retry")); + Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); + await cut.InvokeAsync(modal.CloseCallback); + Assert.Empty(cut.FindComponents>()); + } + + [Fact] + public async Task PopupLateHideFailure_DoesNotRecoverRetryInSamePresentation() + { + var hide = Context.JSInterop.SetupVoid("execute", invocation => + invocation.Arguments.Count == 2 && invocation.Arguments[1] is string method && method == "hide"); + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + var modal = cut.FindComponent().Instance; + var closing = cut.InvokeAsync(modal.Close); + try + { + cut.WaitForAssertion(() => Assert.Single(hide.Invocations)); + var field = typeof(Modal).GetField("_closingWindow", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); + var window = Assert.IsAssignableFrom(field!.GetValue(modal)); + var request = Assert.IsType(window[3]); + await cut.InvokeAsync(() => modal.CloseFailedCallback(request)); + Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("retry"))); + hide.SetException(new InvalidOperationException("Late hide failure")); + await Assert.ThrowsAsync(() => closing); + Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); + await cut.InvokeAsync(modal.CloseCallback); + } + finally + { + hide.SetVoidResult(); + } + } + + [Theory] + [InlineData(EditMode.Popup, false)] + [InlineData(EditMode.Drawer, false)] + [InlineData(EditMode.Popup, true)] + [InlineData(EditMode.Drawer, true)] + public async Task ItemsAfterSaveFailure_MarksOnlyExternalPersistence(EditMode mode, bool externalSave) + { + var fail = true; + var saved = 0; + var closedSaved = false; + var model = new Foo { Name = "record" }; + var cut = Context.Render(pb => + { + pb.AddChildContent>(table => + { + table.Add(a => a.Items, new List()); + table.Add(a => a.IsTracking, false); + table.Add(a => a.EditMode, mode); + table.Add(a => a.ShowCloseConfirm, false); + table.Add(a => a.KeepAdding, true); + table.Add(a => a.OnAddAsync, () => Task.FromResult(model)); + if (externalSave) + { + table.Add(a => a.OnSaveAsync, (item, type) => + { + saved++; + return Task.FromResult(true); + }); + } + table.Add(a => a.OnAfterSaveAsync, item => + fail ? Task.FromException(new InvalidOperationException("After-save failed")) : Task.CompletedTask); + table.Add(a => a.EditDialogCloseAsync, (item, wasSaved) => + { + closedSaved = wasSaved; + return Task.CompletedTask; + }); + }); + }); + var table = cut.FindComponent>().Instance; + await cut.InvokeAsync(table.AddAsync); + var editor = cut.FindComponent>(); + var form = editor.FindComponent().Instance; + await Assert.ThrowsAsync(() => + cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model)))); + Assert.Empty(table.Items!); + Assert.Equal(externalSave, editor.Find("button[type='submit']").HasAttribute("disabled")); + fail = false; + await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); + if (externalSave) + { + Assert.Equal(1, saved); + Assert.Empty(table.Items!); + } + else + { + Assert.Single(table.Items!); + } + if (mode == EditMode.Drawer) + { + await cut.InvokeAsync(cut.FindComponent().Instance.Close); + } + else + { + await cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback); + } + Assert.Equal(externalSave, closedSaved); + } + + [Theory] + [InlineData(EditMode.Popup)] + [InlineData(EditMode.Drawer)] + public async Task ItemsChangedFailureAfterMutation_BlocksRetry(EditMode mode) + { + var changed = 0; + var model = new Foo(); + var cut = Context.Render(pb => pb.AddChildContent>(table => + { + table.Add(a => a.Items, new List()); + table.Add(a => a.IsTracking, false); + table.Add(a => a.EditMode, mode); + table.Add(a => a.ShowCloseConfirm, false); + table.Add(a => a.KeepAdding, true); + table.Add(a => a.OnAddAsync, () => Task.FromResult(model)); + table.Add(a => a.ItemsChanged, items => + { + changed++; + throw new InvalidOperationException("Items changed failed"); + }); + })); + var table = cut.FindComponent>().Instance; + await cut.InvokeAsync(table.AddAsync); + var editor = cut.FindComponent>(); + var form = editor.FindComponent().Instance; + await Assert.ThrowsAsync(() => + cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model)))); + Assert.Single(table.Rows); + Assert.True(editor.Find("button[type='submit']").HasAttribute("disabled")); + await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); + Assert.Equal(1, changed); + Assert.Single(table.Rows); + } + + [Theory] + [InlineData(EditMode.Popup)] + [InlineData(EditMode.Drawer)] + public async Task ItemsUpdateHookFailure_AllowsRetryBeforeReplacingRow(EditMode mode) + { + var fail = true; + var original = new Foo { Name = "original" }; + var cut = Context.Render(pb => pb.AddChildContent>(table => + { + table.Add(a => a.Items, new[] { original }); + table.Add(a => a.IsTracking, false); + table.Add(a => a.EditMode, mode); + table.Add(a => a.ShowCloseConfirm, false); + table.Add(a => a.ModelEqualityComparer, (first, second) => first.Id == second.Id); + table.Add(a => a.OnAfterSaveAsync, item => + fail ? Task.FromException(new InvalidOperationException("Update hook failed")) : Task.CompletedTask); + })); + var table = cut.FindComponent>().Instance; + table.SelectedRows.Add(original); + await cut.InvokeAsync(table.EditAsync); + var editor = cut.FindComponent>(); + var form = editor.FindComponent().Instance; + var edited = (Foo)form.Model!; + edited.Name = "updated"; + await Assert.ThrowsAsync(() => + cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(edited)))); + Assert.Same(original, Assert.Single(table.Items!)); + Assert.Equal("original", original.Name); + Assert.False(editor.Find("button[type='submit']").HasAttribute("disabled")); + fail = false; + await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(edited))); + Assert.Same(edited, Assert.Single(table.Items!)); + Assert.Equal("updated", table.Items!.Single().Name); + } + + [Theory] + [InlineData(EditMode.Popup)] + [InlineData(EditMode.Drawer)] + public async Task ClosingRerender_PreservesSubmissionBlock(EditMode mode) + { + var closeJs = mode == EditMode.Drawer + ? Context.JSInterop.Setup("execute", invocation => + invocation.Arguments.Count == 2 && invocation.Arguments[1] is false) + : null; + var model = new TableDialogTest.DelayedValidationModel(); + var saved = 0; + var created = 0; + ITableEditDialogOption option = mode == EditMode.Drawer + ? new TableEditDrawerOption() + : new EditDialogOption(); + option.Model = model; + option.ShowConfirmCloseSwal = false; + option.KeepOpenAfterSave = true; + option.DialogBodyTemplate = item => builder => builder.AddContent(0, item.Name); + option.OnEditAsync = context => + { + saved++; + return Task.FromResult(true); + }; + option.CreateNextModelAsync = () => + { + created++; + return Task.FromResult(new TableDialogTest.DelayedValidationModel()); + }; + var cut = Context.Render(); + if (option is TableEditDrawerOption drawerOption) + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDrawer(drawerOption, new DrawerOption())); + } + else if (option is EditDialogOption dialogOption) + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(dialogOption)); + } + var form = cut.FindComponent().Instance; + var submit = cut.InvokeAsync(() => form.OnSubmit.InvokeAsync(form.EditContext!)); + var closing = Task.CompletedTask; + try + { + await model.Started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + if (mode == EditMode.Drawer) + { + var drawer = cut.FindComponent().Instance; + closing = cut.InvokeAsync(drawer.Close); + cut.WaitForAssertion(() => Assert.False(drawer.IsOpen)); + Assert.False(closing.IsCompleted); + cut.FindComponent().Render(); + Assert.False(drawer.IsOpen); + } + else + { + await cut.InvokeAsync(cut.FindComponent().Instance.Close); + cut.FindComponent().Render(); + } + model.Continue.TrySetResult(); + await submit; + } + finally + { + model.Continue.TrySetResult(); + closeJs?.SetResult(false); + } + await closing; + if (mode == EditMode.Popup) + { + await cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback); + } + Assert.Equal(new[] { 0, 0 }, new[] { saved, created }); + } + + [Fact] + public async Task PopupRerender_PreservesRegisteredBusyGuard() + { + var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var model = new Foo(); + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = model, + ShowConfirmCloseSwal = false, + OnEditAsync = context => + { + started.TrySetResult(); + return saving.Task; + } + })); + var editor = cut.FindComponent>(); + var form = editor.FindComponent().Instance; + var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); + try + { + await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + cut.FindComponent().Render(); + Assert.False(await cut.InvokeAsync(cut.FindComponent().Instance.BeforeCloseCallback)); + } + finally + { + saving.TrySetResult(false); + await submit; + } + } + + [Fact] + public async Task PopupOptionGuard_CanDenyCloseAlongsideEditorGuard() + { + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false, + OnClosingAsync = () => Task.FromResult(false) + })); + Assert.False(await cut.InvokeAsync(cut.FindComponent().Instance.BeforeCloseCallback)); + } + + [Fact] + public async Task ModalGuards_AwaitAllAndHonorAnyVeto() + { + var gate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var lastGuardCalls = 0; + var cut = Context.Render(); + cut.Instance.RegisterOnClosingCallback(async () => + { + started.TrySetResult(); + return await gate.Task; + }); + cut.Instance.RegisterOnClosingCallback(() => + { + lastGuardCalls++; + return Task.FromResult(true); + }); + var checking = cut.InvokeAsync(cut.Instance.BeforeCloseCallback); + await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + Assert.False(checking.IsCompleted); + Assert.False(await cut.InvokeAsync(cut.Instance.BeforeCloseCallback)); + gate.TrySetResult(false); + Assert.False(await checking); + Assert.Equal(1, lastGuardCalls); + } + + [Fact] + public async Task MultiPopup_ReturningToParentPreservesBusyGuard() + { + var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var model = new Foo(); + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = model, + ShowConfirmCloseSwal = false, + OnEditAsync = context => + { + started.TrySetResult(); + return saving.Task; + } + })); + var parentEditor = cut.FindComponent>(); + var form = parentEditor.FindComponent().Instance; + var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); + try + { + await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false + })); + var modal = cut.FindComponent().Instance; + Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); + await cut.InvokeAsync(modal.CloseCallback); + Assert.Single(cut.FindComponents>()); + Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); + } + finally + { + saving.TrySetResult(false); + await submit; + } + } + + [Theory] + [InlineData(EditMode.Popup)] + [InlineData(EditMode.Drawer)] + public async Task CloseException_StillRemovesCurrentEditor(EditMode mode) + { + var cut = Context.Render(); + var failure = new InvalidOperationException("Close cleanup failed"); + if (mode == EditMode.Popup) + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false, + OnCloseAsync = () => Task.FromException(failure) + })); + Assert.Same(failure, await Assert.ThrowsAsync(() => + cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback))); + } + else + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDrawer(new TableEditDrawerOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false, + OnCloseAsync = () => Task.FromException(failure) + }, new DrawerOption())); + Assert.Same(failure, await Assert.ThrowsAsync(() => + cut.InvokeAsync(cut.FindComponent().Instance.Close))); + } + Assert.Empty(cut.FindComponents>()); + } + + [Fact] + public async Task ConcurrentDrawerClose_RunsCleanupOnlyOnce() + { + var closeJs = Context.JSInterop.Setup("execute", invocation => + invocation.Arguments.Count == 2 && invocation.Arguments[1] is false); + var editedClosed = 0; + var userClosed = 0; + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + var option = new DrawerOption + { + OnCloseAsync = () => + { + userClosed++; + return Task.CompletedTask; + } + }; + await cut.InvokeAsync(() => service.ShowEditDrawer(new TableEditDrawerOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false, + OnCloseAsync = () => + { + editedClosed++; + return Task.CompletedTask; + } + }, option)); + var firstClose = cut.InvokeAsync(option.CloseAsync); + cut.WaitForAssertion(() => Assert.False(cut.FindComponent().Instance.IsOpen)); + var secondClose = cut.InvokeAsync(option.CloseAsync); + closeJs.SetResult(false); + await Task.WhenAll(firstClose, secondClose); + Assert.Equal(new[] { 1, 1 }, new[] { editedClosed, userClosed }); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task DrawerCloseCallback_DoesNotRemoveNewlyOpenedDrawer(bool reuseOption) + { + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + var original = new DrawerOption(); + var next = reuseOption ? original : new DrawerOption(); + original.OnCloseAsync = () => + { + next.Width = "700px"; + return service.Show(next); + }; + await cut.InvokeAsync(() => service.Show(original)); + var firstDrawer = cut.FindComponent().Instance; + await cut.InvokeAsync(original.CloseAsync); + Assert.Single(cut.FindComponents()); + Assert.Equal("700px", cut.FindComponent().Instance.Width); + Assert.NotSame(firstDrawer, cut.FindComponent().Instance); + Assert.False(firstDrawer.IsOpen); + } + + [Theory] + [InlineData(EditMode.Popup, false)] + [InlineData(EditMode.Drawer, false)] + [InlineData(EditMode.Popup, true)] + [InlineData(EditMode.Drawer, true)] + public async Task PostSaveFailure_BlocksRetryAndPreservesSavedClose(EditMode mode, bool failHook) + { + var saved = 0; + var created = 0; + var canceled = 0; + var closedSaved = false; + var failure = new InvalidOperationException("Post-save processing failed"); + var cut = Context.Render(pb => + { + pb.AddChildContent>(pb => + { + pb.Add(a => a.RenderMode, TableRenderMode.Table); + pb.Add(a => a.EditMode, mode); + pb.Add(a => a.KeepAdding, true); + pb.Add(a => a.ShowCloseConfirm, false); + pb.Add(a => a.OnAddAsync, () => + { + created++; + return Task.FromResult(new Foo()); + }); + pb.Add(a => a.OnSaveAsync, (item, changedType) => + { + saved++; + return Task.FromResult(true); + }); + pb.Add(a => a.OnAfterSaveAsync, item => failHook ? Task.FromException(failure) : Task.CompletedTask); + pb.Add(a => a.OnQueryAsync, options => !failHook && saved > 0 + ? Task.FromException>(failure) + : Task.FromResult(new QueryData { Items = [], TotalCount = 0 })); + pb.Add(a => a.OnAfterCancelSaveAsync, () => + { + canceled++; + return Task.CompletedTask; + }); + pb.Add(a => a.EditDialogCloseAsync, (item, wasSaved) => + { + closedSaved = wasSaved; + return Task.CompletedTask; + }); + }); + }); + await cut.InvokeAsync(() => cut.FindComponent>().Instance.AddAsync()); + var editor = cut.FindComponent>(); + var form = editor.FindComponent().Instance; + var context = new EditContext(form.Model!); + Assert.Same(failure, await Assert.ThrowsAsync(() => + cut.InvokeAsync(() => form.OnValidSubmit!(context)))); + Assert.NotEmpty(editor.Find("[role='alert']").TextContent); + Assert.True(editor.Find("button[type='submit']").HasAttribute("disabled")); + await cut.InvokeAsync(() => form.OnValidSubmit!(context)); + Assert.Equal(1, saved); + Assert.Equal(1, created); + if (mode == EditMode.Drawer) + { + await cut.InvokeAsync(cut.FindComponent().Instance.Close); + } + else + { + await cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback); + } + Assert.True(closedSaved); + Assert.Equal(0, canceled); + } + + [Theory] + [InlineData(EditMode.Popup)] + [InlineData(EditMode.Drawer)] + public async Task ClosingCheck_RechecksBusyStateAfterAwait(EditMode mode) + { + var checking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var startedChecking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var startedSaving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var model = new Foo(); + Func> check = () => + { + startedChecking.TrySetResult(); + return checking.Task; + }; + Func> save = context => + { + startedSaving.TrySetResult(); + return saving.Task; + }; + var cut = Context.Render(); + if (mode == EditMode.Popup) + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = model, ShowConfirmCloseSwal = false, OnEditAsync = save, OnClosingAsync = check + })); + } + else + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDrawer(new TableEditDrawerOption + { + Model = model, ShowConfirmCloseSwal = false, OnEditAsync = save + }, new DrawerOption { OnClosingAsync = check })); + } + var closing = mode == EditMode.Popup + ? cut.InvokeAsync(cut.FindComponent().Instance.Close) + : cut.InvokeAsync(cut.FindComponent().Instance.Close); + await startedChecking.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + var form = cut.FindComponent().Instance; + var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); + try + { + await startedSaving.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + checking.TrySetResult(true); + await closing; + Assert.Single(cut.FindComponents>()); + if (mode == EditMode.Drawer) + { + Assert.True(cut.FindComponent().Instance.IsOpen); + } + else + { + Assert.False(await cut.InvokeAsync(cut.FindComponent().Instance.BeforeCloseCallback)); + } + } + finally + { + checking.TrySetResult(false); + saving.TrySetResult(false); + await submit; + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task PopupCloseCallback_PreservesNewPresentationAndParentGuard(bool failClose) + { + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + var next = new Foo { Name = "next" }; + var failure = new InvalidOperationException("Close failed"); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false, + OnClosingAsync = () => Task.FromResult(false) + })); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false, + OnCloseAsync = async () => + { + await service.ShowEditDialog(new EditDialogOption + { + Model = next, + ShowConfirmCloseSwal = false, + OnClosingAsync = () => Task.FromResult(false) + }); + if (failClose) + { + throw failure; + } + } + })); + var modal = cut.FindComponent().Instance; + Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); + if (failClose) + { + Assert.Same(failure, await Assert.ThrowsAsync(() => cut.InvokeAsync(modal.CloseCallback))); + } + else + { + await cut.InvokeAsync(modal.CloseCallback); + } + Assert.Equal(2, cut.FindComponents>().Count); + Assert.Contains(cut.FindComponents>(), editor => ReferenceEquals(editor.Instance.Model, next)); + Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); + await cut.InvokeAsync(modal.CloseCallback); + Assert.Single(cut.FindComponents>()); + Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); + } + + [Fact] + public async Task PopupPendingCheck_DoesNotBlockOrCloseChildPresentation() + { + var checking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), + ShowConfirmCloseSwal = false, + OnClosingAsync = () => + { + started.TrySetResult(); + return checking.Task; + } + })); + var modal = cut.FindComponent().Instance; + var parentChecking = cut.InvokeAsync(modal.BeforeCloseCallback); + try + { + await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); + checking.TrySetResult(true); + Assert.False(await parentChecking); + await cut.InvokeAsync(modal.CloseCallback); + Assert.Single(cut.FindComponents>()); + } + finally + { + checking.TrySetResult(false); + await parentChecking; + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task DrawerPendingCheck_CannotCloseReplacement(bool reuseOption) + { + var checking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closed = 0; + var original = new DrawerOption + { + OnClosingAsync = () => + { + started.TrySetResult(); + return checking.Task; + }, + OnCloseAsync = () => + { + closed++; + return Task.CompletedTask; + } + }; + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.Show(original)); + var first = cut.FindComponent().Instance; + var closing = cut.InvokeAsync(first.Close); + try + { + await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + var next = reuseOption ? original : new DrawerOption(); + next.OnClosingAsync = () => Task.FromResult(true); + await cut.InvokeAsync(() => service.Show(next)); + checking.TrySetResult(true); + await closing; + Assert.Equal(0, closed); + var replacement = cut.FindComponent().Instance; + Assert.NotSame(first, replacement); + Assert.True(replacement.IsOpen); + await cut.InvokeAsync(next.CloseAsync); + Assert.Empty(cut.FindComponents()); + } + finally + { + checking.TrySetResult(false); + await closing; + } + } + + [Fact] + public async Task OrdinaryDrawer_UpdateOpenOptionPreservesComponent() + { + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + var option = new DrawerOption { Width = "400px" }; + await cut.InvokeAsync(() => service.Show(option)); + var drawer = cut.FindComponent().Instance; + option.Width = "700px"; + await cut.InvokeAsync(() => service.Show(option)); + Assert.Same(drawer, cut.FindComponent().Instance); + Assert.Equal("700px", drawer.Width); + await cut.InvokeAsync(option.CloseAsync); + Assert.Empty(cut.FindComponents()); + } + + [Theory] + [InlineData(EditMode.Popup)] + [InlineData(EditMode.Drawer)] + public async Task ReopeningStaticHost_RejectsPreviousPresentationValidation(EditMode mode) + { + var model = new TableDialogTest.DelayedValidationModel(); + var saved = 0; + Modal? modal = null; + Drawer? drawer = null; + RenderFragment editor = builder => + { + builder.OpenComponent>(0); + builder.AddAttribute(1, nameof(EditDialog.Model), model); + builder.AddAttribute(2, nameof(EditDialog.ShowCloseConfirm), false); + builder.AddAttribute(3, nameof(EditDialog.OnSaveAsync), new Func>(context => + { + saved++; + return Task.FromResult(false); + })); + builder.CloseComponent(); + }; + var cut = Context.Render(pb => pb.AddChildContent(builder => + { + if (mode == EditMode.Popup) + { + builder.OpenComponent(0); + builder.AddAttribute(1, nameof(Modal.ChildContent), new RenderFragment(builder => + { + builder.OpenComponent(0); + builder.AddAttribute(1, nameof(ModalDialog.BodyTemplate), editor); + builder.CloseComponent(); + })); + builder.AddComponentReferenceCapture(2, component => modal = (Modal)component); + } + else + { + builder.OpenComponent(0); + builder.AddAttribute(1, nameof(Drawer.IsOpen), true); + builder.AddAttribute(2, nameof(Drawer.ChildContent), editor); + builder.AddComponentReferenceCapture(3, component => drawer = (Drawer)component); + } + builder.CloseComponent(); + })); + var firstEditor = cut.FindComponent>().Instance; + var firstForm = cut.FindComponent().Instance; + var submit = cut.InvokeAsync(() => firstForm.OnSubmit.InvokeAsync(firstForm.EditContext!)); + try + { + await model.Started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + if (mode == EditMode.Popup) + { + await cut.InvokeAsync(modal!.Close); + await cut.InvokeAsync(modal.CloseCallback); + await cut.InvokeAsync(modal.Show); + } + else + { + await cut.InvokeAsync(drawer!.Close); + cut.FindComponents().Single(component => ReferenceEquals(component.Instance, drawer)) + .Render(pb => pb.Add(a => a.IsOpen, true)); + } + Assert.Same(firstEditor, cut.FindComponent>().Instance); + model.Continue.TrySetResult(); + await submit; + Assert.Equal(0, saved); + var currentForm = cut.FindComponent().Instance; + await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(model))); + Assert.Equal(1, saved); + } + finally + { + model.Continue.TrySetResult(); + await submit; + } + } + + [Fact] + public async Task LoadingCleanupFailureAfterSave_BlocksRetryAndPreservesException() + { + var failure = new InvalidOperationException("Loading cleanup failed"); + var loading = Context.JSInterop.SetupVoid("execute", invocation => + invocation.Arguments.Count == 2 && invocation.Arguments[1] is false); + loading.SetException(failure); + var saved = 0; + var model = new Foo(); + var cut = Context.Render>(pb => + { + pb.Add(a => a.Model, model); + pb.Add(a => a.ShowLoading, true); + pb.Add(a => a.KeepOpenAfterSave, true); + pb.Add(a => a.OnSaveAsync, context => + { + saved++; + return Task.FromResult(true); + }); + }); + var form = cut.FindComponent().Instance; + var context = new EditContext(model); + Assert.Same(failure, await Assert.ThrowsAsync(() => + cut.InvokeAsync(() => form.OnValidSubmit!(context)))); + Assert.NotEmpty(cut.Find("[role='alert']").TextContent); + await cut.InvokeAsync(() => form.OnValidSubmit!(context)); + Assert.Equal(1, saved); + Assert.True(await cut.InvokeAsync(cut.Instance.CanCloseAsync)); + } + + [Fact] + public async Task DrawerAnimationFailure_StillRunsCleanup() + { + var failure = new InvalidOperationException("Hide failed"); + var closeJs = Context.JSInterop.Setup("execute", invocation => + invocation.Arguments.Count == 2 && invocation.Arguments[1] is false); + closeJs.SetException(failure); + var closed = 0; + var cut = Context.Render(); + var service = Context.Services.GetRequiredService(); + var option = new DrawerOption + { + OnCloseAsync = () => + { + closed++; + return Task.CompletedTask; + } + }; + await cut.InvokeAsync(() => service.Show(option)); + Assert.Same(failure, await Assert.ThrowsAsync(() => cut.InvokeAsync(option.CloseAsync))); + Assert.Equal(1, closed); + Assert.Empty(cut.FindComponents()); + } + + [Theory] + [InlineData(EditMode.Popup)] + [InlineData(EditMode.Drawer)] + public async Task DisposalWhileSaving_DoesNotInitializeAnotherModel(EditMode mode) + { + var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var created = 0; + var cut = Context.Render(); + ITableEditDialogOption option = mode == EditMode.Popup + ? new EditDialogOption() + : new TableEditDrawerOption(); + option.Model = new Foo(); + option.ShowConfirmCloseSwal = false; + option.KeepOpenAfterSave = true; + option.OnEditAsync = context => + { + started.TrySetResult(); + return saving.Task; + }; + option.CreateNextModelAsync = () => + { + created++; + return Task.FromResult(new Foo()); + }; + if (option is EditDialogOption dialogOption) + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(dialogOption)); + } + else if (option is TableEditDrawerOption drawerOption) + { + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDrawer(drawerOption, new DrawerOption())); + } + var form = cut.FindComponent().Instance; + var editor = cut.FindComponent>().Instance; + var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); + try + { + await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + await cut.InvokeAsync(() => ((IAsyncDisposable)editor).DisposeAsync().AsTask()); + saving.TrySetResult(true); + await submit; + Assert.Equal(0, created); + } + finally + { + saving.TrySetResult(false); + await submit; + } + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task ParameterChange_DoesNotAcceptPreviousSaveContinuation(bool initializing) + { + var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var creating = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var initial = new Foo(); + var external = new Foo(); + var created = 0; + var cut = Context.Render>(pb => + { + pb.Add(a => a.Model, initial); + pb.Add(a => a.KeepOpenAfterSave, true); + pb.Add(a => a.OnSaveAsync, context => + { + if (!initializing) started.TrySetResult(); + return initializing ? Task.FromResult(true) : saving.Task; + }); + pb.Add(a => a.CreateNextModelAsync, () => + { + created++; + started.TrySetResult(); + return creating.Task; + }); + }); + var form = cut.FindComponent().Instance; + var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(initial))); + try + { + await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + cut.Render(pb => pb.Add(a => a.Model, external)); + saving.TrySetResult(true); + creating.TrySetResult(new Foo()); + await submit; + Assert.Same(external, cut.FindComponent().Instance.Model); + Assert.Equal(initializing ? 1 : 0, created); + } + finally + { + saving.TrySetResult(false); + creating.TrySetResult(new Foo()); + await submit; + } + } + + [Fact] + public async Task ClosingEmptyModal_DoesNotBlockNextPresentation() + { + var cut = Context.Render(); + var modal = cut.FindComponent().Instance; + await cut.InvokeAsync(modal.Close); + var service = Context.Services.GetRequiredService(); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); + await cut.InvokeAsync(modal.CloseCallback); + await cut.InvokeAsync(modal.Close); + await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption + { + Model = new Foo(), ShowConfirmCloseSwal = false + })); + Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); + } +} diff --git a/test/UnitTest/Components/EditDialogTest.cs b/test/UnitTest/Components/EditDialogTest.cs index 1b25a7ac2aa..0821ccfcc27 100644 --- a/test/UnitTest/Components/EditDialogTest.cs +++ b/test/UnitTest/Components/EditDialogTest.cs @@ -3,10 +3,249 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone +using Microsoft.AspNetCore.Components.Forms; + namespace UnitTest.Components; public class EditDialogTest : BootstrapBlazorTestBase { + [Fact] + public async Task CreateNextModelAsync_RejectsObsoleteModel() + { + var initial = new Foo { Name = "initial" }; + var next = new Foo { Name = "next" }; + var savedModels = new List(); + var cut = Context.Render>(pb => + { + pb.Add(a => a.Model, initial); + pb.Add(a => a.KeepOpenAfterSave, true); + pb.Add(a => a.CreateNextModelAsync, () => Task.FromResult(next)); + pb.Add(a => a.OnSaveAsync, context => + { + savedModels.Add(context.Model); + return Task.FromResult(true); + }); + }); + var previousForm = cut.FindComponent().Instance; + var oldContext = new EditContext(initial); + await cut.InvokeAsync(() => previousForm.OnValidSubmit!(oldContext)); + Assert.Same(next, cut.FindComponent().Instance.Model); + + await cut.InvokeAsync(() => previousForm.OnValidSubmit!(oldContext)); + Assert.Single(savedModels); + + var currentForm = cut.FindComponent().Instance; + await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(next))); + Assert.Equal(new object[] { initial, next }, savedModels); + + var external = new Foo { Name = "external" }; + cut.Render(pb => pb.Add(a => a.Model, external)); + await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(next))); + Assert.Equal(2, savedModels.Count); + } + + [Fact] + public async Task SaveValueTypeModel_Ok() + { + var saved = false; + var cut = Context.Render>(pb => + { + pb.Add(a => a.Model, new ValueTypeModel(1)); + pb.Add(a => a.BodyTemplate, model => builder => builder.AddContent(0, model.Value)); + pb.Add(a => a.FooterTemplate, model => builder => builder.AddContent(0, model.Value)); + pb.Add(a => a.OnSaveAsync, context => + { + saved = true; + return Task.FromResult(false); + }); + }); + var form = cut.FindComponent().Instance; + await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); + Assert.True(saved); + } + + private readonly record struct ValueTypeModel(int Value); + + [Theory] + [InlineData(0)] + [InlineData(1)] + public async Task CreateNextModelAsync_ValueTypeModelPreservesOnRender(int initialValue) + { + var cut = Context.Render>(pb => + { + pb.Add(a => a.Model, new ValueTypeModel(initialValue)); + pb.Add(a => a.BodyTemplate, model => builder => builder.AddContent(0, $"body-{model.Value}")); + pb.Add(a => a.FooterTemplate, model => builder => builder.AddContent(0, $"footer-{model.Value}")); + pb.Add(a => a.KeepOpenAfterSave, true); + pb.Add(a => a.OnSaveAsync, context => Task.FromResult(true)); + pb.Add(a => a.CreateNextModelAsync, () => Task.FromResult(new ValueTypeModel(2))); + }); + var form = cut.FindComponent().Instance; + await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); + Assert.Equal(new ValueTypeModel(2), cut.FindComponent().Instance.Model); + + cut.Render(); + Assert.Equal(new ValueTypeModel(2), cut.FindComponent().Instance.Model); + cut.Contains("body-2"); + cut.Contains("footer-2"); + + cut.Render(pb => pb.Add(a => a.Model, new ValueTypeModel(3))); + Assert.Equal(new ValueTypeModel(3), cut.FindComponent().Instance.Model); + cut.Contains("body-3"); + cut.Contains("footer-3"); + } + + [Fact] + public async Task CreateNextModelAsync_ValueTypeFailurePersistsOnRender() + { + var saveCount = 0; + var cut = Context.Render>(pb => + { + pb.Add(a => a.Model, new ValueTypeModel(1)); + pb.Add(a => a.BodyTemplate, model => builder => builder.AddContent(0, model.Value)); + pb.Add(a => a.KeepOpenAfterSave, true); + pb.Add(a => a.OnSaveAsync, context => + { + saveCount++; + return Task.FromResult(true); + }); + pb.Add(a => a.CreateNextModelAsync, () => Task.FromException(new InvalidOperationException("Initialization failed"))); + }); + var form = cut.FindComponent().Instance; + await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); + cut.Render(); + Assert.NotEmpty(cut.Find("[role=alert]").TextContent); + Assert.True(cut.FindComponents + } + @if (ShowHeaderCloseButton) + { + } -
- @if (HeaderToolbarTemplate != null) - { - @HeaderToolbarTemplate - } - @if (ShowPrintButtonInHeader) - { - - } - @if (ShowExportPdfButtonInHeader) - { - - - - } - @if (ShowMaximizeButton) - { - - } - @if (ShowHeaderCloseButton) - { - - } -
- } - - - -
- @RenderBodyTemplate() +
+ } + + + +
+ @RenderBodyTemplate() +
+ @if (ShowFooter) + { +
+ @if (FooterContentTemplate != null) + { +
+ @FooterContentTemplate +
+ } + @if (ShowCloseButton) + { + + } + @if (ShowPrintButton) + { + + } + @if (ShowExportPdfButton) + { + + + + } + @if (ShowSaveButton) + { + + } + @if (FooterTemplate != null) + { + @FooterTemplate + }
- @if (ShowFooter) - { -
- @if (FooterContentTemplate != null) - { -
- @FooterContentTemplate -
- } - @if (ShowCloseButton) - { - - } - @if (ShowPrintButton) - { - - } - @if (ShowExportPdfButton) - { - - - - } - @if (ShowSaveButton) - { - - } - @if (FooterTemplate != null) - { - @FooterTemplate - } -
- } - @if (ShowResize) - { - - - - } - + } + @if (ShowResize) + { + + + + } - + - + diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs index ef7c5d1e2ea..e426c2c6d94 100644 --- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs +++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs @@ -356,12 +356,6 @@ public partial class ModalDialog private DialogResult _result = DialogResult.Close; private bool _firstRender = true; - internal DialogCloseContext CloseContext { get; } = new(); - - internal Func>? OnClosingCallback { get; set; } - - internal Func? OnCloseCallback { get; set; } - /// /// /// @@ -516,12 +510,11 @@ private RenderFragment RenderBodyTemplate() => builder => /// protected override async ValueTask DisposeAsync(bool disposing) { + await base.DisposeAsync(disposing); + if (disposing) { - CloseContext.Closed(); Modal.RemoveDialog(this); } - - await base.DisposeAsync(disposing); } } diff --git a/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs b/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs index e6018436237..023838a3ff6 100644 --- a/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs +++ b/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs @@ -115,18 +115,6 @@ public interface ITableEditDialogOption /// Func>? OnEditAsync { get; set; } - /// - /// 获得/设置 保存成功后是否保持编辑弹窗打开，默认为 false - /// Gets or sets whether to keep the edit dialog open after a successful save. Default is false - /// - bool KeepOpenAfterSave { get; set; } - - /// - /// 获得/设置 保存成功后获取下一个编辑模型的异步回调方法。初始化失败时显示错误并阻止重复保存当前模型 - /// Gets or sets the async callback that provides the next edit model after a successful save. Initialization failures are displayed and prevent saving the current model again - /// - Func>? CreateNextModelAsync { get; set; } - /// /// 获得/设置 关闭弹窗回调方法 /// Gets or sets close dialog callback method diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index b7d3aed9b9f..c19cd8ef620 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -38,21 +38,6 @@ public partial class Table [Parameter] public bool ShowAddButton { get; set; } = true; - /// - /// 获得/设置 新增保存成功后是否保持编辑弹窗或抽屉并继续新增 默认为 false，仅在 Popup 与 Drawer 模式下生效 - /// Gets or sets whether to keep the edit dialog or drawer open and continue adding after a successful add. Default is false. Applies to Popup and Drawer modes only - /// - /// - /// 数据实际保存后，后续回调或刷新失败时，显示错误并禁止重复保存当前记录；不会初始化下一条记录。关闭时仍将当前记录视为已保存。 - /// If callbacks or refresh fail after the data is actually saved, an error is displayed and resaving the current record is blocked without initializing another record. Closing still treats the current record as saved. - /// 若外部 OnSaveAsync 回调在实际提交后自身抛出异常，则无法推断提交结果，调用方应使用事务或幂等保存。 - /// If an external OnSaveAsync callback throws after committing, its commit result cannot be inferred; the caller should use transactions or idempotent saves. - /// 仅使用 Items 时，保存后回调仍先于数据源更新执行；更新前失败可重试，更新后失败则禁止重复保存。 - /// With Items alone, post-save callbacks still run before the source update. Failures before the update allow retry; failures after it block resaving. - /// - [Parameter] - public bool KeepAdding { get; set; } - /// /// 获得/设置 是否显示编辑按钮 默认为 true 行内是否显示请使用 与 /// Gets or sets Whether to show Edit Button. Default true. Use and for in-row display @@ -757,16 +742,8 @@ protected async Task CancelSave() /// /// /// - /// - /// 仅使用 Items 时，此方法不更新数据源；调用方在实际更新后记录保存状态。 - /// With Items alone, this method does not update the source; the caller records the saved state after the actual update. - /// - protected Task SaveModelAsync(EditContext context, ItemChangedType changedType) - => SaveModelAsync(context, changedType, null); - - private async Task SaveModelAsync(EditContext context, ItemChangedType changedType, Action? onSaved) + protected async Task SaveModelAsync(EditContext context, ItemChangedType changedType) { - var itemsOnly = Items != null && OnSaveAsync == null && DynamicContext == null; bool valid; if (DynamicContext != null) { @@ -779,12 +756,6 @@ private async Task SaveModelAsync(EditContext context, ItemChangedType cha valid = await InternalOnSaveAsync((TItem)context.Model, changedType); } - if (!itemsOnly || !valid) - { - EditDialogSaveState.SetSaved(context, valid); - onSaved?.Invoke(valid); - } - // 回调外部自定义方法 // Callback external custom method if (OnAfterSaveAsync != null) @@ -924,15 +895,14 @@ protected async Task SaveAsync(EditContext context, ItemChangedType changedType) [Parameter] public Dialog? EditDialog { get; set; } - private async Task AddItem(EditContext context, Action onSaved) + private async Task AddItem(EditContext context) { var index = InsertRowMode == InsertRowMode.First ? 0 : Rows.Count; Rows.Insert(index, (TItem)context.Model); - onSaved(); await UpdateRow(); } - private async Task EditItem(EditContext context, Action onSaved) + private async Task EditItem(EditContext context) { var entity = Rows.FirstOrDefault(i => this.Equals(i, (TItem)context.Model)); if (entity != null) @@ -940,7 +910,6 @@ private async Task EditItem(EditContext context, Action onSaved) var index = Rows.IndexOf(entity); Rows.RemoveAt(index); Rows.Insert(index, (TItem)context.Model); - onSaved(); await UpdateRow(); } } @@ -988,8 +957,10 @@ private void AppendOptions(ITableEditDialogOption option, ItemChangedType /// protected async Task ShowEditDialog(ItemChangedType changedType) { - // 用于判断是否未保存数据直接点击关闭取消数据保存操作 var saved = false; + + // 用于判断是否未保存数据直接点击关闭取消数据保存操作 + var triggerFromSave = false; var option = new EditDialogOption() { Class = "modal-dialog-table", @@ -1003,19 +974,21 @@ protected async Task ShowEditDialog(ItemChangedType changedType) ShowConfirmCloseSwal = ShowCloseConfirm, CloseConfirmTitle = CloseConfirmTitle, CloseConfirmContent = CloseConfirmContent, - KeepOpenAfterSave = changedType == ItemChangedType.Add && KeepAdding, - OnCloseAsync = () => CloseEditDialogAsync(saved), + OnCloseAsync = async () => + { + if (triggerFromSave == false && OnAfterCancelSaveAsync != null) + { + await OnAfterCancelSaveAsync(); + } + await OnCloseEditDialogCallbackAsync(saved); + }, OnEditAsync = async context => { - var result = await OnSaveEditCallbackAsync(context, changedType, result => saved = result); + saved = await OnSaveEditCallbackAsync(context, changedType); // 已保存数据 - return result; - }, - CreateNextModelAsync = async () => - { - saved = false; - return await CreateNextEditModelAsync(); + triggerFromSave = saved; + return saved; } }; AppendOptions(option, changedType); @@ -1034,13 +1007,18 @@ protected async Task ShowEditDrawer(ItemChangedType changedType) ShowConfirmCloseSwal = ShowCloseConfirm, CloseConfirmTitle = CloseConfirmTitle, CloseConfirmContent = CloseConfirmContent, - KeepOpenAfterSave = changedType == ItemChangedType.Add && KeepAdding, - OnCloseAsync = () => CloseEditDialogAsync(saved), - OnEditAsync = context => OnSaveEditCallbackAsync(context, changedType, result => saved = result), - CreateNextModelAsync = async () => + OnCloseAsync = async () => + { + if (OnAfterCancelSaveAsync != null) + { + await OnAfterCancelSaveAsync(); + } + await OnCloseEditDialogCallbackAsync(saved); + }, + OnEditAsync = async context => { - saved = false; - return await CreateNextEditModelAsync(); + saved = await OnSaveEditCallbackAsync(context, changedType); + return saved; } }; AppendOptions(editOption, changedType); @@ -1060,121 +1038,64 @@ protected async Task ShowEditDrawer(ItemChangedType changedType) await DrawerService.ShowEditDrawer(editOption, option); } - private async Task CreateNextEditModelAsync() - { - await InternalOnAddAsync(); - if (EditModel == null) - { - throw new InvalidOperationException($"{nameof(OnAddAsync)} must return a non-null model."); - } - await OnSelectedRowsChanged(); - return EditModel; - } - - private async Task CloseEditDialogAsync(bool saved) - { - try - { - if (!saved && OnAfterCancelSaveAsync != null) - { - await OnAfterCancelSaveAsync(); - } - } - finally - { - await OnCloseEditDialogCallbackAsync(saved); - } - } - private async Task OnCloseEditDialogCallbackAsync(bool saved) { - try + if (EditDialogCloseAsync != null) { - if (EditDialogCloseAsync != null) - { - await EditDialogCloseAsync(EditModel, saved); - } - } - finally - { - if (!saved) - { - await CancelEditModelAsync(); - } + await EditDialogCloseAsync(EditModel, saved); } - } - private async Task CancelEditModelAsync() - { - var dataService = DataService ?? InjectDataService; - if (dataService is IEntityFrameworkCoreDataService ef) + if (!saved) { - // EFCore - await ToggleLoading(true); - try + var dataService = DataService ?? InjectDataService; + if (dataService is IEntityFrameworkCoreDataService ef) { + // EFCore + await ToggleLoading(true); await ef.CancelAsync(); - } - finally - { await ToggleLoading(false); } } } - private async Task OnSaveEditCallbackAsync(EditContext context, ItemChangedType changedType, Action onSaved) + private async Task OnSaveEditCallbackAsync(EditContext context, ItemChangedType changedType) { bool saved; await ToggleLoading(true); - try + if (IsTracking) { - if (IsTracking) + saved = true; + if (changedType == ItemChangedType.Add) { - saved = true; - if (changedType == ItemChangedType.Add) - { - var index = InsertRowMode == InsertRowMode.First ? 0 : Rows.Count; - Rows.Insert(index, EditModel); - } - EditDialogSaveState.SetSaved(context, true); - onSaved(true); - await InvokeItemsChanged(); - await InvokeAsync(StateHasChanged); + var index = InsertRowMode == InsertRowMode.First ? 0 : Rows.Count; + Rows.Insert(index, EditModel); } - else + await InvokeItemsChanged(); + } + else + { + saved = await SaveModelAsync(context, changedType); + if (saved) { - void MarkSaved() - { - EditDialogSaveState.SetSaved(context, true); - onSaved(true); - } - saved = await SaveModelAsync(context, changedType, onSaved); - if (saved) + if (Items != null) { - if (Items != null) + if (changedType == ItemChangedType.Add) { - if (changedType == ItemChangedType.Add) - { - await AddItem(context, MarkSaved); - } - else if (changedType == ItemChangedType.Update) - { - await EditItem(context, MarkSaved); - } - await InvokeAsync(StateHasChanged); + await AddItem(context); } - else + else if (changedType == ItemChangedType.Update) { - await QueryAsync(); + await EditItem(context); } } + else + { + await QueryAsync(); + } } - return saved; - } - finally - { - await ToggleLoading(false); } + await ToggleLoading(false); + return saved; } /// diff --git a/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs b/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs index 47564170369..9eba8849cb3 100644 --- a/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs +++ b/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs @@ -113,16 +113,6 @@ public class TableEditDrawerOption : ITableEditDialogOption /// public Func>? OnEditAsync { get; set; } - /// - /// - /// - public bool KeepOpenAfterSave { get; set; } - - /// - /// - /// - public Func>? CreateNextModelAsync { get; set; } - /// /// /// diff --git a/src/BootstrapBlazor/Extensions/DrawerExtensions.cs b/src/BootstrapBlazor/Extensions/DrawerExtensions.cs index ddf66e11da0..11a0fab2037 100644 --- a/src/BootstrapBlazor/Extensions/DrawerExtensions.cs +++ b/src/BootstrapBlazor/Extensions/DrawerExtensions.cs @@ -24,40 +24,14 @@ public static class DrawerExtensions /// option instance /// /// - /// 配置类实例，编辑内容与关闭回调在当前展示的组件参数中组合，不改写原配置 - /// option instance. Edit content and close callbacks are composed in the current display's component parameters without modifying the original configuration + /// 配置类实例 + /// option instance /// public static async Task ShowEditDrawer(this DrawerService service, TableEditDrawerOption editDialogOption, DrawerOption option) { var parameters = editDialogOption.ToParameter(); - RenderFragment content = builder => - { - builder.OpenComponent>(0); - foreach (var parameter in parameters) - { - builder.AddAttribute(1, parameter.Key, parameter.Value); - } - builder.CloseComponent(); - }; - await service.Show(option, drawerParameters => - { - var containerCloseAsync = (Func)drawerParameters[nameof(Drawer.OnCloseAsync)]; - var editCloseAsync = editDialogOption.OnCloseAsync; - drawerParameters[nameof(Drawer.ChildContent)] = content; - drawerParameters[nameof(Drawer.OnCloseAsync)] = new Func(async () => - { - try - { - if (editCloseAsync != null) - { - await editCloseAsync(); - } - } - finally - { - await containerCloseAsync(); - } - }); - }); + parameters.Add(nameof(EditDialog.OnCloseAsync), editDialogOption.OnCloseAsync); + option.ChildContent = BootstrapDynamicComponent.CreateComponent>(parameters).Render(); + await service.Show(option); } } diff --git a/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs b/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs index 48c674670bf..e3d26237da4 100644 --- a/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs +++ b/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs @@ -42,8 +42,6 @@ public static class TableEditDialogOptionExtensions [nameof(EditDialog.LabelWidth)] = option.LabelWidth, [nameof(EditDialog.BodyTemplate)] = option.DialogBodyTemplate, [nameof(EditDialog.FooterTemplate)] = option.DialogFooterTemplate, - [nameof(EditDialog.KeepOpenAfterSave)] = option.KeepOpenAfterSave, - [nameof(EditDialog.CreateNextModelAsync)] = option.CreateNextModelAsync, [nameof(EditDialog.OnSaveAsync)] = new Func>(async context => { var ret = false; diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json index cb7ce0ec6c8..bba7c671b16 100644 --- a/src/BootstrapBlazor/Locales/en.json +++ b/src/BootstrapBlazor/Locales/en.json @@ -266,9 +266,7 @@ "CloseButtonText": "Close", "SaveButtonText": "Save", "CloseConfirmTitle": "Warning", - "CloseConfirmContent": "The form has been changed. Are you sure you continue to close it?", - "NextModelInitializationError": "The current item was saved, but initializing the next item failed. Close this window to cancel the unsaved item, then add a new item again.", - "SavePostProcessingError": "The current item was saved, but subsequent processing failed. Close and reopen this window; do not save the current item again." + "CloseConfirmContent": "The form has been changed. Are you sure you continue to close it?" }, "BootstrapBlazor.Components.TableColumnFilter": { "ClearButtonText": "Clear", diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json index e562d0f181a..8b70a11853e 100644 --- a/src/BootstrapBlazor/Locales/zh.json +++ b/src/BootstrapBlazor/Locales/zh.json @@ -266,9 +266,7 @@ "CloseButtonText": "关闭", "SaveButtonText": "保存", "CloseConfirmTitle": "请注意", - "CloseConfirmContent": "表单内容已更改，确定要继续关闭吗？", - "NextModelInitializationError": "当前数据已保存，但下一条数据初始化失败。请关闭窗口以取消未保存的数据，再重新新增。", - "SavePostProcessingError": "本次数据已保存，但后续处理失败。请关闭窗口后重新打开，不要重复保存这条数据。" + "CloseConfirmContent": "表单内容已更改，确定要继续关闭吗？" }, "BootstrapBlazor.Components.TableColumnFilter": { "ClearButtonText": "重置", diff --git a/test/UnitTest/Components/EditDialogLifecycleTest.cs b/test/UnitTest/Components/EditDialogLifecycleTest.cs deleted file mode 100644 index a9fec165ab2..00000000000 --- a/test/UnitTest/Components/EditDialogLifecycleTest.cs +++ /dev/null @@ -1,1194 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the Apache 2.0 License -// See the LICENSE file in the project root for more information. -// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone - -using Microsoft.AspNetCore.Components.Forms; -using TestContext = Xunit.TestContext; - -namespace UnitTest.Components; - -public class EditDialogLifecycleTest : BootstrapBlazorTestBase -{ - [Theory] - [InlineData(false)] - [InlineData(true)] - public async Task BoundDrawerClose_RejectsOldValidation(bool reopen) - { - var model = new TableDialogTest.DelayedValidationModel(); - var saved = 0; - var closed = 0; - var changed = 0; - var cut = Context.Render(pb => - { - pb.Add(a => a.IsOpen, true); - pb.Add(a => a.OnCloseAsync, () => - { - closed++; - return Task.CompletedTask; - }); - pb.Add(a => a.IsOpenChanged, value => changed++); - pb.AddChildContent>(editor => - { - editor.Add(a => a.Model, model); - editor.Add(a => a.ShowCloseConfirm, false); - editor.Add(a => a.KeepOpenAfterSave, true); - editor.Add(a => a.BodyTemplate, item => builder => builder.AddContent(0, item.Name)); - editor.Add(a => a.OnSaveAsync, context => - { - saved++; - return Task.FromResult(false); - }); - }); - }); - var form = cut.FindComponent().Instance; - var submit = cut.InvokeAsync(() => form.OnSubmit.InvokeAsync(form.EditContext!)); - try - { - await model.Started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - cut.Render(pb => pb.Add(a => a.IsOpen, false)); - if (reopen) - { - cut.Render(pb => pb.Add(a => a.IsOpen, true)); - } - model.Continue.TrySetResult(); - await submit; - Assert.Equal(0, saved); - Assert.Equal(0, closed); - Assert.Equal(0, changed); - if (reopen) - { - var currentForm = cut.FindComponent().Instance; - await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(model))); - Assert.Equal(1, saved); - } - } - finally - { - model.Continue.TrySetResult(); - await submit; - } - } - - [Fact] - public async Task PopupHideFailure_AllowsRetryInsteadOfPermanentClosing() - { - var failure = new InvalidOperationException("Hide failed"); - var hide = Context.JSInterop.SetupVoid("execute", invocation => - invocation.Arguments.Count == 2 && invocation.Arguments[1] is string method && method == "hide"); - hide.SetException(failure); - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - var modal = cut.FindComponent().Instance; - Assert.Same(failure, await Assert.ThrowsAsync(() => cut.InvokeAsync(modal.Close))); - Assert.Single(cut.FindComponents>()); - hide.SetVoidResult(); - await cut.InvokeAsync(modal.Close); - await cut.InvokeAsync(modal.CloseCallback); - Assert.Empty(cut.FindComponents>()); - } - - [Fact] - public async Task BoundDrawerReopen_DoesNotAcceptPreviousCloseCheck() - { - var first = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var second = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var checks = 0; - var closed = 0; - var cut = Context.Render(pb => - { - pb.Add(a => a.IsOpen, true); - pb.Add(a => a.OnClosingAsync, () => ++checks == 1 ? first.Task : second.Task); - pb.Add(a => a.OnCloseAsync, () => - { - closed++; - return Task.CompletedTask; - }); - }); - var oldClose = cut.InvokeAsync(cut.Instance.Close); - cut.WaitForAssertion(() => Assert.Equal(1, checks)); - cut.Render(pb => pb.Add(a => a.IsOpen, false)); - cut.Render(pb => pb.Add(a => a.IsOpen, true)); - var currentClose = cut.InvokeAsync(cut.Instance.Close); - try - { - cut.WaitForAssertion(() => Assert.Equal(2, checks)); - first.TrySetResult(true); - await oldClose; - Assert.True(cut.Instance.IsOpen); - Assert.Equal(0, closed); - await cut.InvokeAsync(cut.Instance.Close); - Assert.Equal(2, checks); - second.TrySetResult(true); - await currentClose; - Assert.False(cut.Instance.IsOpen); - Assert.Equal(1, closed); - } - finally - { - first.TrySetResult(false); - second.TrySetResult(false); - await Task.WhenAll(oldClose, currentClose); - } - } - - [Fact] - public async Task PopupLateHideFailure_DoesNotRecoverNewClosingTarget() - { - var hide = Context.JSInterop.SetupVoid("execute", invocation => - invocation.Arguments.Count == 2 && invocation.Arguments[1] is string method && method == "hide"); - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - var modal = cut.FindComponent().Instance; - var closing = cut.InvokeAsync(modal.Close); - try - { - cut.WaitForAssertion(() => Assert.Single(hide.Invocations)); - var next = new Foo(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = next, ShowConfirmCloseSwal = false - })); - await cut.InvokeAsync(modal.CloseCallback); - Assert.Same(next, cut.FindComponent>().Instance.Model); - Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("next"))); - hide.SetException(new InvalidOperationException("Late hide failure")); - await Assert.ThrowsAsync(() => closing); - Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); - await cut.InvokeAsync(modal.CloseCallback); - Assert.Empty(cut.FindComponents>()); - } - finally - { - hide.SetVoidResult(); - } - } - - [Fact] - public async Task BrowserHideFailure_OnlyRecoversMatchingUnclosedRequest() - { - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - var modal = cut.FindComponent().Instance; - Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("first"))); - await cut.InvokeAsync(() => modal.CloseFailedCallback("unrelated")); - Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); - await cut.InvokeAsync(() => modal.CloseFailedCallback("first")); - Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("retry"))); - await cut.InvokeAsync(modal.CloseCallback); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("next"))); - await cut.InvokeAsync(() => modal.CloseFailedCallback("retry")); - Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); - await cut.InvokeAsync(modal.CloseCallback); - Assert.Empty(cut.FindComponents>()); - } - - [Fact] - public async Task PopupLateHideFailure_DoesNotRecoverRetryInSamePresentation() - { - var hide = Context.JSInterop.SetupVoid("execute", invocation => - invocation.Arguments.Count == 2 && invocation.Arguments[1] is string method && method == "hide"); - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - var modal = cut.FindComponent().Instance; - var closing = cut.InvokeAsync(modal.Close); - try - { - cut.WaitForAssertion(() => Assert.Single(hide.Invocations)); - var field = typeof(Modal).GetField("_closingWindow", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); - var window = Assert.IsAssignableFrom(field!.GetValue(modal)); - var request = Assert.IsType(window[3]); - await cut.InvokeAsync(() => modal.CloseFailedCallback(request)); - Assert.True(await cut.InvokeAsync(() => modal.BeforeCloseWithRequestCallback("retry"))); - hide.SetException(new InvalidOperationException("Late hide failure")); - await Assert.ThrowsAsync(() => closing); - Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); - await cut.InvokeAsync(modal.CloseCallback); - } - finally - { - hide.SetVoidResult(); - } - } - - [Theory] - [InlineData(EditMode.Popup, false)] - [InlineData(EditMode.Drawer, false)] - [InlineData(EditMode.Popup, true)] - [InlineData(EditMode.Drawer, true)] - public async Task ItemsAfterSaveFailure_MarksOnlyExternalPersistence(EditMode mode, bool externalSave) - { - var fail = true; - var saved = 0; - var closedSaved = false; - var model = new Foo { Name = "record" }; - var cut = Context.Render(pb => - { - pb.AddChildContent>(table => - { - table.Add(a => a.Items, new List()); - table.Add(a => a.IsTracking, false); - table.Add(a => a.EditMode, mode); - table.Add(a => a.ShowCloseConfirm, false); - table.Add(a => a.KeepAdding, true); - table.Add(a => a.OnAddAsync, () => Task.FromResult(model)); - if (externalSave) - { - table.Add(a => a.OnSaveAsync, (item, type) => - { - saved++; - return Task.FromResult(true); - }); - } - table.Add(a => a.OnAfterSaveAsync, item => - fail ? Task.FromException(new InvalidOperationException("After-save failed")) : Task.CompletedTask); - table.Add(a => a.EditDialogCloseAsync, (item, wasSaved) => - { - closedSaved = wasSaved; - return Task.CompletedTask; - }); - }); - }); - var table = cut.FindComponent>().Instance; - await cut.InvokeAsync(table.AddAsync); - var editor = cut.FindComponent>(); - var form = editor.FindComponent().Instance; - await Assert.ThrowsAsync(() => - cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model)))); - Assert.Empty(table.Items!); - Assert.Equal(externalSave, editor.Find("button[type='submit']").HasAttribute("disabled")); - fail = false; - await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); - if (externalSave) - { - Assert.Equal(1, saved); - Assert.Empty(table.Items!); - } - else - { - Assert.Single(table.Items!); - } - if (mode == EditMode.Drawer) - { - await cut.InvokeAsync(cut.FindComponent().Instance.Close); - } - else - { - await cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback); - } - Assert.Equal(externalSave, closedSaved); - } - - [Theory] - [InlineData(EditMode.Popup)] - [InlineData(EditMode.Drawer)] - public async Task ItemsChangedFailureAfterMutation_BlocksRetry(EditMode mode) - { - var changed = 0; - var model = new Foo(); - var cut = Context.Render(pb => pb.AddChildContent>(table => - { - table.Add(a => a.Items, new List()); - table.Add(a => a.IsTracking, false); - table.Add(a => a.EditMode, mode); - table.Add(a => a.ShowCloseConfirm, false); - table.Add(a => a.KeepAdding, true); - table.Add(a => a.OnAddAsync, () => Task.FromResult(model)); - table.Add(a => a.ItemsChanged, items => - { - changed++; - throw new InvalidOperationException("Items changed failed"); - }); - })); - var table = cut.FindComponent>().Instance; - await cut.InvokeAsync(table.AddAsync); - var editor = cut.FindComponent>(); - var form = editor.FindComponent().Instance; - await Assert.ThrowsAsync(() => - cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model)))); - Assert.Single(table.Rows); - Assert.True(editor.Find("button[type='submit']").HasAttribute("disabled")); - await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); - Assert.Equal(1, changed); - Assert.Single(table.Rows); - } - - [Theory] - [InlineData(EditMode.Popup)] - [InlineData(EditMode.Drawer)] - public async Task ItemsUpdateHookFailure_AllowsRetryBeforeReplacingRow(EditMode mode) - { - var fail = true; - var original = new Foo { Name = "original" }; - var cut = Context.Render(pb => pb.AddChildContent>(table => - { - table.Add(a => a.Items, new[] { original }); - table.Add(a => a.IsTracking, false); - table.Add(a => a.EditMode, mode); - table.Add(a => a.ShowCloseConfirm, false); - table.Add(a => a.ModelEqualityComparer, (first, second) => first.Id == second.Id); - table.Add(a => a.OnAfterSaveAsync, item => - fail ? Task.FromException(new InvalidOperationException("Update hook failed")) : Task.CompletedTask); - })); - var table = cut.FindComponent>().Instance; - table.SelectedRows.Add(original); - await cut.InvokeAsync(table.EditAsync); - var editor = cut.FindComponent>(); - var form = editor.FindComponent().Instance; - var edited = (Foo)form.Model!; - edited.Name = "updated"; - await Assert.ThrowsAsync(() => - cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(edited)))); - Assert.Same(original, Assert.Single(table.Items!)); - Assert.Equal("original", original.Name); - Assert.False(editor.Find("button[type='submit']").HasAttribute("disabled")); - fail = false; - await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(edited))); - Assert.Same(edited, Assert.Single(table.Items!)); - Assert.Equal("updated", table.Items!.Single().Name); - } - - [Theory] - [InlineData(EditMode.Popup)] - [InlineData(EditMode.Drawer)] - public async Task ClosingRerender_PreservesSubmissionBlock(EditMode mode) - { - var closeJs = mode == EditMode.Drawer - ? Context.JSInterop.Setup("execute", invocation => - invocation.Arguments.Count == 2 && invocation.Arguments[1] is false) - : null; - var model = new TableDialogTest.DelayedValidationModel(); - var saved = 0; - var created = 0; - ITableEditDialogOption option = mode == EditMode.Drawer - ? new TableEditDrawerOption() - : new EditDialogOption(); - option.Model = model; - option.ShowConfirmCloseSwal = false; - option.KeepOpenAfterSave = true; - option.DialogBodyTemplate = item => builder => builder.AddContent(0, item.Name); - option.OnEditAsync = context => - { - saved++; - return Task.FromResult(true); - }; - option.CreateNextModelAsync = () => - { - created++; - return Task.FromResult(new TableDialogTest.DelayedValidationModel()); - }; - var cut = Context.Render(); - if (option is TableEditDrawerOption drawerOption) - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDrawer(drawerOption, new DrawerOption())); - } - else if (option is EditDialogOption dialogOption) - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(dialogOption)); - } - var form = cut.FindComponent().Instance; - var submit = cut.InvokeAsync(() => form.OnSubmit.InvokeAsync(form.EditContext!)); - var closing = Task.CompletedTask; - try - { - await model.Started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - if (mode == EditMode.Drawer) - { - var drawer = cut.FindComponent().Instance; - closing = cut.InvokeAsync(drawer.Close); - cut.WaitForAssertion(() => Assert.False(drawer.IsOpen)); - Assert.False(closing.IsCompleted); - cut.FindComponent().Render(); - Assert.False(drawer.IsOpen); - } - else - { - await cut.InvokeAsync(cut.FindComponent().Instance.Close); - cut.FindComponent().Render(); - } - model.Continue.TrySetResult(); - await submit; - } - finally - { - model.Continue.TrySetResult(); - closeJs?.SetResult(false); - } - await closing; - if (mode == EditMode.Popup) - { - await cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback); - } - Assert.Equal(new[] { 0, 0 }, new[] { saved, created }); - } - - [Fact] - public async Task PopupRerender_PreservesRegisteredBusyGuard() - { - var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var model = new Foo(); - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = model, - ShowConfirmCloseSwal = false, - OnEditAsync = context => - { - started.TrySetResult(); - return saving.Task; - } - })); - var editor = cut.FindComponent>(); - var form = editor.FindComponent().Instance; - var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); - try - { - await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - cut.FindComponent().Render(); - Assert.False(await cut.InvokeAsync(cut.FindComponent().Instance.BeforeCloseCallback)); - } - finally - { - saving.TrySetResult(false); - await submit; - } - } - - [Fact] - public async Task PopupOptionGuard_CanDenyCloseAlongsideEditorGuard() - { - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false, - OnClosingAsync = () => Task.FromResult(false) - })); - Assert.False(await cut.InvokeAsync(cut.FindComponent().Instance.BeforeCloseCallback)); - } - - [Fact] - public async Task ModalGuards_AwaitAllAndHonorAnyVeto() - { - var gate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var lastGuardCalls = 0; - var cut = Context.Render(); - cut.Instance.RegisterOnClosingCallback(async () => - { - started.TrySetResult(); - return await gate.Task; - }); - cut.Instance.RegisterOnClosingCallback(() => - { - lastGuardCalls++; - return Task.FromResult(true); - }); - var checking = cut.InvokeAsync(cut.Instance.BeforeCloseCallback); - await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - Assert.False(checking.IsCompleted); - Assert.False(await cut.InvokeAsync(cut.Instance.BeforeCloseCallback)); - gate.TrySetResult(false); - Assert.False(await checking); - Assert.Equal(1, lastGuardCalls); - } - - [Fact] - public async Task MultiPopup_ReturningToParentPreservesBusyGuard() - { - var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var model = new Foo(); - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = model, - ShowConfirmCloseSwal = false, - OnEditAsync = context => - { - started.TrySetResult(); - return saving.Task; - } - })); - var parentEditor = cut.FindComponent>(); - var form = parentEditor.FindComponent().Instance; - var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); - try - { - await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false - })); - var modal = cut.FindComponent().Instance; - Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); - await cut.InvokeAsync(modal.CloseCallback); - Assert.Single(cut.FindComponents>()); - Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); - } - finally - { - saving.TrySetResult(false); - await submit; - } - } - - [Theory] - [InlineData(EditMode.Popup)] - [InlineData(EditMode.Drawer)] - public async Task CloseException_StillRemovesCurrentEditor(EditMode mode) - { - var cut = Context.Render(); - var failure = new InvalidOperationException("Close cleanup failed"); - if (mode == EditMode.Popup) - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false, - OnCloseAsync = () => Task.FromException(failure) - })); - Assert.Same(failure, await Assert.ThrowsAsync(() => - cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback))); - } - else - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDrawer(new TableEditDrawerOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false, - OnCloseAsync = () => Task.FromException(failure) - }, new DrawerOption())); - Assert.Same(failure, await Assert.ThrowsAsync(() => - cut.InvokeAsync(cut.FindComponent().Instance.Close))); - } - Assert.Empty(cut.FindComponents>()); - } - - [Fact] - public async Task ConcurrentDrawerClose_RunsCleanupOnlyOnce() - { - var closeJs = Context.JSInterop.Setup("execute", invocation => - invocation.Arguments.Count == 2 && invocation.Arguments[1] is false); - var editedClosed = 0; - var userClosed = 0; - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - var option = new DrawerOption - { - OnCloseAsync = () => - { - userClosed++; - return Task.CompletedTask; - } - }; - await cut.InvokeAsync(() => service.ShowEditDrawer(new TableEditDrawerOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false, - OnCloseAsync = () => - { - editedClosed++; - return Task.CompletedTask; - } - }, option)); - var firstClose = cut.InvokeAsync(option.CloseAsync); - cut.WaitForAssertion(() => Assert.False(cut.FindComponent().Instance.IsOpen)); - var secondClose = cut.InvokeAsync(option.CloseAsync); - closeJs.SetResult(false); - await Task.WhenAll(firstClose, secondClose); - Assert.Equal(new[] { 1, 1 }, new[] { editedClosed, userClosed }); - } - - [Theory] - [InlineData(false)] - [InlineData(true)] - public async Task DrawerCloseCallback_DoesNotRemoveNewlyOpenedDrawer(bool reuseOption) - { - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - var original = new DrawerOption(); - var next = reuseOption ? original : new DrawerOption(); - original.OnCloseAsync = () => - { - next.Width = "700px"; - return service.Show(next); - }; - await cut.InvokeAsync(() => service.Show(original)); - var firstDrawer = cut.FindComponent().Instance; - await cut.InvokeAsync(original.CloseAsync); - Assert.Single(cut.FindComponents()); - Assert.Equal("700px", cut.FindComponent().Instance.Width); - Assert.NotSame(firstDrawer, cut.FindComponent().Instance); - Assert.False(firstDrawer.IsOpen); - } - - [Theory] - [InlineData(EditMode.Popup, false)] - [InlineData(EditMode.Drawer, false)] - [InlineData(EditMode.Popup, true)] - [InlineData(EditMode.Drawer, true)] - public async Task PostSaveFailure_BlocksRetryAndPreservesSavedClose(EditMode mode, bool failHook) - { - var saved = 0; - var created = 0; - var canceled = 0; - var closedSaved = false; - var failure = new InvalidOperationException("Post-save processing failed"); - var cut = Context.Render(pb => - { - pb.AddChildContent>(pb => - { - pb.Add(a => a.RenderMode, TableRenderMode.Table); - pb.Add(a => a.EditMode, mode); - pb.Add(a => a.KeepAdding, true); - pb.Add(a => a.ShowCloseConfirm, false); - pb.Add(a => a.OnAddAsync, () => - { - created++; - return Task.FromResult(new Foo()); - }); - pb.Add(a => a.OnSaveAsync, (item, changedType) => - { - saved++; - return Task.FromResult(true); - }); - pb.Add(a => a.OnAfterSaveAsync, item => failHook ? Task.FromException(failure) : Task.CompletedTask); - pb.Add(a => a.OnQueryAsync, options => !failHook && saved > 0 - ? Task.FromException>(failure) - : Task.FromResult(new QueryData { Items = [], TotalCount = 0 })); - pb.Add(a => a.OnAfterCancelSaveAsync, () => - { - canceled++; - return Task.CompletedTask; - }); - pb.Add(a => a.EditDialogCloseAsync, (item, wasSaved) => - { - closedSaved = wasSaved; - return Task.CompletedTask; - }); - }); - }); - await cut.InvokeAsync(() => cut.FindComponent>().Instance.AddAsync()); - var editor = cut.FindComponent>(); - var form = editor.FindComponent().Instance; - var context = new EditContext(form.Model!); - Assert.Same(failure, await Assert.ThrowsAsync(() => - cut.InvokeAsync(() => form.OnValidSubmit!(context)))); - Assert.NotEmpty(editor.Find("[role='alert']").TextContent); - Assert.True(editor.Find("button[type='submit']").HasAttribute("disabled")); - await cut.InvokeAsync(() => form.OnValidSubmit!(context)); - Assert.Equal(1, saved); - Assert.Equal(1, created); - if (mode == EditMode.Drawer) - { - await cut.InvokeAsync(cut.FindComponent().Instance.Close); - } - else - { - await cut.InvokeAsync(cut.FindComponent().Instance.CloseCallback); - } - Assert.True(closedSaved); - Assert.Equal(0, canceled); - } - - [Theory] - [InlineData(EditMode.Popup)] - [InlineData(EditMode.Drawer)] - public async Task ClosingCheck_RechecksBusyStateAfterAwait(EditMode mode) - { - var checking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var startedChecking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var startedSaving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var model = new Foo(); - Func> check = () => - { - startedChecking.TrySetResult(); - return checking.Task; - }; - Func> save = context => - { - startedSaving.TrySetResult(); - return saving.Task; - }; - var cut = Context.Render(); - if (mode == EditMode.Popup) - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = model, ShowConfirmCloseSwal = false, OnEditAsync = save, OnClosingAsync = check - })); - } - else - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDrawer(new TableEditDrawerOption - { - Model = model, ShowConfirmCloseSwal = false, OnEditAsync = save - }, new DrawerOption { OnClosingAsync = check })); - } - var closing = mode == EditMode.Popup - ? cut.InvokeAsync(cut.FindComponent().Instance.Close) - : cut.InvokeAsync(cut.FindComponent().Instance.Close); - await startedChecking.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - var form = cut.FindComponent().Instance; - var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(model))); - try - { - await startedSaving.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - checking.TrySetResult(true); - await closing; - Assert.Single(cut.FindComponents>()); - if (mode == EditMode.Drawer) - { - Assert.True(cut.FindComponent().Instance.IsOpen); - } - else - { - Assert.False(await cut.InvokeAsync(cut.FindComponent().Instance.BeforeCloseCallback)); - } - } - finally - { - checking.TrySetResult(false); - saving.TrySetResult(false); - await submit; - } - } - - [Theory] - [InlineData(false)] - [InlineData(true)] - public async Task PopupCloseCallback_PreservesNewPresentationAndParentGuard(bool failClose) - { - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - var next = new Foo { Name = "next" }; - var failure = new InvalidOperationException("Close failed"); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false, - OnClosingAsync = () => Task.FromResult(false) - })); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false, - OnCloseAsync = async () => - { - await service.ShowEditDialog(new EditDialogOption - { - Model = next, - ShowConfirmCloseSwal = false, - OnClosingAsync = () => Task.FromResult(false) - }); - if (failClose) - { - throw failure; - } - } - })); - var modal = cut.FindComponent().Instance; - Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); - if (failClose) - { - Assert.Same(failure, await Assert.ThrowsAsync(() => cut.InvokeAsync(modal.CloseCallback))); - } - else - { - await cut.InvokeAsync(modal.CloseCallback); - } - Assert.Equal(2, cut.FindComponents>().Count); - Assert.Contains(cut.FindComponents>(), editor => ReferenceEquals(editor.Instance.Model, next)); - Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); - await cut.InvokeAsync(modal.CloseCallback); - Assert.Single(cut.FindComponents>()); - Assert.False(await cut.InvokeAsync(modal.BeforeCloseCallback)); - } - - [Fact] - public async Task PopupPendingCheck_DoesNotBlockOrCloseChildPresentation() - { - var checking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), - ShowConfirmCloseSwal = false, - OnClosingAsync = () => - { - started.TrySetResult(); - return checking.Task; - } - })); - var modal = cut.FindComponent().Instance; - var parentChecking = cut.InvokeAsync(modal.BeforeCloseCallback); - try - { - await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); - checking.TrySetResult(true); - Assert.False(await parentChecking); - await cut.InvokeAsync(modal.CloseCallback); - Assert.Single(cut.FindComponents>()); - } - finally - { - checking.TrySetResult(false); - await parentChecking; - } - } - - [Theory] - [InlineData(false)] - [InlineData(true)] - public async Task DrawerPendingCheck_CannotCloseReplacement(bool reuseOption) - { - var checking = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closed = 0; - var original = new DrawerOption - { - OnClosingAsync = () => - { - started.TrySetResult(); - return checking.Task; - }, - OnCloseAsync = () => - { - closed++; - return Task.CompletedTask; - } - }; - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.Show(original)); - var first = cut.FindComponent().Instance; - var closing = cut.InvokeAsync(first.Close); - try - { - await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - var next = reuseOption ? original : new DrawerOption(); - next.OnClosingAsync = () => Task.FromResult(true); - await cut.InvokeAsync(() => service.Show(next)); - checking.TrySetResult(true); - await closing; - Assert.Equal(0, closed); - var replacement = cut.FindComponent().Instance; - Assert.NotSame(first, replacement); - Assert.True(replacement.IsOpen); - await cut.InvokeAsync(next.CloseAsync); - Assert.Empty(cut.FindComponents()); - } - finally - { - checking.TrySetResult(false); - await closing; - } - } - - [Fact] - public async Task OrdinaryDrawer_UpdateOpenOptionPreservesComponent() - { - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - var option = new DrawerOption { Width = "400px" }; - await cut.InvokeAsync(() => service.Show(option)); - var drawer = cut.FindComponent().Instance; - option.Width = "700px"; - await cut.InvokeAsync(() => service.Show(option)); - Assert.Same(drawer, cut.FindComponent().Instance); - Assert.Equal("700px", drawer.Width); - await cut.InvokeAsync(option.CloseAsync); - Assert.Empty(cut.FindComponents()); - } - - [Theory] - [InlineData(EditMode.Popup)] - [InlineData(EditMode.Drawer)] - public async Task ReopeningStaticHost_RejectsPreviousPresentationValidation(EditMode mode) - { - var model = new TableDialogTest.DelayedValidationModel(); - var saved = 0; - Modal? modal = null; - Drawer? drawer = null; - RenderFragment editor = builder => - { - builder.OpenComponent>(0); - builder.AddAttribute(1, nameof(EditDialog.Model), model); - builder.AddAttribute(2, nameof(EditDialog.ShowCloseConfirm), false); - builder.AddAttribute(3, nameof(EditDialog.OnSaveAsync), new Func>(context => - { - saved++; - return Task.FromResult(false); - })); - builder.CloseComponent(); - }; - var cut = Context.Render(pb => pb.AddChildContent(builder => - { - if (mode == EditMode.Popup) - { - builder.OpenComponent(0); - builder.AddAttribute(1, nameof(Modal.ChildContent), new RenderFragment(builder => - { - builder.OpenComponent(0); - builder.AddAttribute(1, nameof(ModalDialog.BodyTemplate), editor); - builder.CloseComponent(); - })); - builder.AddComponentReferenceCapture(2, component => modal = (Modal)component); - } - else - { - builder.OpenComponent(0); - builder.AddAttribute(1, nameof(Drawer.IsOpen), true); - builder.AddAttribute(2, nameof(Drawer.ChildContent), editor); - builder.AddComponentReferenceCapture(3, component => drawer = (Drawer)component); - } - builder.CloseComponent(); - })); - var firstEditor = cut.FindComponent>().Instance; - var firstForm = cut.FindComponent().Instance; - var submit = cut.InvokeAsync(() => firstForm.OnSubmit.InvokeAsync(firstForm.EditContext!)); - try - { - await model.Started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - if (mode == EditMode.Popup) - { - await cut.InvokeAsync(modal!.Close); - await cut.InvokeAsync(modal.CloseCallback); - await cut.InvokeAsync(modal.Show); - } - else - { - await cut.InvokeAsync(drawer!.Close); - cut.FindComponents().Single(component => ReferenceEquals(component.Instance, drawer)) - .Render(pb => pb.Add(a => a.IsOpen, true)); - } - Assert.Same(firstEditor, cut.FindComponent>().Instance); - model.Continue.TrySetResult(); - await submit; - Assert.Equal(0, saved); - var currentForm = cut.FindComponent().Instance; - await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(model))); - Assert.Equal(1, saved); - } - finally - { - model.Continue.TrySetResult(); - await submit; - } - } - - [Fact] - public async Task LoadingCleanupFailureAfterSave_BlocksRetryAndPreservesException() - { - var failure = new InvalidOperationException("Loading cleanup failed"); - var loading = Context.JSInterop.SetupVoid("execute", invocation => - invocation.Arguments.Count == 2 && invocation.Arguments[1] is false); - loading.SetException(failure); - var saved = 0; - var model = new Foo(); - var cut = Context.Render>(pb => - { - pb.Add(a => a.Model, model); - pb.Add(a => a.ShowLoading, true); - pb.Add(a => a.KeepOpenAfterSave, true); - pb.Add(a => a.OnSaveAsync, context => - { - saved++; - return Task.FromResult(true); - }); - }); - var form = cut.FindComponent().Instance; - var context = new EditContext(model); - Assert.Same(failure, await Assert.ThrowsAsync(() => - cut.InvokeAsync(() => form.OnValidSubmit!(context)))); - Assert.NotEmpty(cut.Find("[role='alert']").TextContent); - await cut.InvokeAsync(() => form.OnValidSubmit!(context)); - Assert.Equal(1, saved); - Assert.True(await cut.InvokeAsync(cut.Instance.CanCloseAsync)); - } - - [Fact] - public async Task DrawerAnimationFailure_StillRunsCleanup() - { - var failure = new InvalidOperationException("Hide failed"); - var closeJs = Context.JSInterop.Setup("execute", invocation => - invocation.Arguments.Count == 2 && invocation.Arguments[1] is false); - closeJs.SetException(failure); - var closed = 0; - var cut = Context.Render(); - var service = Context.Services.GetRequiredService(); - var option = new DrawerOption - { - OnCloseAsync = () => - { - closed++; - return Task.CompletedTask; - } - }; - await cut.InvokeAsync(() => service.Show(option)); - Assert.Same(failure, await Assert.ThrowsAsync(() => cut.InvokeAsync(option.CloseAsync))); - Assert.Equal(1, closed); - Assert.Empty(cut.FindComponents()); - } - - [Theory] - [InlineData(EditMode.Popup)] - [InlineData(EditMode.Drawer)] - public async Task DisposalWhileSaving_DoesNotInitializeAnotherModel(EditMode mode) - { - var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var created = 0; - var cut = Context.Render(); - ITableEditDialogOption option = mode == EditMode.Popup - ? new EditDialogOption() - : new TableEditDrawerOption(); - option.Model = new Foo(); - option.ShowConfirmCloseSwal = false; - option.KeepOpenAfterSave = true; - option.OnEditAsync = context => - { - started.TrySetResult(); - return saving.Task; - }; - option.CreateNextModelAsync = () => - { - created++; - return Task.FromResult(new Foo()); - }; - if (option is EditDialogOption dialogOption) - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(dialogOption)); - } - else if (option is TableEditDrawerOption drawerOption) - { - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDrawer(drawerOption, new DrawerOption())); - } - var form = cut.FindComponent().Instance; - var editor = cut.FindComponent>().Instance; - var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); - try - { - await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - await cut.InvokeAsync(() => ((IAsyncDisposable)editor).DisposeAsync().AsTask()); - saving.TrySetResult(true); - await submit; - Assert.Equal(0, created); - } - finally - { - saving.TrySetResult(false); - await submit; - } - } - - [Theory] - [InlineData(false)] - [InlineData(true)] - public async Task ParameterChange_DoesNotAcceptPreviousSaveContinuation(bool initializing) - { - var saving = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var creating = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var initial = new Foo(); - var external = new Foo(); - var created = 0; - var cut = Context.Render>(pb => - { - pb.Add(a => a.Model, initial); - pb.Add(a => a.KeepOpenAfterSave, true); - pb.Add(a => a.OnSaveAsync, context => - { - if (!initializing) started.TrySetResult(); - return initializing ? Task.FromResult(true) : saving.Task; - }); - pb.Add(a => a.CreateNextModelAsync, () => - { - created++; - started.TrySetResult(); - return creating.Task; - }); - }); - var form = cut.FindComponent().Instance; - var submit = cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(initial))); - try - { - await started.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); - cut.Render(pb => pb.Add(a => a.Model, external)); - saving.TrySetResult(true); - creating.TrySetResult(new Foo()); - await submit; - Assert.Same(external, cut.FindComponent().Instance.Model); - Assert.Equal(initializing ? 1 : 0, created); - } - finally - { - saving.TrySetResult(false); - creating.TrySetResult(new Foo()); - await submit; - } - } - - [Fact] - public async Task ClosingEmptyModal_DoesNotBlockNextPresentation() - { - var cut = Context.Render(); - var modal = cut.FindComponent().Instance; - await cut.InvokeAsync(modal.Close); - var service = Context.Services.GetRequiredService(); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); - await cut.InvokeAsync(modal.CloseCallback); - await cut.InvokeAsync(modal.Close); - await cut.InvokeAsync(() => service.ShowEditDialog(new EditDialogOption - { - Model = new Foo(), ShowConfirmCloseSwal = false - })); - Assert.True(await cut.InvokeAsync(modal.BeforeCloseCallback)); - } -} diff --git a/test/UnitTest/Components/EditDialogTest.cs b/test/UnitTest/Components/EditDialogTest.cs index 0821ccfcc27..1b25a7ac2aa 100644 --- a/test/UnitTest/Components/EditDialogTest.cs +++ b/test/UnitTest/Components/EditDialogTest.cs @@ -3,249 +3,10 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone -using Microsoft.AspNetCore.Components.Forms; - namespace UnitTest.Components; public class EditDialogTest : BootstrapBlazorTestBase { - [Fact] - public async Task CreateNextModelAsync_RejectsObsoleteModel() - { - var initial = new Foo { Name = "initial" }; - var next = new Foo { Name = "next" }; - var savedModels = new List(); - var cut = Context.Render>(pb => - { - pb.Add(a => a.Model, initial); - pb.Add(a => a.KeepOpenAfterSave, true); - pb.Add(a => a.CreateNextModelAsync, () => Task.FromResult(next)); - pb.Add(a => a.OnSaveAsync, context => - { - savedModels.Add(context.Model); - return Task.FromResult(true); - }); - }); - var previousForm = cut.FindComponent().Instance; - var oldContext = new EditContext(initial); - await cut.InvokeAsync(() => previousForm.OnValidSubmit!(oldContext)); - Assert.Same(next, cut.FindComponent().Instance.Model); - - await cut.InvokeAsync(() => previousForm.OnValidSubmit!(oldContext)); - Assert.Single(savedModels); - - var currentForm = cut.FindComponent().Instance; - await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(next))); - Assert.Equal(new object[] { initial, next }, savedModels); - - var external = new Foo { Name = "external" }; - cut.Render(pb => pb.Add(a => a.Model, external)); - await cut.InvokeAsync(() => currentForm.OnValidSubmit!(new EditContext(next))); - Assert.Equal(2, savedModels.Count); - } - - [Fact] - public async Task SaveValueTypeModel_Ok() - { - var saved = false; - var cut = Context.Render>(pb => - { - pb.Add(a => a.Model, new ValueTypeModel(1)); - pb.Add(a => a.BodyTemplate, model => builder => builder.AddContent(0, model.Value)); - pb.Add(a => a.FooterTemplate, model => builder => builder.AddContent(0, model.Value)); - pb.Add(a => a.OnSaveAsync, context => - { - saved = true; - return Task.FromResult(false); - }); - }); - var form = cut.FindComponent().Instance; - await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); - Assert.True(saved); - } - - private readonly record struct ValueTypeModel(int Value); - - [Theory] - [InlineData(0)] - [InlineData(1)] - public async Task CreateNextModelAsync_ValueTypeModelPreservesOnRender(int initialValue) - { - var cut = Context.Render>(pb => - { - pb.Add(a => a.Model, new ValueTypeModel(initialValue)); - pb.Add(a => a.BodyTemplate, model => builder => builder.AddContent(0, $"body-{model.Value}")); - pb.Add(a => a.FooterTemplate, model => builder => builder.AddContent(0, $"footer-{model.Value}")); - pb.Add(a => a.KeepOpenAfterSave, true); - pb.Add(a => a.OnSaveAsync, context => Task.FromResult(true)); - pb.Add(a => a.CreateNextModelAsync, () => Task.FromResult(new ValueTypeModel(2))); - }); - var form = cut.FindComponent().Instance; - await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); - Assert.Equal(new ValueTypeModel(2), cut.FindComponent().Instance.Model); - - cut.Render(); - Assert.Equal(new ValueTypeModel(2), cut.FindComponent().Instance.Model); - cut.Contains("body-2"); - cut.Contains("footer-2"); - - cut.Render(pb => pb.Add(a => a.Model, new ValueTypeModel(3))); - Assert.Equal(new ValueTypeModel(3), cut.FindComponent().Instance.Model); - cut.Contains("body-3"); - cut.Contains("footer-3"); - } - - [Fact] - public async Task CreateNextModelAsync_ValueTypeFailurePersistsOnRender() - { - var saveCount = 0; - var cut = Context.Render>(pb => - { - pb.Add(a => a.Model, new ValueTypeModel(1)); - pb.Add(a => a.BodyTemplate, model => builder => builder.AddContent(0, model.Value)); - pb.Add(a => a.KeepOpenAfterSave, true); - pb.Add(a => a.OnSaveAsync, context => - { - saveCount++; - return Task.FromResult(true); - }); - pb.Add(a => a.CreateNextModelAsync, () => Task.FromException(new InvalidOperationException("Initialization failed"))); - }); - var form = cut.FindComponent().Instance; - await cut.InvokeAsync(() => form.OnValidSubmit!(new EditContext(form.Model!))); - cut.Render(); - Assert.NotEmpty(cut.Find("[role=alert]").TextContent); - Assert.True(cut.FindComponents