From 64c0095a4cc3332311c999e11cdb763619b0d381 Mon Sep 17 00:00:00 2001
From: Phil Renaud <phil.renaud@hashicorp.com>
Date: Thu, 29 Feb 2024 17:25:52 +0000
Subject: [PATCH] backport of commit c2fe51bf110ead8b71722b74f9a020a86170d208

---
 .changelog/20047.txt                    | 3 +++
 ui/app/controllers/evaluations/index.js | 3 ++-
 ui/app/templates/evaluations/index.hbs  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .changelog/20047.txt

diff --git a/.changelog/20047.txt b/.changelog/20047.txt
new file mode 100644
index 00000000000..6bc01727735
--- /dev/null
+++ b/.changelog/20047.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fixed an issue where keynav would not trigger evaluation sidebar expand
+```
diff --git a/ui/app/controllers/evaluations/index.js b/ui/app/controllers/evaluations/index.js
index a52013da7ab..d0b29291fce 100644
--- a/ui/app/controllers/evaluations/index.js
+++ b/ui/app/controllers/evaluations/index.js
@@ -72,7 +72,8 @@ export default class EvaluationsController extends Controller {
       e instanceof MouseEvent ||
       (e instanceof KeyboardEvent &&
         (e.code === 'Enter' || e.code === 'Space')) ||
-      !e
+      !e ||
+      e === 'keynav'
     ) {
       this.statechart.send('LOAD_EVALUATION', { evaluation });
     }
diff --git a/ui/app/templates/evaluations/index.hbs b/ui/app/templates/evaluations/index.hbs
index d850a880dbf..6b81b4cd0eb 100644
--- a/ui/app/templates/evaluations/index.hbs
+++ b/ui/app/templates/evaluations/index.hbs
@@ -86,7 +86,7 @@
             <td data-test-id
                 {{keyboard-shortcut 
                   enumerated=true
-                  action=(fn this.handleEvaluationClick row.model)
+                  action=(fn this.handleEvaluationClick row.model "keynav")
                 }}
             >
               {{row.model.shortId}}