dohertj2/ScadaBridge
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ui): tri-state MES reportable override on Instance Configure (reportable-only override is a delta)

Browse Source 
Claude-Session: https://claude.ai/code/session_01Y5ef34iUUMjmwnMpL9xgmB
This commit is contained in:
Joseph Doherty
2026-09-11 10:05:05 -04:00
parent 63ec226582
commit 735534a455
3 changed files with 196 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ZB.MOM.WW.ScadaBridge.CentralUI.PlaywrightTests/Deployment/InstanceConfigureTests.cs
+66
View File
@@ -516,4 +516,70 @@ public sealed class InstanceConfigureTests : IClassFixture<InstanceConfigureFixt
await CliRunner.DeleteInstanceAlarmOverrideAsync(_cfg.InstanceId, _cfg.AlarmName);
}
}
/// <summary>
/// Tri-state MES reportable round-trip. The override editor's third control is a select whose
/// blank option means "inherit the template alarm's <c>IsMesReportable</c>"; "Reportable" /
/// "Not reportable" pin it per-instance.
///
/// <para>
/// This is the regression guard for the save-time delta rule: a Save with no config-diff and no
/// priority DELETES the override, so a reportable-only choice has to count as a delta on its own
/// or it would be silently dropped. The assertion is therefore that choosing ONLY "Reportable"
/// (leaving the trigger config and priority untouched) creates the override — badge + a summary
/// naming <c>mesReportable</c> — and that switching back to Inherited removes it again.
/// </para>
///
/// <para>
/// The fixture instance is SHARED, so this clears its own override in-body and again in a
/// <c>finally</c>, exactly as <see cref="AlarmOverride_SetPriority_ThenClear_RoundTrips"/> does.
/// </para>
/// </summary>
[SkippableFact]
public async Task AlarmOverride_MesReportable_RoundTrips()
{
Skip.IfNot(_cfg.Available, ClusterAvailability.SkipReason);
var page = await _fixture.NewAuthenticatedPageAsync("multi-role", "password");
try
{
await page.GotoAsync($"{PlaywrightFixture.BaseUrl}/deployment/instances/{_cfg.InstanceId}/configure");
await page.WaitForLoadStateAsync(LoadState.NetworkIdle);
var row = page.Locator($"[data-test='alarm-override-row-{_cfg.AlarmName}']");
await Assertions.Expect(row).ToBeVisibleAsync(new() { Timeout = 15_000 });
await Assertions.Expect(row.Locator("[data-test='alarm-override-badge']")).ToHaveCountAsync(0);
// Edit → choose "Reportable" ONLY (no config edit, no priority) → Save.
await row.Locator("[data-test='alarm-edit-btn']").ClickAsync();
var mesSelect = page.Locator("[data-test='alarm-mes-select']");
await Assertions.Expect(mesSelect).ToBeVisibleAsync(new() { Timeout = 15_000 });
await mesSelect.SelectOptionAsync("true");
await page.Locator("[data-test='alarm-save-override']").ClickAsync();
await Assertions.Expect(page.Locator(".toast")).ToHaveCountAsync(1, new() { Timeout = 15_000 });
await Assertions.Expect(row.Locator("[data-test='alarm-override-badge']"))
.ToBeVisibleAsync(new() { Timeout = 15_000 });
// Summary part is "mesReportable" (the negative pin renders "notMesReportable").
await Assertions.Expect(row).ToContainTextAsync("mesReportable", new() { Timeout = 15_000 });
// Reopen → back to Inherited (blank) → Save. With nothing else set that is now a
// no-delta save, which clears the override outright.
await row.Locator("[data-test='alarm-edit-btn']").ClickAsync();
await Assertions.Expect(mesSelect).ToBeVisibleAsync(new() { Timeout = 15_000 });
await mesSelect.SelectOptionAsync("");
await page.Locator("[data-test='alarm-save-override']").ClickAsync();
await Assertions.Expect(row.Locator("[data-test='alarm-override-badge']"))
.ToHaveCountAsync(0, new() { Timeout = 15_000 });
using var doc = await CliRunner.GetInstanceDocumentAsync(_cfg.InstanceId);
var overrides = doc.RootElement.GetProperty("alarmOverrides");
Assert.DoesNotContain(overrides.EnumerateArray(), o =>
o.GetProperty("alarmCanonicalName").GetString() == _cfg.AlarmName);
}
finally
{
await CliRunner.DeleteInstanceAlarmOverrideAsync(_cfg.InstanceId, _cfg.AlarmName);
}
}
}
tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureMesReportableTests.cs
+80
View File
@@ -0,0 +1,80 @@
using ZB.MOM.WW.ScadaBridge.CentralUI.Components.Pages.Deployment;
namespace ZB.MOM.WW.ScadaBridge.CentralUI.Tests.Deployment;
/// <summary>
/// MES reportable (tri-state) on the Instance Configure alarm-override editor.
///
/// <para>The instance-level override is a <c>bool?</c>: null means "inherit the
/// template alarm's <c>IsMesReportable</c>", true/false pin it. The modal surfaces
/// that as a three-option select (Inherited / Reportable / Not reportable).</para>
///
/// <para><c>InstanceConfigure</c> is a heavyweight page (~7 injected services with
/// their own graphs), so — consistent with the rest of this suite's coverage of it
/// (see <c>InstanceConfigureListOverrideTests</c>) — the markup half is a structural
/// assertion over the component source. The half that carries the real risk is the
/// save-time delta rule, which is extracted as a pure helper and pinned directly:
/// the page DELETES the override when it sees no delta, so a reportable-only
/// override would be silently dropped on save if the new term were missing.</para>
/// </summary>
public class InstanceConfigureMesReportableTests
{
private static string DeploymentComponentsRoot
{
get
{
var dir = AppContext.BaseDirectory;
for (var i = 0; i < 6 && dir is not null; i++)
dir = Directory.GetParent(dir)?.FullName;
return Path.Combine(dir!, "src", "ZB.MOM.WW.ScadaBridge.CentralUI",
"Components", "Pages", "Deployment");
}
}
private static string InstanceConfigureMarkup
=> File.ReadAllText(Path.Combine(DeploymentComponentsRoot, "InstanceConfigure.razor"));
[Fact]
public void OverrideModal_HasTriStateMesReportableSelect()
{
var markup = InstanceConfigureMarkup;
Assert.Contains("data-test=\"alarm-mes-select\"", markup);
// Three options: Inherited (empty value) / Reportable (true) / Not reportable (false).
var selectStart = markup.IndexOf("data-test=\"alarm-mes-select\"", StringComparison.Ordinal);
var selectEnd = markup.IndexOf("</select>", selectStart, StringComparison.Ordinal);
Assert.True(selectEnd > selectStart, "MES reportable select is not closed.");
var selectBody = markup[selectStart..selectEnd];
var optionCount = selectBody.Split("<option").Length - 1;
Assert.Equal(3, optionCount);
Assert.Contains("value=\"\"", selectBody);
Assert.Contains("value=\"true\"", selectBody);
Assert.Contains("value=\"false\"", selectBody);
}
[Theory]
// The new term: a reportable-only override is a real delta in BOTH directions
// (false is not "no override" — it pins a reportable template alarm off).
[InlineData(null, null, true)]
[InlineData(null, null, false)]
public void HasOverrideDelta_TreatsMesReportableAloneAsADelta(
string? overrideJson, int? priority, bool? mesReportable)
=> Assert.True(InstanceConfigure.HasOverrideDelta(overrideJson, priority, mesReportable));
[Theory]
[InlineData(null, null, null)]
[InlineData("", null, null)]
[InlineData(" ", null, null)]
public void HasOverrideDelta_NothingSet_IsNotADelta(
string? overrideJson, int? priority, bool? mesReportable)
=> Assert.False(InstanceConfigure.HasOverrideDelta(overrideJson, priority, mesReportable));
[Theory]
[InlineData("{\"hi\":70}", null, null)]
[InlineData(null, 750, null)]
public void HasOverrideDelta_ExistingTermsStillCount(
string? overrideJson, int? priority, bool? mesReportable)
=> Assert.True(InstanceConfigure.HasOverrideDelta(overrideJson, priority, mesReportable));
}