Skip to content

perf(ErrorLog): improving the error handling logic #5600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2025
Merged

perf(ErrorLog): improving the error handling logic #5600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d7baf
refactor: 优化逻辑接管后内部不再弹出 Toast
ArgoZhang Mar 11, 2025
ce3009d
test: 更新单元测试
ArgoZhang Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,14 @@ protected override async Task OnErrorAsync(Exception exception)
if (OnErrorHandleAsync != null)
{
await OnErrorHandleAsync(Logger, exception);
return;
}
else
{
if (ShowToast)
{
await ToastService.Error(ToastTitle, exception.Message);
}

Logger.LogError(exception, "{BootstrapBlazorErrorBoundary} {OnErrorAsync} log this error occurred at {Page}", nameof(BootstrapBlazorErrorBoundary), nameof(OnErrorAsync), NavigationManager.Uri);
if (ShowToast)
{
await ToastService.Error(ToastTitle, exception.Message);
}
Logger.LogError(exception, "{BootstrapBlazorErrorBoundary} {OnErrorAsync} log this error occurred at {Page}", nameof(BootstrapBlazorErrorBoundary), nameof(OnErrorAsync), NavigationManager.Uri);
}

/// <summary>
Expand Down Expand Up @@ -126,16 +124,14 @@ private MarkupString GetErrorContentMarkupString(Exception ex)
/// <param name="handler"></param>
public async Task RenderException(Exception exception, IHandlerException? handler)
{
await OnErrorAsync(exception);

if (handler != null)
{
await handler.HandlerException(exception, ExceptionContent);
return;
}
else
{
_exception = exception;
StateHasChanged();
}

await OnErrorAsync(exception);
_exception = exception;
StateHasChanged();
}
}
3 changes: 2 additions & 1 deletion src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public class ErrorLogger : ComponentBase, IErrorLogger
[Parameter]
public RenderFragment<Exception>? ErrorContent { get; set; }

private BootstrapBlazorErrorBoundary _errorBoundary = default!;
[NotNull]
private BootstrapBlazorErrorBoundary? _errorBoundary = default;

/// <summary>
/// <inheritdoc/>
Expand Down
18 changes: 18 additions & 0 deletions test/UnitTest/Components/ErrorHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,31 @@ await cut.InvokeAsync(() => dialog.Show(new DialogOption()
// 关闭弹窗
var btn = cut.Find(".modal-header .btn-close");
await cut.InvokeAsync(() => btn.Click());
}

[Fact]
public async Task ShowToast_Ok()
{
var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
{
pb.AddChildContent<ErrorComponent>();
});
var errorButton = cut.Find(".btn-error");
await cut.InvokeAsync(() => errorButton.Click());
cut.Contains("<div class=\"toast-body\">test error logger</div>");

// 关闭 Toast
var toast = cut.FindComponent<Toast>().Instance;
await cut.InvokeAsync(() => toast.Close());
cut.DoesNotContain("<div class=\"toast-body\">test error logger</div>");

cut.SetParametersAndRender(pb =>
{
pb.Add(a => a.ShowToast, false);
});
errorButton = cut.Find(".btn-error");
await cut.InvokeAsync(() => errorButton.Click());
cut.DoesNotContain("<div class=\"toast-body\">test error logger</div>");
}

private class MockDialogTest : ComponentBase
Expand Down