Check the Name field.
}
@if (_busy)
@@ -51,11 +58,11 @@
}
-
@(IsRotate ? "Rotate" : "Add")
-
Cancel
@@ -63,6 +70,20 @@
@code {
+ private readonly string _fieldPrefix = $"secret-editor-{Guid.NewGuid():N}";
+ private ElementReference _nameControl;
+ private bool _focusNameError;
+ private string NameId => $"{_fieldPrefix}-name";
+ private string NameHintId => $"{_fieldPrefix}-name-hint";
+ private string NameErrorId => $"{_fieldPrefix}-name-error";
+ private string DescriptionId => $"{_fieldPrefix}-description";
+ private string DescriptionHintId => $"{_fieldPrefix}-description-hint";
+ private string ContentTypeId => $"{_fieldPrefix}-content-type";
+ private string ValueId => $"{_fieldPrefix}-value";
+ private string ValueHintId => $"{_fieldPrefix}-value-hint";
+ private string NameDescriptionIds => string.IsNullOrEmpty(_nameError) ? NameHintId : $"{NameHintId} {NameErrorId}";
+ private string NameHint => IsRotate ? "This name is fixed during rotation." : "Required. Up to 450 characters: letters, numbers, dot, underscore, hyphen and slash. No '..', leading/trailing slash or empty path segment. Letters normalize to lowercase.";
+ private string? _nameError;
private readonly CancellationTokenSource _cts = new();
private CancellationTokenSource? _metadataCts;
private SecretName? _identityName;
@@ -120,6 +141,8 @@
_contentType = SecretContentType.Text;
_value = string.Empty;
_error = null;
+ _nameError = null;
+ _focusNameError = false;
_restoreConfirmedFor = null;
_metadataLoading = false;
_metadataReady = !IsRotate;
@@ -171,6 +194,18 @@
}
}
+ ///
+ protected override async Task OnAfterRenderAsync(bool firstRender)
+ {
+ // Wait until finally has unlocked the controls and the DOM reflects it. Focusing a
+ // disabled input during the submit handler fails in a real host even if markup tests pass.
+ if (_focusNameError && !_busy && !_disposed)
+ {
+ _focusNameError = false;
+ await _nameControl.FocusAsync();
+ }
+ }
+
private async Task SubmitAsync()
{
if (_disposed || _busy || _metadataLoading || !_metadataReady)
@@ -193,6 +228,7 @@
EventCallback savedCallback = OnSaved;
EventCallback
busyCallback = OnBusyChanged;
_error = null;
+ _nameError = null;
_busy = true;
try
{
@@ -214,7 +250,11 @@
}
catch (ArgumentException ex)
{
- if (IsCurrent(generation)) _error = ex.Message;
+ if (IsCurrent(generation))
+ {
+ _nameError = ex.Message;
+ _focusNameError = true;
+ }
return;
}
diff --git a/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/Components/SecretsList.razor b/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/Components/SecretsList.razor
index e84ef66..2c7532a 100644
--- a/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/Components/SecretsList.razor
+++ b/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/Components/SecretsList.razor
@@ -7,7 +7,7 @@
-
+
Add secret
@@ -22,14 +22,27 @@
OnCancelled="() => CloseEditor(editorGeneration)" />
}
-
- @if (_secrets is null)
+
+
+
+ @if (_listError is not null)
{
- Loading…
+
+
@_listError
+
Retry refresh
+
}
- else
+ @if (_outcome is not null)
{
-
+
@_outcome
+ }
+ @if (_loading)
+ {
+
@(_secrets is null ? "Loading secrets…" : "Refreshing secret metadata…")
+ }
+ @if (_secrets is not null)
+ {
+
@@ -68,12 +81,12 @@
@@ -86,16 +99,30 @@
}
+
-
+@{ var deleteGeneration = _deleteGeneration; }
+
@code {
+ private readonly string _id = $"secrets-list-{Guid.NewGuid():N}";
+ private string HeadingId => $"{_id}-heading";
+ private readonly Dictionary
_rowIds = new();
+ private long _deleteGeneration;
+ private bool _deleteBusy;
+ private bool OperationBusy => _editorBusy || _deleteBusy;
private readonly CancellationTokenSource _cts = new();
private IReadOnlyList? _secrets;
+ private CancellationTokenSource? _listCts;
+ private long _loadGeneration;
+ private bool _loading;
+ private string? _listError;
+ private string? _outcome;
private EditorMode _editorMode = EditorMode.None;
private SecretName? _rotateName;
@@ -114,12 +141,50 @@
///
protected override async Task OnInitializedAsync() => await ReloadAsync();
- private async Task ReloadAsync()
- => _secrets = await Store.ListAsync(includeDeleted: false, _cts.Token);
+ private Task RetryAsync() => ReloadAsync();
+
+ private async Task ReloadAsync(bool committed = false)
+ {
+ if (_disposed) return;
+ long generation = ++_loadGeneration;
+ _listCts?.Cancel();
+ _listCts?.Dispose();
+ var readCts = CancellationTokenSource.CreateLinkedTokenSource(_cts.Token);
+ _listCts = readCts;
+ CancellationToken ct = readCts.Token;
+ _loading = true;
+ _listError = null;
+ if (committed) _outcome = null;
+ try
+ {
+ IReadOnlyList rows = await Store.ListAsync(includeDeleted: false, ct);
+ if (!_disposed && generation == _loadGeneration)
+ {
+ _secrets = rows;
+ if (committed) _outcome = "Change saved.";
+ }
+ }
+ catch (OperationCanceledException) when (ct.IsCancellationRequested) { }
+ catch (Exception)
+ {
+ if (!_disposed && generation == _loadGeneration)
+ {
+ _listError = committed
+ ? "Change saved; list refresh failed. Retry refresh only; the change will not be repeated."
+ : "Unable to load secret metadata. Retry refresh.";
+ }
+ }
+ finally
+ {
+ if (!_disposed && generation == _loadGeneration) _loading = false;
+ if (ReferenceEquals(_listCts, readCts)) _listCts = null;
+ readCts.Dispose();
+ }
+ }
private void ShowAdd()
{
- if (_editorBusy || _disposed || _editorMode == EditorMode.Add) return;
+ if (OperationBusy || _disposed || _editorMode == EditorMode.Add) return;
++_editorGeneration;
_rotateName = null;
_editorMode = EditorMode.Add;
@@ -127,7 +192,7 @@
private void ShowRotate(SecretName name)
{
- if (_editorBusy || _disposed || (_editorMode == EditorMode.Rotate && _rotateName == name)) return;
+ if (OperationBusy || _disposed || (_editorMode == EditorMode.Rotate && _rotateName == name)) return;
++_editorGeneration;
_rotateName = name;
_editorMode = EditorMode.Rotate;
@@ -135,7 +200,7 @@
private void CloseEditor(long generation)
{
- if (_editorBusy || _disposed || generation != _editorGeneration) return;
+ if (OperationBusy || _disposed || generation != _editorGeneration) return;
ClearEditor();
}
@@ -152,32 +217,80 @@
if (!_disposed && generation == _editorGeneration)
{
_editorBusy = busy;
+ if (busy) _outcome = null;
}
}
private async Task OnEditorSavedAsync(long generation)
{
if (_disposed || generation != _editorGeneration) return;
- await ReloadAsync();
+ await ReloadAsync(committed: true);
if (!_disposed && generation == _editorGeneration)
{
ClearEditor();
- CloseDelete();
+ ClearDelete();
}
}
+ private string RowActionId(SecretName name)
+ {
+ if (!_rowIds.TryGetValue(name, out string? id))
+ {
+ id = $"{_id}-row-{_rowIds.Count}";
+ _rowIds.Add(name, id);
+ }
+ return id;
+ }
+
+ private string DeleteReturnFocusId()
+ {
+ if (_secrets is null || _deleteTarget is not { } target) return HeadingId;
+ var rows = _secrets.ToList();
+ int index = rows.FindIndex(row => row.Name == target);
+ if (index < 0) return HeadingId;
+ if (index + 1 < rows.Count) return RowActionId(rows[index + 1].Name);
+ if (index > 0) return RowActionId(rows[index - 1].Name);
+ return HeadingId;
+ }
+
private void ShowDelete(SecretName name)
{
- if (!_editorBusy && !_disposed) _deleteTarget = name;
+ if (OperationBusy || _disposed || _deleteTarget == name) return;
+ ++_deleteGeneration;
+ _deleteTarget = name;
}
- private void CloseDelete() => _deleteTarget = null;
-
- private async Task OnMutatedAsync()
+ private void OnDeleteBusyChanged(long generation, bool busy)
{
- CloseEditor(_editorGeneration);
- CloseDelete();
- await ReloadAsync();
+ if (!_disposed && generation == _deleteGeneration)
+ {
+ _deleteBusy = busy;
+ if (busy) _outcome = null;
+ }
+ }
+
+ private void CloseDelete(long generation)
+ {
+ if (_deleteBusy || _disposed || generation != _deleteGeneration) return;
+ ClearDelete();
+ }
+
+ private void ClearDelete()
+ {
+ ++_deleteGeneration;
+ _deleteTarget = null;
+ _deleteBusy = false;
+ }
+
+ private async Task OnDeleteCommittedAsync(long generation)
+ {
+ if (_disposed || generation != _deleteGeneration) return;
+ await ReloadAsync(committed: true);
+ if (!_disposed && generation == _deleteGeneration)
+ {
+ ClearEditor();
+ ClearDelete();
+ }
}
///
@@ -185,6 +298,11 @@
{
_disposed = true;
++_editorGeneration;
+ ++_deleteGeneration;
+ ++_loadGeneration;
+ _listCts?.Cancel();
+ _listCts?.Dispose();
+ _listCts = null;
_cts.Cancel();
_cts.Dispose();
}
diff --git a/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/wwwroot/js/secrets-dialog.js b/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/wwwroot/js/secrets-dialog.js
new file mode 100644
index 0000000..c9ed110
--- /dev/null
+++ b/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/wwwroot/js/secrets-dialog.js
@@ -0,0 +1,101 @@
+// Native top-layer dialog adapter. Each mounted instance owns its trigger and listeners.
+const states = new Map();
+let scrollLocks = 0;
+let previousOverflow;
+const visible = node => {
+ if (!node?.isConnected || !node.getClientRects().length) return false;
+ for (let ancestor = node; ancestor; ancestor = ancestor.parentElement) {
+ const style = getComputedStyle(ancestor);
+ if (ancestor.hidden || ancestor.inert || style.display === 'none' || ['hidden', 'collapse'].includes(style.visibility)) return false;
+ }
+ return true;
+};
+const usable = node => visible(node) && !node.disabled && node.getAttribute('aria-disabled') !== 'true';
+const focusable = dialog => [...dialog.querySelectorAll('button, [href], input, select, textarea, [tabindex]')]
+ .filter(node => usable(node) && node.tabIndex >= 0);
+
+export function open(dialog, safeActionId, dotnet, fallbackId, instanceId) {
+ if (states.has(instanceId)) return;
+ const state = { dialog, trigger: document.activeElement, busy: false, fallbackId };
+ const requestCancel = () => {
+ if (!state.busy) dotnet.invokeMethodAsync('RequestCancelAsync').catch(error => {
+ if (states.has(instanceId)) console.error('Unable to dismiss secrets confirmation.', error);
+ });
+ };
+ state.keydown = event => {
+ if (event.key === 'Escape') {
+ event.preventDefault();
+ requestCancel();
+ } else if (event.key === 'Tab') {
+ const items = focusable(dialog);
+ const first = items[0];
+ const last = items.at(-1);
+ if (!first) { event.preventDefault(); dialog.focus(); }
+ else if (event.shiftKey && (document.activeElement === first || !items.includes(document.activeElement))) {
+ event.preventDefault(); last.focus();
+ } else if (!event.shiftKey && (document.activeElement === last || !items.includes(document.activeElement))) {
+ event.preventDefault(); first.focus();
+ }
+ }
+ };
+ state.cancel = event => { event.preventDefault(); requestCancel(); };
+ states.set(instanceId, state);
+ dialog.addEventListener('keydown', state.keydown);
+ dialog.addEventListener('cancel', state.cancel);
+ let locked = false;
+ try {
+ // showModal provides the top layer and native background inertness without mutating
+ // an ancestor's existing inert attribute or depending on the host's transform styles.
+ dialog.showModal();
+ if (scrollLocks++ === 0) {
+ previousOverflow = document.body.style.overflow;
+ document.body.style.overflow = 'hidden';
+ }
+ locked = true;
+ document.getElementById(safeActionId)?.focus({ preventScroll: true });
+ } catch (error) {
+ dialog.removeEventListener('keydown', state.keydown);
+ dialog.removeEventListener('cancel', state.cancel);
+ states.delete(instanceId);
+ if (dialog.open) dialog.close();
+ if (locked && --scrollLocks === 0) document.body.style.overflow = previousOverflow;
+ throw error;
+ }
+}
+
+export function setBusy(instanceId, busy, fallbackId) {
+ const state = states.get(instanceId);
+ if (state) { state.busy = busy; state.fallbackId = fallbackId; }
+}
+
+export function close(instanceId) {
+ const state = states.get(instanceId);
+ if (!state) return;
+ const dialog = state.dialog;
+ states.delete(instanceId);
+ dialog.removeEventListener('keydown', state.keydown);
+ dialog.removeEventListener('cancel', state.cancel);
+ if (dialog.open) dialog.close();
+ if (--scrollLocks === 0) document.body.style.overflow = previousOverflow;
+ // Blazor can dispose a child before its parent render batch removes the old row and
+ // re-enables adjacent actions. Restore after that actual DOM change, not during disposal.
+ // A bounded observer also handles a slow circuit round trip without a fixed timing guess.
+ let timer;
+ let frame;
+ const observer = new MutationObserver(restore);
+ const cleanup = () => { observer.disconnect(); clearTimeout(timer); cancelAnimationFrame(frame); };
+ function restore() {
+ if (states.has(instanceId)) { cleanup(); return; }
+ for (const target of [state.trigger, document.getElementById(state.fallbackId)]) {
+ if (!usable(target)) continue;
+ const modal = document.querySelector('dialog:modal');
+ if (modal && !modal.contains(target)) { cleanup(); return; }
+ target.focus({ preventScroll: true });
+ // A connected node can still reject focus. Try the logical fallback too.
+ if (document.activeElement === target) { cleanup(); return; }
+ }
+ }
+ observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['disabled', 'aria-disabled', 'inert', 'hidden', 'style', 'class', 'tabindex'] });
+ timer = setTimeout(cleanup, 3000);
+ frame = requestAnimationFrame(restore);
+}
diff --git a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/AuditFailureAfterCommitTests.cs b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/AuditFailureAfterCommitTests.cs
index 5e3c895..10fb87a 100644
--- a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/AuditFailureAfterCommitTests.cs
+++ b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/AuditFailureAfterCommitTests.cs
@@ -17,6 +17,8 @@ namespace ZB.MOM.WW.Secrets.Ui.Tests;
///
public sealed class AuditFailureAfterCommitTests : BunitContext
{
+ public AuditFailureAfterCommitTests() => DialogInterop.Setup(JSInterop);
+
private (RecordingSecretStore Store, CapturingAuditWriter Audit, RecordingCacheInvalidator Cache) Register()
{
var store = new RecordingSecretStore();
diff --git a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ComponentAuthorizationTests.cs b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ComponentAuthorizationTests.cs
index a188b8f..ee2080f 100644
--- a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ComponentAuthorizationTests.cs
+++ b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ComponentAuthorizationTests.cs
@@ -19,6 +19,8 @@ namespace ZB.MOM.WW.Secrets.Ui.Tests;
///
public class ComponentAuthorizationTests : BunitContext
{
+ public ComponentAuthorizationTests() => DialogInterop.Setup(JSInterop);
+
private const string PlainValue = "the-plaintext-value-42";
private (RecordingSecretStore Store, CapturingAuditWriter Audit, FakeCipher Cipher) Setup(params string[] grantedPolicies)
diff --git a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ConfirmDeleteModalTests.cs b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ConfirmDeleteModalTests.cs
index f8b73fe..0a822a0 100644
--- a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ConfirmDeleteModalTests.cs
+++ b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/ConfirmDeleteModalTests.cs
@@ -1,5 +1,8 @@
using Bunit;
using Bunit.TestDoubles;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.JSInterop;
+using System.Collections.Concurrent;
using Microsoft.Extensions.DependencyInjection;
using ZB.MOM.WW.Audit;
using ZB.MOM.WW.Secrets.Abstractions;
@@ -10,11 +13,30 @@ namespace ZB.MOM.WW.Secrets.Ui.Tests;
public class ConfirmDeleteModalTests : BunitContext
{
+ public ConfirmDeleteModalTests() => DialogInterop.Setup(JSInterop);
+
+ [Fact]
+ public void DeleteDialog_HasANameLinkedToTheExactTarget()
+ {
+ Services.AddSingleton(new RecordingSecretStore());
+ Services.AddSingleton(new CapturingAuditWriter());
+ var cut = Render(p => p
+ .Add(x => x.Visible, true).Add(x => x.Name, new SecretName("app/a")));
+ var dialog = cut.Find("[role=dialog]");
+ var titleId = dialog.GetAttribute("aria-labelledby");
+ Assert.False(string.IsNullOrWhiteSpace(titleId));
+ Assert.Contains("app/a", cut.Find($"[id='{titleId}']").TextContent);
+ Assert.Equal("true", dialog.GetAttribute("aria-modal"));
+ var descriptionId = dialog.GetAttribute("aria-describedby");
+ Assert.False(string.IsNullOrWhiteSpace(descriptionId));
+ Assert.Contains("tombstones", cut.Find($"[id='{descriptionId}']").TextContent);
+ }
+
[Fact]
public void ConfirmDeleteModal_IsInPageModal_NoJsDialog()
{
- // Strict JS interop mode: any IJSRuntime call (a JS confirm/alert dialog) would throw,
- // proving the confirmation is a rendered in-page modal, not a browser dialog.
+ // Strict interop permits only the exact DOM-enhancement module configured by the fixture.
+ // Any browser confirm/alert call remains unhandled and fails the test.
JSInterop.Mode = JSRuntimeMode.Strict;
var store = new RecordingSecretStore();
@@ -178,6 +200,177 @@ public class ConfirmDeleteModalTests : BunitContext
Assert.Contains("display: flex", style.TextContent);
}
+ [Fact]
+ public async Task PendingDelete_BlocksCancelEscapeAndDuplicateActivation()
+ {
+ var store = new RecordingSecretStore();
+ Services.AddSingleton(store);
+ Services.AddSingleton(new CapturingAuditWriter());
+ var auth = this.AddAuthorization();
+ auth.SetAuthorized("reviewer");
+ auth.SetPolicies(SecretsAuthorization.ManagePolicy);
+ var entered = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var release = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ store.DeleteOverride = (_, _, _) => { entered.TrySetResult(); return release.Task; };
+ bool cancelled = false;
+ var cut = Render(p => p.Add(x => x.Visible, true)
+ .Add(x => x.Name, new SecretName("app/a")).Add(x => x.OnCancelled, () => cancelled = true));
+ var pending = cut.Find("[data-testid=confirm-delete]").ClickAsync(new MouseEventArgs());
+ await entered.Task;
+ try
+ {
+ Assert.True(cut.Find("[data-testid=cancel-delete]").HasAttribute("disabled"));
+ Assert.Equal("true", cut.Find("[role=dialog]").GetAttribute("aria-busy"));
+ cut.Find("[data-testid=cancel-delete]").Click();
+ await cut.InvokeAsync(() => cut.Instance.RequestCancelAsync());
+ cut.Find("[data-testid=confirm-delete]").Click();
+ Assert.False(cancelled);
+ Assert.Empty(store.Deletes);
+ }
+ finally { release.TrySetResult(); await pending; }
+ Assert.Single(store.Deletes);
+ }
+
+ [Fact]
+ public async Task ForcedTargetChangeAfterDeleteStarts_KeepsCommittedAuditAndCacheOnCapturedTarget()
+ {
+ var store = new RecordingSecretStore();
+ var audit = new CapturingAuditWriter();
+ var cache = new RecordingCacheInvalidator();
+ Services.AddSingleton(store);
+ Services.AddSingleton(audit);
+ Services.AddSingleton(cache);
+ var auth = this.AddAuthorization();
+ auth.SetAuthorized("reviewer");
+ auth.SetPolicies(SecretsAuthorization.ManagePolicy);
+ var entered = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var release = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ store.DeleteOverride = (_, _, _) => { entered.TrySetResult(); return release.Task; };
+ bool deleted = false;
+ var a = new SecretName("app/a");
+ var cut = Render(p => p.Add(x => x.Visible, true)
+ .Add(x => x.Name, a).Add(x => x.OnDeleted, () => deleted = true));
+ var pending = cut.Find("[data-testid=confirm-delete]").ClickAsync(new MouseEventArgs());
+ await entered.Task;
+ try { cut.Render(p => p.Add(x => x.Visible, true).Add(x => x.Name, new SecretName("app/b"))); }
+ finally { release.TrySetResult(); await pending; }
+ Assert.Equal(a, Assert.Single(store.Deletes).Name);
+ Assert.Equal(a.Value, Assert.Single(audit.Events).Target);
+ Assert.Equal(a, Assert.Single(cache.Invalidated));
+ Assert.False(deleted);
+ Assert.Contains("app/b", cut.Find("[role=dialog]").TextContent);
+ }
+
+ [Fact]
+ public async Task DisposalDuringDeferredOpen_ClosesBeforeDisposingTheModule()
+ {
+ RegisterDialogServices();
+ var module = RegisterDeferredModule();
+ var cut = Render(p => p.Add(x => x.Visible, true).Add(x => x.Name, new SecretName("app/a")));
+ await module.OpenEntered.Task;
+ var disposal = cut.InvokeAsync(() => cut.Instance.DisposeAsync().AsTask());
+ var repeatedDisposal = cut.InvokeAsync(() => cut.Instance.DisposeAsync().AsTask());
+ await cut.InvokeAsync(() => Task.CompletedTask); // Let disposal reach the in-flight activation gate.
+ try
+ {
+ Assert.False(disposal.IsCompleted);
+ Assert.False(repeatedDisposal.IsCompleted);
+ Assert.DoesNotContain("dispose", module.Events);
+ }
+ finally { module.OpenRelease.TrySetResult(); }
+ await Task.WhenAll(disposal, repeatedDisposal);
+ Assert.Equal(new[] { "open:start", "open:end", "close", "dispose" }, module.Events);
+ Assert.False(module.Active);
+ }
+
+ [Theory]
+ [InlineData(0)] // target changes while opening
+ [InlineData(1)] // visibility becomes false while opening
+ [InlineData(2)] // false then a newer visible identity while opening
+ public async Task SupersededOpening_CannotCloseANewerVisibleIdentity(int transition)
+ {
+ RegisterDialogServices();
+ var module = RegisterDeferredModule();
+ var cut = Render(p => p.Add(x => x.Visible, true).Add(x => x.Name, new SecretName("app/a")));
+ await module.OpenEntered.Task;
+ if (transition != 0) cut.Render(p => p.Add(x => x.Visible, false).Add(x => x.Name, new SecretName("app/a")));
+ if (transition != 1) cut.Render(p => p.Add(x => x.Visible, true).Add(x => x.Name, new SecretName("app/b")));
+ module.OpenRelease.SetResult();
+ await module.Closed.Task.WaitAsync(TimeSpan.FromSeconds(5));
+ if (transition != 1) await module.SecondOpenCompleted.Task.WaitAsync(TimeSpan.FromSeconds(5));
+ Assert.Equal(1, module.Events.Count(x => x == "close"));
+ Assert.Equal(transition == 1 ? 1 : 2, module.Events.Count(x => x == "open:end"));
+ Assert.Equal(transition != 1, module.Active);
+ if (transition != 1) Assert.Contains("app/b", cut.Find("[role=dialog]").TextContent);
+ else Assert.Empty(cut.FindAll("[role=dialog]"));
+ }
+
+ private void RegisterDialogServices()
+ {
+ Services.AddSingleton(new RecordingSecretStore());
+ Services.AddSingleton(new CapturingAuditWriter());
+ }
+
+ private DeferredDialogModule RegisterDeferredModule()
+ {
+ var module = new DeferredDialogModule();
+ // Exact import only; all other runtime calls remain strict and unhandled.
+ Services.AddSingleton(new StrictDialogRuntime(module));
+ return module;
+ }
+
+ private sealed class StrictDialogRuntime(DeferredDialogModule module) : IJSRuntime
+ {
+ public ValueTask InvokeAsync(string identifier, object?[]? args)
+ => InvokeAsync(identifier, CancellationToken.None, args);
+ public ValueTask InvokeAsync(string identifier, CancellationToken ct, object?[]? args)
+ {
+ if (identifier != "import" || args is not ["./_content/ZB.MOM.WW.Secrets.Ui/js/secrets-dialog.js"] || typeof(TValue) != typeof(IJSObjectReference))
+ throw new JSException($"Unexpected runtime interop: {identifier}");
+ return ValueTask.FromResult((TValue)(object)module);
+ }
+ }
+
+ private sealed class DeferredDialogModule : IJSObjectReference
+ {
+ private readonly ConcurrentQueue _events = new();
+ private bool _disposed;
+ private int _opens;
+ public TaskCompletionSource Closed { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+ public TaskCompletionSource SecondOpenCompleted { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+ public TaskCompletionSource OpenEntered { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+ public TaskCompletionSource OpenRelease { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+ public IReadOnlyList Events => _events.ToArray();
+ public bool Active { get; private set; }
+ public ValueTask InvokeAsync(string identifier, object?[]? args)
+ => InvokeAsync(identifier, CancellationToken.None, args);
+ public async ValueTask InvokeAsync(string identifier, CancellationToken ct, object?[]? args)
+ {
+ if (_disposed) throw new ObjectDisposedException(nameof(DeferredDialogModule));
+ switch (identifier)
+ {
+ case "open":
+ _events.Enqueue("open:start");
+ OpenEntered.TrySetResult();
+ await OpenRelease.Task;
+ Active = true;
+ _events.Enqueue("open:end");
+ if (++_opens == 2) SecondOpenCompleted.TrySetResult();
+ break;
+ case "close": Active = false; _events.Enqueue("close"); Closed.TrySetResult(); break;
+ case "setBusy": _events.Enqueue("setBusy"); break;
+ default: throw new JSException($"Unexpected dialog interop: {identifier}");
+ }
+ return default!;
+ }
+ public ValueTask DisposeAsync()
+ {
+ _events.Enqueue("dispose");
+ _disposed = true;
+ return ValueTask.CompletedTask;
+ }
+ }
+
private IRenderedComponent RenderVisibleModal()
{
Services.AddSingleton(new RecordingSecretStore());
diff --git a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/Fakes/DialogInterop.cs b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/Fakes/DialogInterop.cs
new file mode 100644
index 0000000..d478b93
--- /dev/null
+++ b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/Fakes/DialogInterop.cs
@@ -0,0 +1,14 @@
+using Bunit;
+
+namespace ZB.MOM.WW.Secrets.Ui.Tests.Fakes;
+
+internal static class DialogInterop
+{
+ internal static void Setup(BunitJSInterop js)
+ {
+ var module = js.SetupModule("./_content/ZB.MOM.WW.Secrets.Ui/js/secrets-dialog.js");
+ module.SetupVoid("open", _ => true).SetVoidResult();
+ module.SetupVoid("setBusy", _ => true).SetVoidResult();
+ module.SetupVoid("close", _ => true).SetVoidResult();
+ }
+}
diff --git a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/Fakes/RecordingSecretStore.cs b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/Fakes/RecordingSecretStore.cs
index 24dee90..8249d37 100644
--- a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/Fakes/RecordingSecretStore.cs
+++ b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/Fakes/RecordingSecretStore.cs
@@ -24,6 +24,20 @@ public sealed class RecordingSecretStore : ISecretStore
/// Optional hook awaited before the normal recorded upsert commits.
public Func? UpsertOverride { get; set; }
+ private int _listCalls;
+
+ /// Number of metadata-list requests, including failed/retried reads.
+ public int ListCalls => _listCalls;
+
+ /// Optional metadata listing fault.
+ public Exception? ListFault { get; set; }
+
+ /// Optional controlled metadata read, including fixtures ignoring cancellation.
+ public Func>>? ListOverride { get; set; }
+
+ /// Optional controlled delay before the normal delete commits.
+ public Func? DeleteOverride { get; set; }
+
/// Rows upserted, in call order.
public IReadOnlyList Upserts => _upserts.ToArray();
@@ -66,20 +80,24 @@ public sealed class RecordingSecretStore : ISecretStore
}
///
- public Task DeleteAsync(SecretName name, string? actor, CancellationToken ct)
+ public async Task DeleteAsync(SecretName name, string? actor, CancellationToken ct)
{
+ if (DeleteOverride is not null) await DeleteOverride(name, actor, ct);
if (DeleteFault is not null)
{
throw DeleteFault;
}
_deletes.Enqueue((name, actor));
- return Task.FromResult(_rows.TryRemove(name.Value, out _));
+ return _rows.TryRemove(name.Value, out _);
}
///
public Task> ListAsync(bool includeDeleted, CancellationToken ct)
{
+ Interlocked.Increment(ref _listCalls);
+ if (ListOverride is not null) return ListOverride(includeDeleted, ct);
+ if (ListFault is not null) return Task.FromException>(ListFault);
IReadOnlyList projection = _rows.Values
.Where(r => includeDeleted || !r.IsDeleted)
.Select(r => new SecretMetadata
diff --git a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretEditorTests.cs b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretEditorTests.cs
index 16f317d..fca43f3 100644
--- a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretEditorTests.cs
+++ b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretEditorTests.cs
@@ -439,6 +439,70 @@ public class SecretEditorTests : BunitContext
Assert.Empty(cut.FindAll("[data-testid=editor-error]"));
}
+ [Fact]
+ public void IdleEditor_CanBeCancelledWithoutMutation()
+ {
+ var (store, _, _) = RegisterServices();
+ bool cancelled = false;
+ var cut = Render(p => p.Add(x => x.OnCancelled, () => cancelled = true));
+ Assert.False(cut.Find("[data-testid=editor-cancel]").HasAttribute("disabled"));
+ cut.Find("[data-testid=editor-cancel]").Click();
+ Assert.True(cancelled);
+ Assert.Empty(store.Upserts);
+ }
+
+ [Fact]
+ public void EveryEditorControl_HasAnAssociatedLabel()
+ {
+ RegisterServices();
+ var cut = Render();
+ foreach (var control in cut.FindAll("input:not([type=hidden]),select"))
+ {
+ Assert.False(string.IsNullOrWhiteSpace(control.Id));
+ Assert.NotNull(cut.Find($"label[for='{control.Id}']"));
+ }
+ }
+
+ [Fact]
+ public void TwoEditors_UseUniqueStableIdsAndExistingDescriptions()
+ {
+ RegisterServices();
+ var first = Render();
+ var second = Render();
+ var ids = first.FindAll("input,select").Select(x => x.Id).ToArray();
+ Assert.DoesNotContain(ids, id => string.IsNullOrWhiteSpace(id));
+ Assert.Empty(ids.Intersect(second.FindAll("input,select").Select(x => x.Id)));
+ first.Render();
+ Assert.Equal(ids, first.FindAll("input,select").Select(x => x.Id));
+ foreach (var control in first.FindAll("[aria-describedby]"))
+ foreach (var id in control.GetAttribute("aria-describedby")!.Split(' ', StringSplitOptions.RemoveEmptyEntries))
+ Assert.NotNull(first.Find($"[id='{id}']"));
+ }
+
+ [Fact]
+ public void InvalidName_AssociatesFieldErrorAndClearsInvalidStateOnValidSubmit()
+ {
+ var (store, _, _) = RegisterServices();
+ AuthorizeManager();
+ JSInterop.SetupVoid("Blazor._internal.domWrapper.focus", _ => true).SetVoidResult();
+ var cut = Render();
+ cut.Find("[data-testid=secret-name]").Change("../invalid");
+ cut.Find("[data-testid=secret-value]").Change("synthetic value");
+ cut.Find("[data-testid=editor-submit]").Click();
+ var name = cut.Find("[data-testid=secret-name]");
+ Assert.Equal("true", name.GetAttribute("aria-invalid"));
+ var described = name.GetAttribute("aria-describedby")!.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+ Assert.Equal(2, described.Length);
+ Assert.Contains(described, id => cut.Find($"[id='{id}']").ClassList.Contains("field-error"));
+ Assert.Empty(store.Upserts);
+ Assert.Equal("password", cut.Find("[data-testid=secret-value]").GetAttribute("type"));
+ Assert.Equal("new-password", cut.Find("[data-testid=secret-value]").GetAttribute("autocomplete"));
+ cut.Find("[data-testid=secret-name]").Change("app/valid");
+ cut.Find("[data-testid=editor-submit]").Click();
+ Assert.Null(cut.Find("[data-testid=secret-name]").GetAttribute("aria-invalid"));
+ Assert.Single(store.Upserts);
+ }
+
private sealed class LateResolutionGuardProvider(IServiceProvider inner) : IServiceProvider
{
public bool RejectResolutions { get; set; }
diff --git a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretsListTests.cs b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretsListTests.cs
index b6db548..79a2253 100644
--- a/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretsListTests.cs
+++ b/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/SecretsListTests.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Components;
using Bunit;
using Bunit.TestDoubles;
using Microsoft.Extensions.DependencyInjection;
@@ -12,6 +13,8 @@ namespace ZB.MOM.WW.Secrets.Ui.Tests;
public class SecretsListTests : BunitContext
{
+ public SecretsListTests() => DialogInterop.Setup(JSInterop);
+
private static readonly SecretMetadata SecretOne = new()
{
Name = new SecretName("db/primary"),
@@ -200,6 +203,142 @@ public class SecretsListTests : BunitContext
Assert.Single(store.Upserts);
}
+ [Fact]
+ public void DeletionFocusFallback_SelectsAdjacentRowThenStableHeadingForOneRow()
+ {
+ RegisterEditableStore();
+ var cut = Render();
+ var actions = cut.FindAll(".delete-secret");
+ var firstName = actions[0].GetAttribute("data-secret-name");
+ var nextId = actions[1].Id;
+ actions[0].Click();
+ Assert.Equal(nextId, cut.FindComponent().Instance.ReturnFocusId);
+ cut.Find("[data-testid=confirm-delete]").Click();
+ Assert.Single(cut.FindAll(".delete-secret"));
+ Assert.DoesNotContain(cut.FindAll(".delete-secret"), action => action.GetAttribute("data-secret-name") == firstName);
+ cut.Find(".delete-secret").Click();
+ Assert.Equal(cut.Find("h2").Id, cut.FindComponent().Instance.ReturnFocusId);
+ }
+
+ [Fact]
+ public void InitialListFailure_IsRetryableAndIsNotAnEmptyInventory()
+ {
+ var store = RegisterEditableStore();
+ store.ListFault = new IOException("synthetic outage");
+ var cut = Render();
+ Assert.NotNull(cut.Find("[data-testid=list-error]"));
+ Assert.DoesNotContain("No secrets.", cut.Markup);
+ store.ListFault = null;
+ cut.Find("[data-testid=list-retry]").Click();
+ Assert.Equal(2, store.ListCalls);
+ Assert.Empty(cut.FindAll("[data-testid=list-error]"));
+ Assert.NotEmpty(cut.FindAll("tbody tr"));
+ Assert.Empty(store.Upserts);
+ Assert.Empty(store.Deletes);
+ }
+
+ [Fact]
+ public void DelayedInitialMetadata_IsLoadingUntilTheReadCompletes()
+ {
+ var store = RegisterEditableStore();
+ var result = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously);
+ store.ListOverride = (_, _) => result.Task;
+ var cut = Render();
+ Assert.NotNull(cut.Find("[data-testid=list-loading]"));
+ Assert.DoesNotContain("No secrets.", cut.Markup);
+ result.SetResult([SecretOne]);
+ cut.WaitForAssertion(() => Assert.Single(cut.FindAll("tbody tr")));
+ Assert.Empty(cut.FindAll("[data-testid=list-loading]"));
+ }
+
+ [Fact]
+ public void CommittedSaveAndFailedRefresh_ClosesEditorAndRetriesOnlyMetadata()
+ {
+ var store = RegisterEditableStore();
+ var cut = Render();
+ cut.Find(".rotate-secret[data-secret-name='db/primary']").Click();
+ cut.Find("[data-testid=secret-value]").Change("synthetic replacement");
+ store.ListFault = new IOException("synthetic refresh outage");
+ cut.Find("[data-testid=editor-submit]").Click();
+ Assert.Single(store.Upserts);
+ Assert.Empty(cut.FindComponents());
+ Assert.Contains("Change saved; list refresh failed", cut.Find("[data-testid=list-error]").TextContent);
+ Assert.Equal(2, cut.FindAll("tbody tr").Count); // Keep previously visible metadata.
+ store.ListFault = null;
+ cut.Find("[data-testid=list-retry]").Click();
+ Assert.Empty(cut.FindAll("[data-testid=list-error]"));
+ Assert.Single(store.Upserts); // Retrying a read cannot replay the committed write.
+ Assert.Empty(store.Deletes);
+ }
+
+ [Fact]
+ public void CommittedDeleteAndFailedRefresh_RetryDoesNotDeleteTwice()
+ {
+ var store = RegisterEditableStore();
+ var cut = Render();
+ cut.Find(".delete-secret[data-secret-name='db/primary']").Click();
+ store.ListFault = new IOException("synthetic refresh outage");
+ cut.Find("[data-testid=confirm-delete]").Click();
+ Assert.Single(store.Deletes);
+ Assert.Empty(cut.FindAll("[role=dialog]"));
+ Assert.Contains("Change saved; list refresh failed", cut.Find("[data-testid=list-error]").TextContent);
+ store.ListFault = null;
+ cut.Find("[data-testid=list-retry]").Click();
+ Assert.Single(store.Deletes);
+ Assert.Empty(store.Upserts);
+ Assert.Single(cut.FindAll("tbody tr"));
+ Assert.Empty(cut.FindAll("[data-testid=list-error]"));
+ }
+
+ [Theory]
+ [InlineData(false)]
+ [InlineData(true)]
+ public void NewFailedMutation_DoesNotRetainThePreviousSavesSuccess(bool delete)
+ {
+ var store = RegisterEditableStore();
+ var cut = Render();
+ cut.Find(".rotate-secret[data-secret-name='db/primary']").Click();
+ cut.Find("[data-testid=secret-value]").Change("synthetic first value");
+ cut.Find("[data-testid=editor-submit]").Click();
+ Assert.Contains("Change saved.", cut.Find("[data-testid=list-outcome]").TextContent);
+ int reads = store.ListCalls;
+ if (delete)
+ {
+ store.DeleteFault = new IOException("synthetic second mutation failure");
+ cut.Find(".delete-secret[data-secret-name='api/token']").Click();
+ cut.Find("[data-testid=confirm-delete]").Click();
+ Assert.NotNull(cut.Find("[data-testid=delete-error]"));
+ }
+ else
+ {
+ store.UpsertFault = new IOException("synthetic second mutation failure");
+ cut.Find(".rotate-secret[data-secret-name='api/token']").Click();
+ cut.Find("[data-testid=secret-value]").Change("synthetic second value");
+ cut.Find("[data-testid=editor-submit]").Click();
+ Assert.NotNull(cut.Find("[data-testid=editor-error]"));
+ }
+ Assert.Empty(cut.FindAll("[data-testid=list-outcome]"));
+ Assert.Single(store.Upserts);
+ Assert.Empty(store.Deletes);
+ Assert.Equal(reads, store.ListCalls);
+ Assert.Equal(2, cut.FindAll("tbody tr").Count);
+ }
+
+ [Fact]
+ public void RemovingList_CancelsReadAndIgnoresItsLateCompletion()
+ {
+ var store = RegisterEditableStore();
+ var result = new TaskCompletionSource>(TaskCreationOptions.RunContinuationsAsynchronously);
+ CancellationToken token = default;
+ store.ListOverride = (_, ct) => { token = ct; return result.Task; };
+ RenderFragment list = builder => { builder.OpenComponent(0); builder.CloseComponent(); };
+ var cut = Render>(p => p.Add(x => x.Value, true).AddChildContent(list));
+ cut.Render(p => p.Add(x => x.Value, true).AddChildContent((RenderFragment)(_ => { })));
+ Assert.True(token.IsCancellationRequested);
+ result.SetResult([SecretOne]); // A non-cooperative read must not recreate the removed UI.
+ Assert.Empty(cut.FindAll("table"));
+ }
+
private RecordingSecretStore RegisterEditableStore()
{
var store = new RecordingSecretStore();
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-after.log b/components/ui-theme/validation/secrets-ui/SEC02-04-after.log
new file mode 100644
index 0000000..daf9bc5
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-after.log
@@ -0,0 +1,11 @@
+ Determining projects to restore...
+ All projects are up-to-date for restore.
+ ZB.MOM.WW.Secrets.Abstractions -> /Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Abstractions/bin/Release/net10.0/ZB.MOM.WW.Secrets.Abstractions.dll
+ ZB.MOM.WW.Secrets.Ui -> /Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/ZB.MOM.WW.Secrets/src/ZB.MOM.WW.Secrets.Ui/bin/Release/net10.0/ZB.MOM.WW.Secrets.Ui.dll
+ ZB.MOM.WW.Secrets.Ui.Tests -> /Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/bin/Release/net10.0/ZB.MOM.WW.Secrets.Ui.Tests.dll
+Test run for /Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/ZB.MOM.WW.Secrets/tests/ZB.MOM.WW.Secrets.Ui.Tests/bin/Release/net10.0/ZB.MOM.WW.Secrets.Ui.Tests.dll (.NETCoreApp,Version=v10.0)
+A total of 1 test files matched the specified pattern.
+WARNING: Overwriting results file: /Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/components/ui-theme/validation/secrets-ui/SEC02-04-after.trx
+Results File: /Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/components/ui-theme/validation/secrets-ui/SEC02-04-after.trx
+
+Passed! - Failed: 0, Passed: 69, Skipped: 0, Total: 69, Duration: 258 ms - ZB.MOM.WW.Secrets.Ui.Tests.dll (net10.0)
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-after.trx b/components/ui-theme/validation/secrets-ui/SEC02-04-after.trx
new file mode 100644
index 0000000..bf18cae
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-after.trx
@@ -0,0 +1,442 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-browser-before-focus-fix.json b/components/ui-theme/validation/secrets-ui/SEC02-04-browser-before-focus-fix.json
new file mode 100644
index 0000000..581d054
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-browser-before-focus-fix.json
@@ -0,0 +1,182 @@
+[
+ {
+ "origin": "http://127.0.0.1:53202",
+ "checks": [
+ {
+ "name": "Label activates Name",
+ "pass": true
+ },
+ {
+ "name": "Invalid field receives focus",
+ "pass": true
+ },
+ {
+ "name": "Invalid name has existing hint/error associations",
+ "pass": true
+ },
+ {
+ "name": "Initial Cancel focus",
+ "pass": true
+ },
+ {
+ "name": "Forward Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Reverse Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Native background isolation",
+ "pass": true
+ },
+ {
+ "name": "Cancel restores trigger focus",
+ "pass": true
+ },
+ {
+ "name": "Cancel does not delete",
+ "pass": true
+ },
+ {
+ "name": "Failed deletion retains exact-target dialog",
+ "pass": true
+ },
+ {
+ "name": "Busy Escape stays open",
+ "pass": true
+ },
+ {
+ "name": "Busy Cancel disabled",
+ "pass": true
+ },
+ {
+ "name": "Busy parent target switching disabled",
+ "pass": true
+ },
+ {
+ "name": "Removed trigger focuses adjacent row",
+ "pass": false
+ },
+ {
+ "name": "Scroll lock restored",
+ "pass": true
+ },
+ {
+ "name": "Committed save is distinct from refresh failure",
+ "pass": true
+ },
+ {
+ "name": "Retry reads metadata only",
+ "pass": true
+ },
+ {
+ "name": "Manage-only principal cannot reveal",
+ "pass": true
+ },
+ {
+ "name": "Denied principal rejected at route",
+ "pass": true
+ },
+ {
+ "name": "No page errors",
+ "pass": true
+ }
+ ],
+ "failures": [
+ "Removed trigger focuses adjacent row"
+ ],
+ "errors": [],
+ "errorInk": "rgb(180, 33, 33)"
+ },
+ {
+ "origin": "http://127.0.0.1:53233",
+ "checks": [
+ {
+ "name": "Label activates Name",
+ "pass": true
+ },
+ {
+ "name": "Invalid field receives focus",
+ "pass": true
+ },
+ {
+ "name": "Invalid name has existing hint/error associations",
+ "pass": true
+ },
+ {
+ "name": "Initial Cancel focus",
+ "pass": true
+ },
+ {
+ "name": "Forward Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Reverse Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Native background isolation",
+ "pass": true
+ },
+ {
+ "name": "Cancel restores trigger focus",
+ "pass": true
+ },
+ {
+ "name": "Cancel does not delete",
+ "pass": true
+ },
+ {
+ "name": "Failed deletion retains exact-target dialog",
+ "pass": true
+ },
+ {
+ "name": "Busy Escape stays open",
+ "pass": true
+ },
+ {
+ "name": "Busy Cancel disabled",
+ "pass": true
+ },
+ {
+ "name": "Busy parent target switching disabled",
+ "pass": true
+ },
+ {
+ "name": "Removed trigger focuses adjacent row",
+ "pass": false
+ },
+ {
+ "name": "Scroll lock restored",
+ "pass": true
+ },
+ {
+ "name": "Committed save is distinct from refresh failure",
+ "pass": true
+ },
+ {
+ "name": "Retry reads metadata only",
+ "pass": true
+ },
+ {
+ "name": "Manage-only principal cannot reveal",
+ "pass": true
+ },
+ {
+ "name": "Denied principal rejected at route",
+ "pass": true
+ },
+ {
+ "name": "No page errors",
+ "pass": true
+ }
+ ],
+ "failures": [
+ "Removed trigger focuses adjacent row"
+ ],
+ "errors": [],
+ "errorInk": "rgb(180, 33, 33)"
+ }
+]
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-browser-final.json b/components/ui-theme/validation/secrets-ui/SEC02-04-browser-final.json
new file mode 100644
index 0000000..9e940a7
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-browser-final.json
@@ -0,0 +1,178 @@
+[
+ {
+ "origin": "http://127.0.0.1:53202",
+ "checks": [
+ {
+ "name": "Label activates Name",
+ "pass": true
+ },
+ {
+ "name": "Invalid field receives focus",
+ "pass": true
+ },
+ {
+ "name": "Invalid name has existing hint/error associations",
+ "pass": true
+ },
+ {
+ "name": "Initial Cancel focus",
+ "pass": true
+ },
+ {
+ "name": "Forward Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Reverse Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Native background isolation",
+ "pass": true
+ },
+ {
+ "name": "Cancel restores trigger focus",
+ "pass": true
+ },
+ {
+ "name": "Cancel does not delete",
+ "pass": true
+ },
+ {
+ "name": "Failed deletion retains exact-target dialog",
+ "pass": true
+ },
+ {
+ "name": "Busy Escape stays open",
+ "pass": true
+ },
+ {
+ "name": "Busy Cancel disabled",
+ "pass": true
+ },
+ {
+ "name": "Busy parent target switching disabled",
+ "pass": true
+ },
+ {
+ "name": "Removed trigger focuses adjacent row",
+ "pass": true
+ },
+ {
+ "name": "Scroll lock restored",
+ "pass": true
+ },
+ {
+ "name": "Committed save is distinct from refresh failure",
+ "pass": true
+ },
+ {
+ "name": "Retry reads metadata only",
+ "pass": true
+ },
+ {
+ "name": "Manage-only principal cannot reveal",
+ "pass": true
+ },
+ {
+ "name": "Denied principal rejected at route",
+ "pass": true
+ },
+ {
+ "name": "No page errors",
+ "pass": true
+ }
+ ],
+ "failures": [],
+ "errors": [],
+ "errorInk": "rgb(180, 33, 33)"
+ },
+ {
+ "origin": "http://127.0.0.1:53233",
+ "checks": [
+ {
+ "name": "Label activates Name",
+ "pass": true
+ },
+ {
+ "name": "Invalid field receives focus",
+ "pass": true
+ },
+ {
+ "name": "Invalid name has existing hint/error associations",
+ "pass": true
+ },
+ {
+ "name": "Initial Cancel focus",
+ "pass": true
+ },
+ {
+ "name": "Forward Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Reverse Tab wraps",
+ "pass": true
+ },
+ {
+ "name": "Native background isolation",
+ "pass": true
+ },
+ {
+ "name": "Cancel restores trigger focus",
+ "pass": true
+ },
+ {
+ "name": "Cancel does not delete",
+ "pass": true
+ },
+ {
+ "name": "Failed deletion retains exact-target dialog",
+ "pass": true
+ },
+ {
+ "name": "Busy Escape stays open",
+ "pass": true
+ },
+ {
+ "name": "Busy Cancel disabled",
+ "pass": true
+ },
+ {
+ "name": "Busy parent target switching disabled",
+ "pass": true
+ },
+ {
+ "name": "Removed trigger focuses adjacent row",
+ "pass": true
+ },
+ {
+ "name": "Scroll lock restored",
+ "pass": true
+ },
+ {
+ "name": "Committed save is distinct from refresh failure",
+ "pass": true
+ },
+ {
+ "name": "Retry reads metadata only",
+ "pass": true
+ },
+ {
+ "name": "Manage-only principal cannot reveal",
+ "pass": true
+ },
+ {
+ "name": "Denied principal rejected at route",
+ "pass": true
+ },
+ {
+ "name": "No page errors",
+ "pass": true
+ }
+ ],
+ "failures": [],
+ "errors": [],
+ "errorInk": "rgb(180, 33, 33)"
+ }
+]
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-browser-initial-fixture.json b/components/ui-theme/validation/secrets-ui/SEC02-04-browser-initial-fixture.json
new file mode 100644
index 0000000..19a9921
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-browser-initial-fixture.json
@@ -0,0 +1,18 @@
+[
+ {
+ "origin": "http://127.0.0.1:52992",
+ "checks": [],
+ "failures": [
+ "Error: locator.click: Error: strict mode violation: getByText('Name', { exact: true }) resolved to 2 elements:\n 1) aka locator('label').filter({ hasText: 'Name' })\n 2) Name | aka getByRole('columnheader', { name: 'Name' })\n\nCall log:\n - waiting for getByText('Name', { exact: true })\n"
+ ],
+ "errors": []
+ },
+ {
+ "origin": "http://127.0.0.1:53025",
+ "checks": [],
+ "failures": [
+ "TimeoutError: locator.waitFor: Timeout 30000ms exceeded.\nCall log:\n - waiting for getByTestId('secret-name') to be visible\n"
+ ],
+ "errors": []
+ }
+]
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-browser.js b/components/ui-theme/validation/secrets-ui/SEC02-04-browser.js
new file mode 100644
index 0000000..6f2dc43
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-browser.js
@@ -0,0 +1,71 @@
+async (page) => {
+ const context = await page.context().browser().newContext({ viewport: { width: 1440, height: 1000 } });
+ const results = [];
+ try {
+ for (const origin of ['http://127.0.0.1:53202', 'http://127.0.0.1:53233']) {
+ const p = await context.newPage(); p.setDefaultTimeout(7000);
+ const row = { origin, checks: [], failures: [], errors: [] };
+ p.on('pageerror', e => row.errors.push(e.message));
+ const check = (name, pass) => { row.checks.push({ name, pass: !!pass }); if (!pass) row.failures.push(name); };
+ const faults = async data => { const r = await p.request.post(origin + '/fixture/faults', { data }); if (r.status() !== 204) throw Error('Fixture fault response ' + r.status()); };
+ const counts = async () => (await p.request.get(origin + '/fixture/counts')).json();
+ const focused = async id => {
+ try { await p.waitForFunction(id => document.activeElement?.id === id, id, { timeout: 2000 }); return true; } catch { return false; }
+ };
+ try {
+ await p.goto(origin + '/admin/secrets');
+ await p.locator('[data-fixture-ready=true]').waitFor();
+ const initialCounts = await counts();
+ await p.getByTestId('add-secret').click();
+ const name = p.getByTestId('secret-name'); await name.waitFor();
+ await p.locator('label').filter({ hasText: /^Name$/ }).click();
+ check('Label activates Name', await name.evaluate(n => n === document.activeElement));
+ await name.fill('../invalid'); await p.getByTestId('secret-value').fill('synthetic input');
+ await p.getByTestId('editor-submit').click();
+ await name.locator('xpath=..').locator('.field-error').waitFor();
+ check('Invalid field receives focus', await focused(await name.getAttribute('id')));
+ check('Invalid name has existing hint/error associations', await name.evaluate(n => n.getAttribute('aria-invalid') === 'true' && n.getAttribute('aria-describedby').split(' ').every(id => document.getElementById(id))));
+ row.errorInk = await name.locator('xpath=..').locator('.field-error').evaluate(n => getComputedStyle(n).color);
+ await p.getByTestId('editor-cancel').click(); await name.waitFor({ state: 'hidden' });
+ const trigger = p.locator('.delete-secret').first(); const triggerId = await trigger.getAttribute('id'); const triggerName = await trigger.getAttribute('data-secret-name');
+ await trigger.click(); await p.locator('dialog:modal').waitFor();
+ check('Initial Cancel focus', await focused(await p.getByTestId('cancel-delete').getAttribute('id')));
+ await p.keyboard.press('Tab'); check('Forward Tab wraps', await p.getByTestId('confirm-delete').evaluate(n => n === document.activeElement));
+ await p.keyboard.press('Shift+Tab'); check('Reverse Tab wraps', await p.getByTestId('cancel-delete').evaluate(n => n === document.activeElement));
+ await p.getByTestId('add-secret').evaluate(n => n.focus());
+ check('Native background isolation', await p.locator('dialog').evaluate(n => n.contains(document.activeElement)));
+ await p.keyboard.press('Escape'); await p.locator('dialog').waitFor({ state: 'hidden' });
+ check('Cancel restores trigger focus', await focused(triggerId));
+ check('Cancel does not delete', (await counts()).deletes === initialCounts.deletes);
+ await faults({ write: true }); await p.locator('.delete-secret').first().click();
+ await p.getByTestId('confirm-delete').click(); await p.getByTestId('delete-error').waitFor();
+ check('Failed deletion retains exact-target dialog', await p.locator('dialog:modal').count() === 1 && (await p.locator('dialog h3').innerText()).includes(triggerName));
+ await p.keyboard.press('Escape'); await p.locator('dialog').waitFor({ state: 'hidden' });
+ await faults({ delayMs: 800 });
+ const nextId = await p.locator('.delete-secret').nth(1).getAttribute('id');
+ await p.locator('.delete-secret').first().click(); await p.getByTestId('confirm-delete').click();
+ await p.waitForFunction(() => document.querySelector('dialog')?.getAttribute('aria-busy') === 'true');
+ await p.keyboard.press('Escape');
+ check('Busy Escape stays open', await p.locator('dialog:modal').count() === 1);
+ check('Busy Cancel disabled', await p.getByTestId('cancel-delete').isDisabled());
+ check('Busy parent target switching disabled', await p.getByTestId('add-secret').isDisabled());
+ await p.locator('dialog').waitFor({ state: 'hidden' });
+ check('Removed trigger focuses adjacent row', await focused(nextId));
+ check('Scroll lock restored', await p.evaluate(() => document.body.style.overflow !== 'hidden'));
+ await faults({}); await p.locator('.rotate-secret').first().click();
+ await p.getByTestId('secret-value').fill('synthetic replacement'); await faults({ list: true });
+ await p.getByTestId('editor-submit').click(); await p.getByTestId('list-error').waitFor();
+ check('Committed save is distinct from refresh failure', (await p.getByTestId('list-error').innerText()).includes('Change saved; list refresh failed'));
+ const before = await counts(); await faults({}); await p.getByTestId('list-retry').click();
+ await p.getByTestId('list-error').waitFor({ state: 'hidden' }); const after = await counts();
+ check('Retry reads metadata only', before.upserts === initialCounts.upserts + 1 && after.upserts === before.upserts && after.deletes === initialCounts.deletes + 1 && after.lists > before.lists);
+ await p.goto(origin + '/admin/secrets?role=manage'); await p.locator('[data-fixture-ready=true]').waitFor();
+ check('Manage-only principal cannot reveal', await p.getByTestId('reveal-button').count() === 0);
+ check('Denied principal rejected at route', (await p.request.get(origin + '/admin/secrets?role=denied')).status() === 403);
+ check('No page errors', row.errors.length === 0);
+ } catch (e) { row.failures.push(String(e)); }
+ results.push(row); await p.close();
+ }
+ } finally { await context.close(); }
+ return results;
+}
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-fixture-source-hashes.json b/components/ui-theme/validation/secrets-ui/SEC02-04-fixture-source-hashes.json
new file mode 100644
index 0000000..0724ca6
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-fixture-source-hashes.json
@@ -0,0 +1,10 @@
+{
+ "OtOpcUaPerPageWrapper": {
+ "path": "/Users/dohertj2/Desktop/OtOpcUa/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/SecretsAdmin.razor",
+ "sha256": "3443baf0e4500187e9c911b954e1185ef902bd0600802b6edd0b9fb9d098d91c"
+ },
+ "Bootstrap": {
+ "path": "/Users/dohertj2/Desktop/ScadaBridge/src/ZB.MOM.WW.ScadaBridge.Host/wwwroot/lib/bootstrap/css/bootstrap.min.css",
+ "sha256": "3c8f27e6009ccfd710a905e6dcf12d0ee3c6f2ac7da05b0572d3e0d12e736fc8"
+ }
+}
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-host-provenance.json b/components/ui-theme/validation/secrets-ui/SEC02-04-host-provenance.json
new file mode 100644
index 0000000..7a6a683
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-host-provenance.json
@@ -0,0 +1,21 @@
+{
+ "browser": "157.0.8103.78",
+ "hosts": [
+ {
+ "origin": "http://127.0.0.1:53202",
+ "purpose": "Loopback synthetic Secrets UI acceptance fixture; not a production host",
+ "theme": "1.0.0.0",
+ "ui": "0.6.6.0",
+ "store": "In-memory fake only; no keys, LDAP, SQL, network services or production credentials",
+ "bootstrap": "/Users/dohertj2/Desktop/ScadaBridge/src/ZB.MOM.WW.ScadaBridge.Host/wwwroot/lib/bootstrap/css"
+ },
+ {
+ "origin": "http://127.0.0.1:53233",
+ "purpose": "Loopback synthetic Secrets UI acceptance fixture; not a production host",
+ "theme": "1.0.0.0",
+ "ui": "0.6.6.0",
+ "store": "In-memory fake only; no keys, LDAP, SQL, network services or production credentials",
+ "bootstrap": "/Users/dohertj2/Desktop/ScadaBridge/src/ZB.MOM.WW.ScadaBridge.Host/wwwroot/lib/bootstrap/css"
+ }
+ ]
+}
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04-test-identities.json b/components/ui-theme/validation/secrets-ui/SEC02-04-test-identities.json
new file mode 100644
index 0000000..8cf9287
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04-test-identities.json
@@ -0,0 +1,27 @@
+{
+ "before": 50,
+ "after": 69,
+ "added": [
+ "ZB.MOM.WW.Secrets.Ui.Tests.ConfirmDeleteModalTests.DeleteDialog_HasANameLinkedToTheExactTarget",
+ "ZB.MOM.WW.Secrets.Ui.Tests.ConfirmDeleteModalTests.DisposalDuringDeferredOpen_ClosesBeforeDisposingTheModule",
+ "ZB.MOM.WW.Secrets.Ui.Tests.ConfirmDeleteModalTests.ForcedTargetChangeAfterDeleteStarts_KeepsCommittedAuditAndCacheOnCapturedTarget",
+ "ZB.MOM.WW.Secrets.Ui.Tests.ConfirmDeleteModalTests.PendingDelete_BlocksCancelEscapeAndDuplicateActivation",
+ "ZB.MOM.WW.Secrets.Ui.Tests.ConfirmDeleteModalTests.SupersededOpening_CannotCloseANewerVisibleIdentity(transition: 0)",
+ "ZB.MOM.WW.Secrets.Ui.Tests.ConfirmDeleteModalTests.SupersededOpening_CannotCloseANewerVisibleIdentity(transition: 1)",
+ "ZB.MOM.WW.Secrets.Ui.Tests.ConfirmDeleteModalTests.SupersededOpening_CannotCloseANewerVisibleIdentity(transition: 2)",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretEditorTests.EveryEditorControl_HasAnAssociatedLabel",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretEditorTests.IdleEditor_CanBeCancelledWithoutMutation",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretEditorTests.InvalidName_AssociatesFieldErrorAndClearsInvalidStateOnValidSubmit",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretEditorTests.TwoEditors_UseUniqueStableIdsAndExistingDescriptions",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.CommittedDeleteAndFailedRefresh_RetryDoesNotDeleteTwice",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.CommittedSaveAndFailedRefresh_ClosesEditorAndRetriesOnlyMetadata",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.DelayedInitialMetadata_IsLoadingUntilTheReadCompletes",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.DeletionFocusFallback_SelectsAdjacentRowThenStableHeadingForOneRow",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.InitialListFailure_IsRetryableAndIsNotAnEmptyInventory",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.NewFailedMutation_DoesNotRetainThePreviousSavesSuccess(delete: False)",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.NewFailedMutation_DoesNotRetainThePreviousSavesSuccess(delete: True)",
+ "ZB.MOM.WW.Secrets.Ui.Tests.SecretsListTests.RemovingList_CancelsReadAndIgnoresItsLateCompletion"
+ ],
+ "removed": [],
+ "changedOutcomes": {}
+}
diff --git a/components/ui-theme/validation/secrets-ui/SEC02-04.md b/components/ui-theme/validation/secrets-ui/SEC02-04.md
new file mode 100644
index 0000000..7d3a029
--- /dev/null
+++ b/components/ui-theme/validation/secrets-ui/SEC02-04.md
@@ -0,0 +1,33 @@
+# SEC-02–04 review checkpoint
+
+Managed worktree `codex/scada-ui-consistency`, after SEC-01 `f07bd3c` and accepted G1. No release/version changes beyond exact Theme package adoption; no deployment or real-secret activity.
+
+## Implemented contracts
+
+**SEC-02:** central Theme reference `0.2.0` → exact `1.0.0`. Every editor control has a stable per-instance ID and visible associated label. Name and value hints, optional non-credential description guidance, field-local invalid-name error IDs and conditional `aria-invalid`/`aria-describedby` use the Theme API. Password/new-password behavior preserved. Invalid-name focus occurs after the controls have been re-enabled and rendered, verified with real keyboard/browser state. Required-name help documents existing normalization/450-character constraints, without changing validation rules. BusyText and caller-disabled states are separated; idle Cancel remains operable. General errors announce only non-sensitive outcomes.
+
+**SEC-03:** namespaced native `