40944a0d04
The Secured Writes page rendered Approve and Reject as IDENTICAL red buttons.
Row 28 fixed the labels but left the styling, and the styling was the worse
half: at the moment of a two-person-control decision the colour carried no
discriminating information at all, and the affirmative half of the control wore
the delete affordance.
Root cause is that `danger` was a two-state flag for a three-state concept, so a
consequential-but-not-destructive action had to choose between looking like a
delete and looking like the safe default. Adds the missing middle rung:
DialogSeverity { Normal -> btn-primary, Caution -> btn-warning,
Destructive -> btn-danger }
DECISION. Approve -> Caution (amber): approving executes a real write to live
plant equipment, so it is not a benign primary action, but it is not destroying
anything either. Reject KEEPS Destructive (red): it is terminal and irreversible
for the request — the Operator must resubmit — and holding it red is what keeps
the two opposite decisions visually distinct now that Approve is amber. Dropping
Reject to neutral was considered and rejected: it would invert the bias, making
declining look like the safe default. Colour is never the only signal — both
buttons carry their verb.
Only Destructive inherits the row-28 "Delete" label fallback; an unlabelled
Caution reads "Confirm", since a caution action is by definition not a delete —
otherwise row 28 would come back through the new door.
ADDITIVE OVERLOAD, deliberately. The boolean form stays the signature for all
~34 existing call sites, which are genuinely two-state, so nothing in src/
outside SecuredWrites.razor changed. Adding a fifth optional parameter to the
boolean form instead would have silently un-matched every existing four-argument
NSubstitute stub — the exact row-28 gotcha (null Task, caller NREs, no compile
error). The overload cannot: the only breakage was six hand-written IDialogService
fakes failing to compile, which is the loud failure mode. That gotcha did land
once, in SecuredWritesTests' own stub, and is now stubbed on both overloads with
a comment saying why.
DialogState's `bool Danger` became `DialogSeverity Severity` rather than gaining
a second field — it is read only by DialogHost, and one field cannot disagree
with itself.
Fail-before, both halves:
- Approve call site reverted to `danger: true` -> both new Approve pins fail.
- Caution remapped to btn-danger in DialogHost -> the amber styling pin fails.
Tests: DialogSeverityStylingTests renders the REAL DialogService behind a real
DialogHost (FailoverConfirmLabelTests' harness), so it pins what the user sees,
not what an argument was — all three severities, both label fallbacks, and the
boolean adapter. SecuredWritesTests pins that the page asks for Caution, with a
negative control that it did NOT also go through the boolean form (without which
the assertion would pass on a call site left at danger:true). Reject's red is
pinned too, so a later "make this page less alarming" pass cannot flatten both
to one colour.
No Playwright selectors needed updating — the suite has no Secured Writes
coverage, and no `.btn-danger` selector elsewhere targets this page.
Docs: Component-CentralUI.md gains the severity contract under Technology (next
to the row-28 label contract) plus the decision on the Secured Writes section.
CentralUI.Tests: 1055/1055 green.
359 lines
14 KiB
C#
359 lines
14 KiB
C#
using System.Security.Claims;
|
|
using ZB.MOM.WW.ScadaBridge.Security;
|
|
using Akka.Actor;
|
|
using Bunit;
|
|
using Microsoft.AspNetCore.Components.Authorization;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.ScadaBridge.CentralUI.Components.Shared;
|
|
using NSubstitute;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Repositories;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Messages.Notification;
|
|
using ZB.MOM.WW.ScadaBridge.Communication;
|
|
using NotificationReportPage = ZB.MOM.WW.ScadaBridge.CentralUI.Components.Pages.Notifications.NotificationReport;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.CentralUI.Tests.Pages;
|
|
|
|
/// <summary>
|
|
/// bUnit tests for the Notification Report row-detail modal — double-clicking a
|
|
/// notification row opens a Bootstrap modal showing that notification's full,
|
|
/// untruncated details.
|
|
///
|
|
/// Mirrors <see cref="NotificationReportPageTests"/>'s seam: the report's
|
|
/// <see cref="CommunicationService"/> calls route through an injected scripted
|
|
/// actor (the notification-outbox proxy).
|
|
/// </summary>
|
|
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<NotificationSummary>
|
|
{
|
|
new("notif-aaaaaaaa-1111-full-id", "Email", "Ops On-Call", "Pump fault at Plant-A",
|
|
"Parked", RetryCount: 3, LastError: "SMTP timeout connecting to mail relay",
|
|
SourceSiteId: "plant-a", SourceInstanceId: "Pump-001",
|
|
CreatedAt: DateTimeOffset.UtcNow.AddMinutes(-30),
|
|
DeliveredAt: null, IsStuck: true),
|
|
new("notif-bbbbbbbb-2222-full-id", "Email", "Maintenance", "Daily summary",
|
|
"Delivered", RetryCount: 0, LastError: null, SourceSiteId: "plant-b",
|
|
SourceInstanceId: null, CreatedAt: DateTimeOffset.UtcNow.AddHours(-2),
|
|
DeliveredAt: DateTimeOffset.UtcNow.AddHours(-2), IsStuck: false),
|
|
}, TotalCount: 2);
|
|
|
|
public NotificationReportDetailModalTests()
|
|
{
|
|
_comms = new CommunicationService(
|
|
Options.Create(new CommunicationOptions()),
|
|
NullLogger<CommunicationService>.Instance);
|
|
|
|
var outbox = _system.ActorOf(Props.Create(() => new ScriptedOutboxActor(this)));
|
|
_comms.SetNotificationOutbox(outbox);
|
|
|
|
Services.AddSingleton(_comms);
|
|
Services.AddSingleton<IDialogService>(new AlwaysConfirmDialogService());
|
|
|
|
var siteRepo = Substitute.For<ISiteRepository>();
|
|
siteRepo.GetAllSitesAsync(Arg.Any<CancellationToken>())
|
|
.Returns(Task.FromResult<IReadOnlyList<Site>>(new List<Site>
|
|
{
|
|
new("Plant A", "plant-a") { Id = 1 },
|
|
new("Plant B", "plant-b") { Id = 2 },
|
|
}));
|
|
Services.AddSingleton(siteRepo);
|
|
|
|
var claims = new[]
|
|
{
|
|
new Claim(JwtTokenService.UsernameClaimType, "tester"),
|
|
new Claim(JwtTokenService.RoleClaimType, "Deployer"),
|
|
};
|
|
var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
|
|
Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
|
|
Services.AddAuthorizationCore();
|
|
Services.AddScoped<ZB.MOM.WW.ScadaBridge.CentralUI.Auth.SiteScopeService>();
|
|
}
|
|
|
|
[Fact]
|
|
public void DoubleClickRow_OpensDetailModal()
|
|
{
|
|
var cut = Render<NotificationReportPage>();
|
|
cut.WaitForState(() => cut.Markup.Contains("Pump fault at Plant-A"));
|
|
|
|
// No modal initially.
|
|
Assert.Empty(cut.FindAll(".modal.show"));
|
|
|
|
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 fault at Plant-A", modal.TextContent);
|
|
Assert.Contains("Ops On-Call", modal.TextContent);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void Modal_ShowsFullNotificationId_NotTruncated()
|
|
{
|
|
var cut = Render<NotificationReportPage>();
|
|
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 grid renders ShortId(...) (first 12 chars); the modal must show
|
|
// the complete identifier.
|
|
Assert.Contains("notif-aaaaaaaa-1111-full-id", modal.TextContent);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void CloseButton_DismissesModal()
|
|
{
|
|
var cut = Render<NotificationReportPage>();
|
|
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.WaitForState(() => cut.FindAll(".modal.show").Count > 0);
|
|
|
|
var closeButton = cut.Find(".modal.show .modal-footer button");
|
|
closeButton.Click();
|
|
|
|
cut.WaitForAssertion(() => Assert.Empty(cut.FindAll(".modal.show")));
|
|
}
|
|
|
|
[Fact]
|
|
public void Modal_ShowsLastError_WhenPresent()
|
|
{
|
|
var cut = Render<NotificationReportPage>();
|
|
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("SMTP timeout connecting to mail relay", modal.TextContent);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void Modal_FetchesAndShowsBody()
|
|
{
|
|
var cut = Render<NotificationReportPage>();
|
|
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<NotificationReportPage>();
|
|
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<NotificationReportPage>();
|
|
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<NotificationReportPage>();
|
|
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);
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// The modal must stay mounted when the row it was opened for leaves the
|
|
/// current page — it is gated on user intent (the held id), never on the
|
|
/// row still resolving.
|
|
///
|
|
/// This is a race regression guard, not a cosmetic one. When the subtree was
|
|
/// gated on the resolve, a refresh that dropped the row unmounted the whole
|
|
/// modal and disposed every event-handler id inside it, Close's included. A
|
|
/// click already in flight against a disposed handler makes the renderer
|
|
/// throw GetRequiredEventBindingEntry — which is exactly how this surfaced,
|
|
/// as an intermittent failure in CloseButton_DismissesModal.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Modal_StaysOpen_WhenItsRowLeavesThePage()
|
|
{
|
|
var cut = Render<NotificationReportPage>();
|
|
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.WaitForState(() => cut.FindAll(".modal.show").Count > 0);
|
|
|
|
// The next query drops the opened row, as a refresh, filter change or
|
|
// page change legitimately can while the modal is open.
|
|
_queryReply = _queryReply with
|
|
{
|
|
Notifications = _queryReply.Notifications!
|
|
.Where(n => n.NotificationId != "notif-aaaaaaaa-1111-full-id")
|
|
.ToList(),
|
|
TotalCount = 1,
|
|
};
|
|
|
|
cut.FindAll("button").First(b => b.TextContent.Contains("Query")).Click();
|
|
cut.WaitForState(() => !cut.Markup.Contains("Pump fault at Plant-A"));
|
|
|
|
// Still mounted, and it says why the summary is missing rather than
|
|
// vanishing out from under the user.
|
|
var modal = cut.Find(".modal.show");
|
|
Assert.NotNull(modal.QuerySelector("[data-test='detail-row-gone']"));
|
|
|
|
// The detail that was already fetched is keyed by id, so it survives.
|
|
Assert.Contains(
|
|
"Pump-001 tripped on overcurrent at 14:32. Investigate immediately.",
|
|
modal.TextContent);
|
|
|
|
// Row-scoped actions are gone (nothing to relay against) but Close is not,
|
|
// and it still works — the handler was never disposed.
|
|
Assert.DoesNotContain("Retry", modal.QuerySelector(".modal-footer")!.TextContent);
|
|
cut.Find(".modal.show .modal-footer button").Click();
|
|
cut.WaitForAssertion(() => Assert.Empty(cut.FindAll(".modal.show")));
|
|
}
|
|
|
|
protected override void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
_system.Terminate().Wait(TimeSpan.FromSeconds(5));
|
|
}
|
|
base.Dispose(disposing);
|
|
}
|
|
|
|
private sealed class ScriptedOutboxActor : ReceiveActor
|
|
{
|
|
public ScriptedOutboxActor(NotificationReportDetailModalTests test)
|
|
{
|
|
Receive<NotificationOutboxQueryRequest>(_ => Sender.Tell(test._queryReply));
|
|
Receive<NotificationDetailRequest>(r => Sender.Tell(test._detailReply with
|
|
{
|
|
CorrelationId = r.CorrelationId,
|
|
}));
|
|
Receive<RetryNotificationRequest>(r =>
|
|
Sender.Tell(new RetryNotificationResponse(r.CorrelationId, true, null)));
|
|
Receive<DiscardNotificationRequest>(r =>
|
|
Sender.Tell(new DiscardNotificationResponse(r.CorrelationId, true, null)));
|
|
}
|
|
}
|
|
|
|
private sealed class AlwaysConfirmDialogService : IDialogService
|
|
{
|
|
public Task<bool> ConfirmAsync(string title, string message, bool danger = false, string? confirmLabel = null)
|
|
=> Task.FromResult(true);
|
|
|
|
// Register row 75 added a DialogSeverity overload. This stub auto-confirms
|
|
// regardless of severity — it exists to let action paths run end to end, not to
|
|
// assert anything about styling.
|
|
public Task<bool> ConfirmAsync(string title, string message, DialogSeverity severity, string? confirmLabel = null)
|
|
=> Task.FromResult(true);
|
|
|
|
public Task<string?> PromptAsync(
|
|
string title, string label, string initialValue = "", string? placeholder = null)
|
|
=> Task.FromResult<string?>(null);
|
|
|
|
public Task<TResult?> ShowAsync<TResult>(
|
|
string title,
|
|
Microsoft.AspNetCore.Components.RenderFragment<DialogContext<TResult>> body,
|
|
string? size = null)
|
|
=> Task.FromResult<TResult?>(default);
|
|
}
|
|
}
|