feat(centralui): column resize and reorder for the audit results grid
Adds drag-to-resize and drag-to-reorder column UX to AuditResultsGrid, with chosen widths + column order persisted in browser sessionStorage. - wwwroot/js/audit-grid.js: dependency-free helper — pointer-driven resize handles, native HTML5 drag-and-drop reorder, and a sessionStorage save/load wrapper (mirrors treeview-storage.js). - AuditResultsGrid: renders a resize handle per <th>, makes headers draggable, applies persisted widths via a --audit-col-width custom property, and wires reorder into the existing ColumnOrder / OrderedColumns() mechanism. JS-invokable OnColumnResized / OnColumnReordered persist + re-render. A stored order naming an unknown column degrades gracefully (drops unknown keys, appends missing columns in default order); widths clamp to a 64px minimum. - AuditResultsGrid.razor.css: subtle scoped styling for the resize handle affordance and the reorder drop-target highlight. - App.razor references audit-grid.js alongside the other scripts. - Tests: 6 new bUnit tests for the load/apply/persist logic and graceful degradation; a new AuditGridColumnTests Playwright suite for the drag UX + reload persistence. Audit page bUnit tests set loose JSInterop mode since the grid now calls into audit-grid.js.
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
using System.Text.Json;
|
||||
using Microsoft.AspNetCore.Components;
|
||||
using Microsoft.JSInterop;
|
||||
using ScadaLink.Commons.Entities.Audit;
|
||||
using ScadaLink.Commons.Types.Audit;
|
||||
using ScadaLink.Commons.Types.Enums;
|
||||
@@ -14,12 +16,15 @@ namespace ScadaLink.CentralUI.Components.Audit;
|
||||
/// source without standing up EF Core.
|
||||
///
|
||||
/// <para>
|
||||
/// <b>Column model.</b> Each column has a stable string key; the visible order
|
||||
/// is the <see cref="ColumnOrder"/> parameter. M7 scope: the column-model
|
||||
/// framework is in place but resize / drag-reorder UX is intentionally NOT
|
||||
/// implemented — the full spec calls for persisted-per-user reordering and
|
||||
/// resizing, which M7.x can ship without rewriting the column model. Resizing
|
||||
/// today is CSS-based via Bootstrap's <c>.table-responsive</c> wrapper.
|
||||
/// <b>Column model.</b> Each column has a stable string key. The default
|
||||
/// visible order is the <see cref="ColumnOrder"/> parameter (or the spec
|
||||
/// order from Component-AuditLog.md §10 when the parameter is null). On top of
|
||||
/// that default the grid layers a per-browser override: drag-to-reorder and
|
||||
/// drag-to-resize UX (audit-grid.js) writes the chosen order + per-column
|
||||
/// widths to <c>sessionStorage</c>, and the grid restores them on first
|
||||
/// render. A stored order that names an unknown/removed column degrades
|
||||
/// gracefully — unknown keys are dropped, missing columns appended in default
|
||||
/// order — so it never throws.
|
||||
/// </para>
|
||||
///
|
||||
/// <para>
|
||||
@@ -33,10 +38,17 @@ namespace ScadaLink.CentralUI.Components.Audit;
|
||||
/// end" signal for keyset paging without a count query.
|
||||
/// </para>
|
||||
/// </summary>
|
||||
public partial class AuditResultsGrid
|
||||
public partial class AuditResultsGrid : IAsyncDisposable
|
||||
{
|
||||
private const int DefaultPageSize = 100;
|
||||
|
||||
/// <summary>Minimum persisted column width — mirrors <c>auditGrid.minWidth</c>.</summary>
|
||||
private const int MinColumnWidthPx = 64;
|
||||
|
||||
/// <summary>sessionStorage keys (namespaced under <c>auditGrid:</c> by the JS helper).</summary>
|
||||
private const string ColumnOrderStorageKey = "columnOrder";
|
||||
private const string ColumnWidthsStorageKey = "columnWidths";
|
||||
|
||||
private readonly List<AuditEvent> _rows = new();
|
||||
private int _pageNumber = 1;
|
||||
private bool _loading;
|
||||
@@ -44,6 +56,18 @@ public partial class AuditResultsGrid
|
||||
|
||||
private AuditLogQueryFilter? _activeFilter;
|
||||
|
||||
[Inject] private IJSRuntime JS { get; set; } = default!;
|
||||
|
||||
private ElementReference _tableRef;
|
||||
private DotNetObjectReference<AuditResultsGrid>? _selfRef;
|
||||
|
||||
// Effective column state. _columnOrder is the live display order (seeded
|
||||
// from the ColumnOrder parameter / spec default, then overridden by any
|
||||
// persisted sessionStorage order). _columnWidths holds per-key pixel
|
||||
// widths from a prior resize; absent keys render at auto width.
|
||||
private List<string>? _columnOrder;
|
||||
private readonly Dictionary<string, int> _columnWidths = new();
|
||||
|
||||
/// <summary>
|
||||
/// Filter to apply. When this parameter changes the grid resets to page 1 and
|
||||
/// reissues the query — that's the contract the parent page relies on so the
|
||||
@@ -90,24 +114,57 @@ public partial class AuditResultsGrid
|
||||
};
|
||||
|
||||
private IReadOnlyList<(string Key, string Label)> OrderedColumns()
|
||||
=> ResolveOrder(_columnOrder ?? ColumnOrder);
|
||||
|
||||
/// <summary>
|
||||
/// Resolves a candidate list of column keys into the concrete display
|
||||
/// columns. Degrades gracefully so a stale persisted order is never fatal:
|
||||
/// unknown keys are dropped, and any column not named in the candidate
|
||||
/// list is appended in its default (spec) position. A null/empty candidate
|
||||
/// yields the full default order.
|
||||
/// </summary>
|
||||
private static IReadOnlyList<(string Key, string Label)> ResolveOrder(IReadOnlyList<string>? candidate)
|
||||
{
|
||||
if (ColumnOrder is null || ColumnOrder.Count == 0)
|
||||
if (candidate is null || candidate.Count == 0)
|
||||
{
|
||||
return AllColumns;
|
||||
}
|
||||
|
||||
var byKey = AllColumns.ToDictionary(c => c.Key, c => c);
|
||||
var ordered = new List<(string Key, string Label)>(ColumnOrder.Count);
|
||||
foreach (var key in ColumnOrder)
|
||||
var ordered = new List<(string Key, string Label)>(AllColumns.Count);
|
||||
var seen = new HashSet<string>();
|
||||
foreach (var key in candidate)
|
||||
{
|
||||
if (byKey.TryGetValue(key, out var col))
|
||||
// Drop unknown keys (removed/renamed columns) and any duplicates.
|
||||
if (byKey.TryGetValue(key, out var col) && seen.Add(key))
|
||||
{
|
||||
ordered.Add(col);
|
||||
}
|
||||
}
|
||||
return ordered.Count == 0 ? AllColumns : ordered;
|
||||
|
||||
// Append any columns the candidate omitted, in default order, so a
|
||||
// newly-added column still appears after a restore of an older order.
|
||||
foreach (var col in AllColumns)
|
||||
{
|
||||
if (seen.Add(col.Key))
|
||||
{
|
||||
ordered.Add(col);
|
||||
}
|
||||
}
|
||||
|
||||
return ordered;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Inline style for a column's cells: emits the <c>--audit-col-width</c>
|
||||
/// custom property the scoped stylesheet reads, or an empty string when
|
||||
/// the column has no persisted width (auto layout).
|
||||
/// </summary>
|
||||
private string ColumnWidthStyle(string key)
|
||||
=> _columnWidths.TryGetValue(key, out var width)
|
||||
? $"--audit-col-width: {width}px;"
|
||||
: string.Empty;
|
||||
|
||||
protected override async Task OnParametersSetAsync()
|
||||
{
|
||||
// Reset & reload whenever the filter reference changes. AuditLogQueryFilter
|
||||
@@ -180,6 +237,173 @@ public partial class AuditResultsGrid
|
||||
}
|
||||
}
|
||||
|
||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
{
|
||||
if (firstRender)
|
||||
{
|
||||
// Restore any persisted order + widths first; the StateHasChanged
|
||||
// inside triggers a re-render so the restored layout is on screen.
|
||||
await LoadPersistedStateAsync();
|
||||
_selfRef = DotNetObjectReference.Create(this);
|
||||
}
|
||||
|
||||
// Wire (or re-wire) the JS drag handlers on every render. auditGrid.init
|
||||
// is idempotent — already-bound cells are skipped, and the .NET
|
||||
// reference is refreshed — so a re-render after a reorder still leaves
|
||||
// every header cell wired without leaking handlers.
|
||||
if (_selfRef is not null)
|
||||
{
|
||||
try
|
||||
{
|
||||
await JS.InvokeVoidAsync("auditGrid.init", _tableRef, _selfRef);
|
||||
}
|
||||
catch (JSDisconnectedException)
|
||||
{
|
||||
// Circuit gone before init completed — nothing to wire.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Reads the persisted column order + widths from <c>sessionStorage</c> and
|
||||
/// applies them. A missing, empty, or corrupt payload is treated as "no
|
||||
/// prior state" — the grid keeps its default order/widths and never throws.
|
||||
/// </summary>
|
||||
private async Task LoadPersistedStateAsync()
|
||||
{
|
||||
var orderJson = await TryLoadAsync(ColumnOrderStorageKey);
|
||||
var widthsJson = await TryLoadAsync(ColumnWidthsStorageKey);
|
||||
|
||||
var changed = false;
|
||||
|
||||
if (!string.IsNullOrEmpty(orderJson))
|
||||
{
|
||||
try
|
||||
{
|
||||
var stored = JsonSerializer.Deserialize<List<string>>(orderJson);
|
||||
if (stored is { Count: > 0 })
|
||||
{
|
||||
// Normalise through ResolveOrder so a stale key never sticks.
|
||||
_columnOrder = ResolveOrder(stored).Select(c => c.Key).ToList();
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
// Corrupt payload — ignore, keep the default order.
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(widthsJson))
|
||||
{
|
||||
try
|
||||
{
|
||||
var stored = JsonSerializer.Deserialize<Dictionary<string, int>>(widthsJson);
|
||||
if (stored is not null)
|
||||
{
|
||||
var validKeys = AllColumns.Select(c => c.Key).ToHashSet();
|
||||
_columnWidths.Clear();
|
||||
foreach (var (key, width) in stored)
|
||||
{
|
||||
// Drop widths for unknown columns; clamp to the minimum.
|
||||
if (validKeys.Contains(key))
|
||||
{
|
||||
_columnWidths[key] = Math.Max(MinColumnWidthPx, width);
|
||||
}
|
||||
}
|
||||
changed = _columnWidths.Count > 0 || changed;
|
||||
}
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
// Corrupt payload — ignore, keep auto widths.
|
||||
}
|
||||
}
|
||||
|
||||
if (changed)
|
||||
{
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<string?> TryLoadAsync(string key)
|
||||
{
|
||||
try
|
||||
{
|
||||
return await JS.InvokeAsync<string?>("auditGrid.load", key);
|
||||
}
|
||||
catch (JSDisconnectedException)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// JS callback: the user finished resizing a column. Persists the new
|
||||
/// per-column width and re-renders so the body cells track the header.
|
||||
/// </summary>
|
||||
[JSInvokable]
|
||||
public async Task OnColumnResized(string columnKey, int widthPx)
|
||||
{
|
||||
if (!AllColumns.Any(c => c.Key == columnKey))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_columnWidths[columnKey] = Math.Max(MinColumnWidthPx, widthPx);
|
||||
await SaveAsync(ColumnWidthsStorageKey, JsonSerializer.Serialize(_columnWidths));
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// JS callback: the user dropped column <paramref name="fromKey"/> onto the
|
||||
/// header of <paramref name="toKey"/>. Moves the dragged column into the
|
||||
/// target's slot, persists the resulting order, and re-renders.
|
||||
/// </summary>
|
||||
[JSInvokable]
|
||||
public async Task OnColumnReordered(string fromKey, string toKey)
|
||||
{
|
||||
// Start from the current effective order so successive drags compose.
|
||||
var order = OrderedColumns().Select(c => c.Key).ToList();
|
||||
var fromIndex = order.IndexOf(fromKey);
|
||||
var toIndex = order.IndexOf(toKey);
|
||||
if (fromIndex < 0 || toIndex < 0 || fromIndex == toIndex)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
order.RemoveAt(fromIndex);
|
||||
// After the removal the target index shifts left by one when the
|
||||
// dragged column originally sat before it.
|
||||
if (fromIndex < toIndex)
|
||||
{
|
||||
toIndex--;
|
||||
}
|
||||
order.Insert(toIndex, fromKey);
|
||||
|
||||
_columnOrder = order;
|
||||
await SaveAsync(ColumnOrderStorageKey, JsonSerializer.Serialize(order));
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
private async Task SaveAsync(string key, string json)
|
||||
{
|
||||
try
|
||||
{
|
||||
await JS.InvokeVoidAsync("auditGrid.save", key, json);
|
||||
}
|
||||
catch (JSDisconnectedException)
|
||||
{
|
||||
// Circuit gone — the in-memory state still drives this render.
|
||||
}
|
||||
}
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_selfRef?.Dispose();
|
||||
return ValueTask.CompletedTask;
|
||||
}
|
||||
|
||||
private static string StatusBadgeClass(AuditStatus status) => status switch
|
||||
{
|
||||
AuditStatus.Delivered => "badge bg-success",
|
||||
|
||||
Reference in New Issue
Block a user