From babf5b99e7473e3ce15b82b0f5ddc50c6e751a73 Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Thu, 21 May 2026 02:49:17 -0400 Subject: [PATCH] feat(ui): notification detail modal shows message body + recipients --- .../Notifications/NotificationReport.razor | 136 +++++++++++++++++- .../NotificationReportDetailModalTests.cs | 109 ++++++++++++++ 2 files changed, 243 insertions(+), 2 deletions(-) diff --git a/src/ScadaLink.CentralUI/Components/Pages/Notifications/NotificationReport.razor b/src/ScadaLink.CentralUI/Components/Pages/Notifications/NotificationReport.razor index 7b2b491..44798ce 100644 --- a/src/ScadaLink.CentralUI/Components/Pages/Notifications/NotificationReport.razor +++ b/src/ScadaLink.CentralUI/Components/Pages/Notifications/NotificationReport.razor @@ -268,6 +268,64 @@
@d.LastError
} + + @* ── Recipients ── *@ +
+
Recipients
+ @if (_detailLoading) + { +
+ + Loading details… +
+ } + else if (_detailError != null) + { +
@_detailError
+ } + else if (_detail != null) + { + var recipients = ParseRecipients(_detail.ResolvedTargets); + if (recipients.Count > 0) + { + + } + else + { +
+ Not yet resolved — recipients are resolved from list + "@d.ListName" at delivery time. +
+ } + } + + @* ── Body ── *@ +
+
Message body
+ @if (_detailLoading) + { +
+ + Loading details… +
+ } + else if (_detailError != null) + { +
@_detailError
+ } + else if (_detail != null) + { + @* Email bodies are plain text (design: BCC delivery, plain text). + Rendered as preformatted text — never as a MarkupString, which + would be an XSS vector. *@ + 
@_detail.Body
+ }
@if (d.Status == "Parked") @@ -304,6 +362,9 @@ // Row detail modal private NotificationSummary? _detailNotification; + private NotificationDetail? _detail; + private bool _detailLoading; + private string? _detailError; // Filters private string _statusFilter = string.Empty; @@ -440,9 +501,80 @@ _actionInProgress = false; } - private void ShowDetail(NotificationSummary n) => _detailNotification = n; + private async Task ShowDetail(NotificationSummary n) + { + // The summary fields render immediately; Body + recipients fill in once the + // full-detail fetch completes. + _detailNotification = n; + _detail = null; + _detailError = null; + _detailLoading = true; + StateHasChanged(); - private void CloseDetail() => _detailNotification = null; + try + { + var response = await CommunicationService.GetNotificationDetailAsync( + new NotificationDetailRequest(Guid.NewGuid().ToString("N"), n.NotificationId)); + if (response.Success && response.Detail != null) + { + _detail = response.Detail; + } + else + { + _detailError = response.ErrorMessage ?? "Failed to load notification detail."; + } + } + catch (Exception ex) + { + _detailError = $"Failed to load notification detail: {ex.Message}"; + } + _detailLoading = false; + } + + private void CloseDetail() + { + _detailNotification = null; + _detail = null; + _detailError = null; + _detailLoading = false; + } + + /// + /// Best-effort parse of ResolvedTargets into individual recipient addresses. + /// The field may be a JSON string array, or a comma/semicolon-separated string. + /// Returns an empty list when null/empty. + /// + private static List ParseRecipients(string? resolvedTargets) + { + if (string.IsNullOrWhiteSpace(resolvedTargets)) + { + return new List(); + } + + var trimmed = resolvedTargets.Trim(); + if (trimmed.StartsWith('[')) + { + try + { + var parsed = System.Text.Json.JsonSerializer.Deserialize>(trimmed); + if (parsed != null) + { + return parsed + .Where(r => !string.IsNullOrWhiteSpace(r)) + .Select(r => r.Trim()) + .ToList(); + } + } + catch (System.Text.Json.JsonException) + { + // Not valid JSON — fall through to the delimiter-split path. + } + } + + return trimmed + .Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) + .ToList(); + } private async Task RetryFromDetail(NotificationSummary n) { diff --git a/tests/ScadaLink.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs b/tests/ScadaLink.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs index bbcd036..60bf0a1 100644 --- a/tests/ScadaLink.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs +++ b/tests/ScadaLink.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs @@ -29,6 +29,27 @@ public class NotificationReportDetailModalTests : BunitContext private readonly ActorSystem _system = ActorSystem.Create("notif-report-modal-tests"); private readonly CommunicationService _comms; + private NotificationDetailResponse _detailReply = + new("d", true, null, new NotificationDetail( + NotificationId: "notif-aaaaaaaa-1111-full-id", + Type: "Email", + ListName: "Ops On-Call", + Subject: "Pump fault at Plant-A", + Body: "Pump-001 tripped on overcurrent at 14:32. Investigate immediately.", + Status: "Parked", + RetryCount: 3, + LastError: "SMTP timeout connecting to mail relay", + ResolvedTargets: "[\"ops@example.com\",\"oncall@example.com\"]", + TypeData: null, + SourceSiteId: "plant-a", + SourceInstanceId: "Pump-001", + SourceScript: "PumpFault.csx", + SiteEnqueuedAt: DateTimeOffset.UtcNow.AddMinutes(-31), + CreatedAt: DateTimeOffset.UtcNow.AddMinutes(-30), + LastAttemptAt: DateTimeOffset.UtcNow.AddMinutes(-5), + NextAttemptAt: null, + DeliveredAt: null)); + private NotificationOutboxQueryResponse _queryReply = new("q", true, null, new List { @@ -149,6 +170,90 @@ public class NotificationReportDetailModalTests : BunitContext }); } + [Fact] + public void Modal_FetchesAndShowsBody() + { + var cut = Render(); + cut.WaitForState(() => cut.Markup.Contains("Pump fault at Plant-A")); + + var row = cut.FindAll("tbody tr") + .First(r => r.TextContent.Contains("Pump fault at Plant-A")); + row.DoubleClick(); + + cut.WaitForAssertion(() => + { + var modal = cut.Find(".modal.show"); + Assert.Contains( + "Pump-001 tripped on overcurrent at 14:32. Investigate immediately.", + modal.TextContent); + }); + } + + [Fact] + public void Modal_ShowsRecipients_FromResolvedTargets() + { + var cut = Render(); + cut.WaitForState(() => cut.Markup.Contains("Pump fault at Plant-A")); + + var row = cut.FindAll("tbody tr") + .First(r => r.TextContent.Contains("Pump fault at Plant-A")); + row.DoubleClick(); + + cut.WaitForAssertion(() => + { + var modal = cut.Find(".modal.show"); + Assert.Contains("ops@example.com", modal.TextContent); + Assert.Contains("oncall@example.com", modal.TextContent); + }); + } + + [Fact] + public void Modal_ShowsListFallback_WhenResolvedTargetsNull() + { + _detailReply = _detailReply with + { + Detail = _detailReply.Detail! with { ResolvedTargets = null }, + }; + + var cut = Render(); + cut.WaitForState(() => cut.Markup.Contains("Pump fault at Plant-A")); + + var row = cut.FindAll("tbody tr") + .First(r => r.TextContent.Contains("Pump fault at Plant-A")); + row.DoubleClick(); + + cut.WaitForAssertion(() => + { + var modal = cut.Find(".modal.show"); + Assert.Contains("Not yet resolved", modal.TextContent); + Assert.Contains("Ops On-Call", modal.TextContent); + Assert.Contains("at delivery time", modal.TextContent); + }); + } + + [Fact] + public void Modal_ShowsError_WhenDetailFetchFails() + { + _detailReply = new NotificationDetailResponse("d", false, "detail store unavailable", null); + + var cut = Render(); + cut.WaitForState(() => cut.Markup.Contains("Pump fault at Plant-A")); + + var row = cut.FindAll("tbody tr") + .First(r => r.TextContent.Contains("Pump fault at Plant-A")); + row.DoubleClick(); + + cut.WaitForAssertion(() => + { + var modal = cut.Find(".modal.show"); + // The error surfaces in the body/recipient sections... + Assert.Contains("detail store unavailable", modal.TextContent); + // ...but the summary fields (from the grid row) still render. + Assert.Contains("Ops On-Call", modal.TextContent); + Assert.Contains("notif-aaaaaaaa-1111-full-id", modal.TextContent); + }); + } + protected override void Dispose(bool disposing) { if (disposing) @@ -163,6 +268,10 @@ public class NotificationReportDetailModalTests : BunitContext public ScriptedOutboxActor(NotificationReportDetailModalTests test) { Receive(_ => Sender.Tell(test._queryReply)); + Receive(r => Sender.Tell(test._detailReply with + { + CorrelationId = r.CorrelationId, + })); Receive(r => Sender.Tell(new RetryNotificationResponse(r.CorrelationId, true, null))); Receive(r =>