From 5c86983ef6680352da97d86a35ee4f2a903df4b4 Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Fri, 22 May 2026 01:43:41 -0400
Subject: [PATCH] fix(centralui): Esc-to-close and aria attributes on
 ExecutionDetailModal

---
 .../Audit/ExecutionDetailModal.razor           |  7 +++++--
 .../Audit/ExecutionDetailModal.razor.cs        | 18 ++++++++++++++++++
 .../Audit/ExecutionDetailModalTests.cs         | 17 +++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor b/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor
index 55a5f58..75909e0 100644
--- a/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor
+++ b/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor
@@ -13,13 +13,16 @@
     <div class="modal-backdrop fade show" data-test="execution-detail-backdrop"
          @onclick="HandleClose"></div>
     <div class="modal fade show d-block execution-detail-modal" tabindex="-1"
-         data-test="execution-detail-modal" role="dialog">
+         data-test="execution-detail-modal" role="dialog"
+         aria-modal="true" aria-labelledby="execution-detail-modal-title"
+         @onkeydown="HandleKeyDown">
         <div class="modal-dialog modal-lg modal-dialog-scrollable" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <div>
                         <div class="text-muted small text-uppercase">Execution</div>
-                        <h5 class="modal-title mb-0 d-flex align-items-baseline gap-2">
+                        <h5 id="execution-detail-modal-title"
+                            class="modal-title mb-0 d-flex align-items-baseline gap-2">
                             <span class="font-monospace">Execution @ShortExecutionId()</span>
                             @if (!_loading && _error is null)
                             {
diff --git a/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor.cs b/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor.cs
index 8fdd70c..43d1094 100644
--- a/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor.cs
+++ b/src/ScadaLink.CentralUI/Components/Audit/ExecutionDetailModal.razor.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 using ScadaLink.CentralUI.Services;
 using ScadaLink.Commons.Entities.Audit;
 using ScadaLink.Commons.Types.Audit;
@@ -112,6 +113,10 @@ public partial class ExecutionDetailModal
 
         try
         {
+            // No CancellationToken is passed deliberately: this is a bounded,
+            // small (~100-row) query for one execution, so the IDisposable/CTS
+            // machinery is not worth it for a modal. The closed → open guard in
+            // OnParametersSetAsync cleanly re-loads on the next open if needed.
             _rows = await AuditLogQueryService.QueryAsync(
                 new AuditLogQueryFilter(ExecutionId: ExecutionId.Value),
                 new AuditLogPaging(PageSize: RowPageSize));
@@ -150,6 +155,19 @@ public partial class ExecutionDetailModal
         }
     }
 
+    /// <summary>
+    /// Closes the modal when Escape is pressed, matching the header X, backdrop
+    /// click, and footer Close affordances. The root <c>.modal</c> div carries
+    /// <c>tabindex="-1"</c> so it can receive the keydown.
+    /// </summary>
+    private async Task HandleKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == "Escape")
+        {
+            await HandleClose();
+        }
+    }
+
     /// <summary>First 8 hex digits of the execution id, mirroring the UI's short-id convention.</summary>
     private string ShortExecutionId()
     {
diff --git a/tests/ScadaLink.CentralUI.Tests/Components/Audit/ExecutionDetailModalTests.cs b/tests/ScadaLink.CentralUI.Tests/Components/Audit/ExecutionDetailModalTests.cs
index e783d5e..3bf96fa 100644
--- a/tests/ScadaLink.CentralUI.Tests/Components/Audit/ExecutionDetailModalTests.cs
+++ b/tests/ScadaLink.CentralUI.Tests/Components/Audit/ExecutionDetailModalTests.cs
@@ -263,6 +263,23 @@ public class ExecutionDetailModalTests : BunitContext
         Assert.True(closed);
     }
 
+    [Fact]
+    public void EscapeKey_RaisesOnClose()
+    {
+        var executionId = Guid.NewGuid();
+        StubRows(new[] { MakeEvent(executionId), MakeEvent(executionId) });
+
+        var closed = false;
+        var cut = Render<ExecutionDetailModal>(p => p
+            .Add(c => c.ExecutionId, executionId)
+            .Add(c => c.IsOpen, true)
+            .Add(c => c.OnClose, EventCallback.Factory.Create(this, () => closed = true)));
+
+        cut.Find("[data-test=\"execution-detail-modal\"]").KeyDown("Escape");
+
+        Assert.True(closed);
+    }
+
     [Fact]
     public void Header_ShowsShortExecutionId_AndRowCount()
     {