diff --git a/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor b/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor index df7fcaa..7159c9c 100644 --- a/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor +++ b/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor @@ -71,19 +71,51 @@ else + var visibleCount = _snapshot.Applications.Sum(application => VisibleInstances(application, now).Count); +
+
+ + +
+ @if (_attentionOnly) + { + Clear filter + } + Showing @visibleCount of @_instances.Count instances +
+

Includes stale readings and leader disagreement. Fleet totals above include every instance.

+ @if (_instances.Count(instance => instance.Status is null) is var pending && pending > 0) + { +

@pending pending observation@(pending == 1 ? "" : "s") · not yet classified

+ } + @_filterOutcome + @if (_attentionOnly && visibleCount == 0) + { +
+ No matching instances in this attention view. Clear the filter to see healthy and pending observations. +
+ } + @foreach (var application in _snapshot.Applications) { -
+ var visibleInstances = VisibleInstances(application, now); + if (_attentionOnly && visibleInstances.Count == 0) { continue; } +

@application.Name

@RollupLabel(application, now) - @AppMeta(application) + @AppMeta(application)@(_attentionOnly ? $" · showing {visibleInstances.Count}" : null)
@foreach (var group in Layout(application)) { -
+ var visibleGroup = group.Where(instance => MatchesAttention(application, instance, now)).ToList(); + if (_attentionOnly && visibleGroup.Count == 0) { continue; } +
@if (group.Key is { } groupName) { var state = application.GroupFor(groupName); @@ -105,13 +137,13 @@ else Split brain · @string.Join(" vs ", state.ReportedLeaders) } - @GroupMeta(group, now) + @GroupMeta(group, now)@(_attentionOnly ? $" · showing {visibleGroup.Count}" : null)
}
- @foreach (var instance in group) + @foreach (var instance in visibleGroup) { - } @@ -134,6 +166,10 @@ else private IReadOnlyList _instances = []; private bool _paused; private string _viewOutcome = string.Empty; + private bool _attentionOnly; + private string _filterOutcome = string.Empty; + private bool _focusAttentionFilter; + private ElementReference _attentionFilterRef; private ITimer? _timer; protected override void OnInitialized() @@ -143,7 +179,7 @@ else _timer = Time.CreateTimer(_ => InvokeAsync(StateHasChanged), null, UiTick, UiTick); } - private void OnSnapshotChanged(OverviewSnapshot snapshot) + private void OnSnapshotChanged(OverviewSnapshot _) { // Pause stops ADOPTING new snapshots; the poller keeps sweeping. That is what makes the // pause useful — the frozen view then visibly ages into Stale, so a paused dashboard can @@ -153,7 +189,10 @@ else InvokeAsync(() => { - Adopt(snapshot); + // A publication can queue before Pause/Resume. Read the latest cache here, + // rather than replaying an older event after Resume adopted a newer snapshot. + if (_paused) return; + Adopt(Store.Current); StateHasChanged(); }); } @@ -175,6 +214,38 @@ else Adopt(Store.Current); } + private bool MatchesAttention(ApplicationSnapshot application, InstanceSnapshot instance, DateTimeOffset now) => + !_attentionOnly || instance.IsStale(now) + || instance.Status is InstanceStatus.Down or InstanceStatus.Degraded or InstanceStatus.Unreachable + || (instance.Group is { } group && application.GroupFor(group)?.Disagreement == true); + + private List VisibleInstances(ApplicationSnapshot application, DateTimeOffset now) => + application.Instances.Where(instance => MatchesAttention(application, instance, now)).ToList(); + + private void OnAttentionFilterChanged() + { + var now = Time.GetUtcNow(); + var visible = _snapshot.Applications.Sum(application => VisibleInstances(application, now).Count); + _filterOutcome = _attentionOnly + ? $"Attention view enabled. Showing {visible} of {_instances.Count} instances." + : $"Showing all {_instances.Count} instances."; + } + + private void ClearAttentionFilter() + { + _attentionOnly = false; + OnAttentionFilterChanged(); + _focusAttentionFilter = true; + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (!_focusAttentionFilter) return; + _focusAttentionFilter = false; + try { await _attentionFilterRef.FocusAsync(); } + catch (Microsoft.JSInterop.JSDisconnectedException) { } + } + private int Count(DateTimeOffset now, InstanceStatus status) => _instances.Count(i => i.Status == status && !i.IsStale(now)); @@ -186,9 +257,9 @@ else { var generated = _snapshot.GeneratedUtc == default ? "never" - : _snapshot.GeneratedUtc.ToLocalTime().ToString("HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture); + : _snapshot.GeneratedUtc.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss 'UTC'", System.Globalization.CultureInfo.InvariantCulture); - return $"last sweep {generated} · {_instances.Count} instances"; + return $"last sweep {generated} · {_instances.Count} instance{(_instances.Count == 1 ? "" : "s")}"; } } diff --git a/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/wwwroot/css/site.css b/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/wwwroot/css/site.css index 8eafcd1..badf2dd 100644 --- a/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/wwwroot/css/site.css +++ b/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/wwwroot/css/site.css @@ -130,3 +130,6 @@ details.checks summary:hover { color: var(--ink); } .check-row { grid-template-columns: 8px minmax(0, 1fr) auto; } .check-desc { grid-column: 2 / -1; } } + +.filter-hint { margin: 0 0 .75rem; font-size: .8rem; color: var(--ink-soft); } +.page-head .page-meta { min-width: 0; overflow-wrap: anywhere; } diff --git a/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs b/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs index 5179737..7942f58 100644 --- a/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs +++ b/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs @@ -20,6 +20,7 @@ public class OverviewPageTests : BunitContext { Services.AddSingleton(_store); Services.AddSingleton(_time); + JSInterop.SetupVoid("Blazor._internal.domWrapper.focus", _ => true); } private static InstanceSnapshot Node( @@ -58,6 +59,118 @@ public class OverviewPageTests : BunitContext private IRenderedComponent RenderPage() => Render(); + [Fact] + public void NeedsAttentionFilter_KeepsStaleAndRestoresTheFullFleet() + { + _store.Publish(Snapshot(Node("fresh", InstanceStatus.Up), + Node("old", InstanceStatus.Up, lastPolled: Now.AddMinutes(-5)), Node("down", InstanceStatus.Down))); + var snapshot = _store.Current; + var cut = RenderPage(); + Assert.False(cut.Find("input[data-testid=attention-filter]").HasAttribute("checked")); + cut.Find("input[data-testid=attention-filter]").Change(true); + Assert.Equal(new[] { "old", "down" }, cut.FindAll("[data-testid=instance-card]") + .Select(e => e.GetAttribute("data-instance"))); + Assert.Equal("3", cut.Find(".agg-card .agg-value").ChildNodes[0].TextContent); + Assert.Same(snapshot, _store.Current); + cut.Find("input[data-testid=attention-filter]").Change(false); + Assert.Equal(3, cut.FindAll("[data-testid=instance-card]").Count); + Assert.Contains("UTC", cut.Find(".page-meta").TextContent, StringComparison.Ordinal); + } + + [Fact] + public void PendingObservation_IsExplicitAndNotClassifiedAsAnObservedFailure() + { + _store.Publish(Snapshot(Node("waiting", null))); + var cut = RenderPage(); + cut.Find("input[data-testid=attention-filter]").Change(true); + Assert.Empty(cut.FindAll("[data-testid=instance-card]")); + Assert.Contains("1 pending", cut.Find("[data-testid=attention-pending]").TextContent, StringComparison.Ordinal); + Assert.Contains("No matching instances", cut.Find("[data-testid=attention-empty]").TextContent, StringComparison.Ordinal); + cut.Find("[data-testid=attention-clear]").Click(); + Assert.Equal("waiting", cut.Find("[data-testid=instance-card]").GetAttribute("data-instance")); + Assert.Contains("Pending", cut.Find("[data-testid=instance-card]").TextContent, StringComparison.Ordinal); + } + + [Fact] + public void EmptyAttentionFilter_CanRestoreHealthyInstancesWithoutChangingFleetTotals() + { + _store.Publish(Snapshot(Node("healthy", InstanceStatus.Up))); + var cut = RenderPage(); + cut.Find("input[data-testid=attention-filter]").Change(true); + Assert.Empty(cut.FindAll("[data-testid=instance-card]")); + Assert.Contains("No matching instances", cut.Find("[data-testid=attention-empty]").TextContent, StringComparison.Ordinal); + Assert.Equal("1", cut.Find("[data-testid=kpi-up]").TextContent); + cut.Find("[data-testid=attention-clear]").Click(); + Assert.Single(cut.FindAll("[data-testid=instance-card]")); + Assert.False(cut.Find("input[data-testid=attention-filter]").HasAttribute("checked")); + } + + [Fact] + public void AttentionFilter_DoesNotHideHealthyMembersOfASplitBrainGroup() + { + _store.Publish(Snapshot(Node("a", InstanceStatus.Up, "site-a", "akka.tcp://scadabridge@a:8082"), + Node("b", InstanceStatus.Up, "site-a", "akka.tcp://scadabridge@b:8082"))); + var cut = RenderPage(); + cut.Find("input[data-testid=attention-filter]").Change(true); + Assert.Equal(2, cut.FindAll("[data-testid=instance-card]").Count); + Assert.Contains("Split brain", cut.Markup, StringComparison.Ordinal); + } + + [Fact] + public void SweepTime_UsesTheSnapshotUtcInstantRatherThanTheRenderClock() + { + var snapshot = Snapshot(Node("a", InstanceStatus.Up)); + _store.Publish(snapshot with { GeneratedUtc = Now.AddMinutes(-10).ToOffset(TimeSpan.FromHours(5.5)) }); + Assert.Contains("2026-07-24 11:50:00 UTC", RenderPage().Find(".page-meta").TextContent, StringComparison.Ordinal); + } + + [Fact] + public void AttentionOutcome_DoesNotAnnounceBackgroundSnapshots() + { + _store.Publish(Snapshot(Node("a", InstanceStatus.Down))); + var cut = RenderPage(); + cut.Find("input[data-testid=attention-filter]").Change(true); + var outcome = cut.Find("[data-testid=attention-outcome]").TextContent; + Assert.NotEmpty(outcome); + _store.Publish(Snapshot(Node("a", InstanceStatus.Down), Node("b", InstanceStatus.Degraded))); + Assert.Equal(2, cut.FindAll("[data-testid=instance-card]").Count); + Assert.Equal(outcome, cut.Find("[data-testid=attention-outcome]").TextContent); + } + + [Fact] + public async Task QueuedSnapshot_DoesNotReplaceAViewPausedBeforeDispatcherAdoption() + { + _store.Publish(Snapshot(Node("original", InstanceStatus.Up))); + var cut = RenderPage(); + await cut.InvokeAsync(() => + { + // Queue a publisher callback while this synchronous dispatcher action owns the UI. + Task.Run(() => _store.Publish(Snapshot(Node("latest", InstanceStatus.Down)))).GetAwaiter().GetResult(); + cut.Find("[data-testid=pause-toggle]").Click(); + }); + await cut.InvokeAsync(() => { }); // Dispatcher barrier: the queued adoption ran first. + cut.WaitForAssertion(() => Assert.Equal("original", + cut.Find("[data-testid=instance-card]").GetAttribute("data-instance"))); + cut.Find("[data-testid=pause-toggle]").Click(); + Assert.Equal("latest", cut.Find("[data-testid=instance-card]").GetAttribute("data-instance")); + } + + [Fact] + public async Task QueuedSnapshot_AfterResumeCannotReplayAnOlderObservation() + { + _store.Publish(Snapshot(Node("original", InstanceStatus.Up))); + var cut = RenderPage(); + await cut.InvokeAsync(() => + { + Task.Run(() => _store.Publish(Snapshot(Node("intermediate", InstanceStatus.Down)))).GetAwaiter().GetResult(); + cut.Find("[data-testid=pause-toggle]").Click(); + _store.Publish(Snapshot(Node("latest", InstanceStatus.Up))); + cut.Find("[data-testid=pause-toggle]").Click(); + }); + await cut.InvokeAsync(() => { }); + Assert.Equal("latest", cut.Find("[data-testid=instance-card]").GetAttribute("data-instance")); + } + [Theory] [InlineData(InstanceStatus.Up, false, 0, 0)] [InlineData(InstanceStatus.Up, true, 0, 1)]