From c8dce0b0247e56f3cb6bd60f6d19774029270a87 Mon Sep 17 00:00:00 2001 From: Mia Winter Date: Wed, 14 Feb 2024 21:27:43 +0100 Subject: [PATCH] Changed EmailEdit to use new message system --- Wave/Components/Pages/EmailEdit.razor | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Wave/Components/Pages/EmailEdit.razor b/Wave/Components/Pages/EmailEdit.razor index 2aebe68..a3c54d5 100644 --- a/Wave/Components/Pages/EmailEdit.razor +++ b/Wave/Components/Pages/EmailEdit.razor @@ -4,6 +4,7 @@ @using Microsoft.Extensions.Options @using Wave.Data @using Wave.Services +@using Wave.Utilities @inject ILogger Logger @inject IStringLocalizer Localizer @@ -12,15 +13,10 @@ @inject NavigationManager Navigation @inject IEmailSender EmailSender @inject EmailTemplateService TemplateService +@inject IMessageDisplay Messages @(TitlePrefix + Localizer["Title"]) -@if (!string.IsNullOrWhiteSpace(Message)) { -
- @Message -
-} -
@@ -46,20 +42,22 @@ [Parameter, SupplyParameterFromQuery(Name = "newsletter")] public string? Newsletter { get; set; } - private string Message { get; set; } = string.Empty; + [CascadingParameter] + public HttpContext? HttpContext { get; set; } protected override async Task OnInitializedAsync() { if (Id is null || Token is null || Newsletter is null) { - if (string.IsNullOrWhiteSpace(Message)) Message = Localizer["Load_Failure_Message"]; + if (HttpContext?.Request.Method.ToUpper() is "POST") + Messages.ShowError(Localizer["Load_Failure_Message"]); return; } try { if (await GetSubscriber() is null) { - Message = Localizer["Load_Failure_Message"]; + Messages.ShowError(Localizer["Load_Failure_Message"]); } } catch (Exception) { - Message = Localizer["Load_Failure_Message"]; + Messages.ShowError(Localizer["Load_Failure_Message"]); } } @@ -68,13 +66,13 @@ await using var context = await ContextFactory.CreateDbContextAsync(); var subscriber = await GetSubscriber(context); if (subscriber is null) { - Message = Localizer["Unsubscribe_Failure_Message"]; + Messages.ShowError(Localizer["Unsubscribe_Failure_Message"]); return; } subscriber.Unsubscribed = true; await context.SaveChangesAsync(); - Message = Localizer["Unsubscribe_Success"]; + Messages.ShowSuccess(Localizer["Unsubscribe_Success"]); var customization = Customizations.Value; string body = TemplateService.Default( @@ -87,7 +85,7 @@ } catch (EmailNotSendException ex) { Logger.LogWarning(ex, "Failed to send unsubscribe confirm email. The user has been unsubscribed anyway."); } catch (Exception) { - Message = Localizer["Unsubscribe_Failure_Message"]; + Messages.ShowError(Localizer["Unsubscribe_Failure_Message"]); } }