2a7dee4afa
Adds a Test Bindings button to the Connection Bindings table on the Configure
Instance page that opens a modal showing the live current value of every bound
attribute. Reuses the routing path that the OPC UA tag browser landed on:
Central: TestBindingsDialog → IBindingTester → CommunicationService
→ ReadTagValuesCommand → SiteEnvelope (Ask)
Site: SiteCommunicationActor → DeploymentManagerActor singleton
→ DataConnectionManagerActor → child DataConnectionActor
→ _adapter.ReadBatchAsync
Split mirrors the browse handler:
• Manager owns ConnectionNotFound (only it sees the per-site connection set).
• Child owns ConnectionNotConnected (pre-call status check, never stash —
read is interactive design-time), Timeout (OperationCanceledException),
ServerError (any other exception). Per-tag failures from ReadBatchAsync
become failure TagReadOutcomes without aborting the batch.
CentralUI:
• IBindingTester / BindingTester — Design-role guard via HasClaim against
JwtTokenService.RoleClaimType (not IsInRole — see c1e16cf), typed
transport-failure translation.
• TestBindingsDialog — ShowAsync(siteId, rows, instanceLabel) method-arg
pattern (no Razor parameter race; see 2c138b6), groups rows by connection
and issues one ReadAsync per connection in parallel, per-row error subline
+ per-connection banner, Refresh button re-issues the reads.
• InstanceConfigure.razor — Test Bindings button next to Save Bindings,
disabled when no testable rows. OPC UA only today (other protocols have
no ReadTagValuesCommand wiring yet).
Tests:
• Commons: ReadTagValuesCommand discovered by ManagementCommandRegistry.
• DataConnectionLayer: unknown connection → ConnectionNotFound,
not-connected adapter → ConnectionNotConnected (ReadBatchAsync NOT called),
success-path mapping (Good/Bad + per-tag error), cancellation → Timeout.
• CentralUI: register IBindingTester (and the previously-missing
IOpcUaBrowseService) on the existing InstanceConfigureAuditDrillinTests
Bunit container so the page renders cleanly with the new dialog.
108 lines
5.0 KiB
C#
108 lines
5.0 KiB
C#
using System.Security.Claims;
|
|
using Bunit;
|
|
using Microsoft.AspNetCore.Components;
|
|
using Microsoft.AspNetCore.Components.Authorization;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NSubstitute;
|
|
using ZB.MOM.WW.ScadaBridge.CentralUI.Auth;
|
|
using ZB.MOM.WW.ScadaBridge.CentralUI.Services;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Templates;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Repositories;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
|
|
using ZB.MOM.WW.ScadaBridge.DeploymentManager;
|
|
using ZB.MOM.WW.ScadaBridge.Security;
|
|
using ZB.MOM.WW.ScadaBridge.TemplateEngine.Services;
|
|
using InstanceConfigurePage = ZB.MOM.WW.ScadaBridge.CentralUI.Components.Pages.Deployment.InstanceConfigure;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.CentralUI.Tests.Deployment;
|
|
|
|
/// <summary>
|
|
/// Bundle D drill-in test (#23 M7-T12) for the Instance Configure page. The
|
|
/// chip routes operators into the central Audit Log pre-filtered by
|
|
/// <c>?instance={Instance.UniqueName}</c>. Instance is UI-only on the filter
|
|
/// bar (the repository filter contract has no instance column), so the page
|
|
/// uses the UI-text seam — the Audit Log's filter bar pre-populates its
|
|
/// Instance free-text input from this query string.
|
|
/// </summary>
|
|
public class InstanceConfigureAuditDrillinTests : BunitContext
|
|
{
|
|
private readonly ITemplateEngineRepository _templateRepo =
|
|
Substitute.For<ITemplateEngineRepository>();
|
|
private readonly ISiteRepository _siteRepo = Substitute.For<ISiteRepository>();
|
|
|
|
public InstanceConfigureAuditDrillinTests()
|
|
{
|
|
// Loose JS interop because shared components on the page render
|
|
// localStorage / clipboard touches that we don't care about here.
|
|
JSInterop.Mode = JSRuntimeMode.Loose;
|
|
|
|
Services.AddSingleton(_templateRepo);
|
|
Services.AddSingleton(_siteRepo);
|
|
|
|
Services.AddSingleton(new InstanceService(_templateRepo, Substitute.For<IAuditService>()));
|
|
Services.AddSingleton(Substitute.For<IFlatteningPipeline>());
|
|
|
|
// The page renders <OpcUaBrowserDialog/> and <TestBindingsDialog/> at
|
|
// the bottom; their @inject directives need a registered service even
|
|
// though this test doesn't open either dialog.
|
|
Services.AddSingleton(Substitute.For<IOpcUaBrowseService>());
|
|
Services.AddSingleton(Substitute.For<IBindingTester>());
|
|
|
|
// Auth: a system-wide Deployment user so SiteScope grants everything.
|
|
var claims = new[]
|
|
{
|
|
new Claim("Username", "deployer"),
|
|
new Claim(JwtTokenService.RoleClaimType, "Deployment"),
|
|
};
|
|
var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
|
|
var authProvider = new TestAuthStateProvider(user);
|
|
Services.AddSingleton<AuthenticationStateProvider>(authProvider);
|
|
Services.AddSingleton(new SiteScopeService(authProvider));
|
|
Services.AddAuthorizationCore();
|
|
AuthorizationPolicies.AddScadaBridgeAuthorization(Services);
|
|
}
|
|
|
|
[Fact]
|
|
public void Page_HasRecentAuditActivityLink_WithInstanceUniqueName()
|
|
{
|
|
var instance = new Instance("Pump-Station-007")
|
|
{
|
|
Id = 42,
|
|
TemplateId = 1,
|
|
SiteId = 1,
|
|
State = ZB.MOM.WW.ScadaBridge.Commons.Types.Enums.InstanceState.NotDeployed,
|
|
};
|
|
|
|
_templateRepo.GetInstanceByIdAsync(42, Arg.Any<CancellationToken>()).Returns(instance);
|
|
_templateRepo.GetTemplateByIdAsync(1, Arg.Any<CancellationToken>())
|
|
.Returns(new Template("Pump") { Id = 1 });
|
|
_siteRepo.GetAllSitesAsync(Arg.Any<CancellationToken>())
|
|
.Returns(new List<Site> { new("Plant A", "plant-a") { Id = 1 } });
|
|
_templateRepo.GetAreasBySiteIdAsync(1, Arg.Any<CancellationToken>())
|
|
.Returns(new List<Area>());
|
|
_templateRepo.GetAttributesByTemplateIdAsync(1, Arg.Any<CancellationToken>())
|
|
.Returns(new List<TemplateAttribute>());
|
|
_siteRepo.GetDataConnectionsBySiteIdAsync(1, Arg.Any<CancellationToken>())
|
|
.Returns(new List<DataConnection>());
|
|
_templateRepo.GetBindingsByInstanceIdAsync(42, Arg.Any<CancellationToken>())
|
|
.Returns(new List<InstanceConnectionBinding>());
|
|
_templateRepo.GetOverridesByInstanceIdAsync(42, Arg.Any<CancellationToken>())
|
|
.Returns(new List<InstanceAttributeOverride>());
|
|
_templateRepo.GetAlarmsByTemplateIdAsync(1, Arg.Any<CancellationToken>())
|
|
.Returns(new List<TemplateAlarm>());
|
|
_templateRepo.GetAlarmOverridesByInstanceIdAsync(42, Arg.Any<CancellationToken>())
|
|
.Returns(new List<InstanceAlarmOverride>());
|
|
|
|
var cut = Render<InstanceConfigurePage>(p => p.Add(c => c.Id, 42));
|
|
|
|
cut.WaitForAssertion(() =>
|
|
{
|
|
var link = cut.Find("a[data-test=\"audit-link\"]");
|
|
Assert.Equal("/audit/log?instance=Pump-Station-007", link.GetAttribute("href"));
|
|
Assert.Contains("Recent audit activity", link.TextContent);
|
|
});
|
|
}
|
|
}
|