From ed27956dd0b4a084ed67f78a9745fedbcc4eacfe Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Tue, 25 Nov 2025 16:15:13 -0800
Subject: [PATCH] fix: e2e + i18n

---
 e2e-playwright/panels-suite/panelEdit_queries.spec.ts   | 2 +-
 e2e/old-arch/panels-suite/panelEdit_queries.spec.ts     | 2 +-
 public/app/features/query/components/QueryEditorRow.tsx | 2 +-
 public/locales/en-US/grafana.json                       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/e2e-playwright/panels-suite/panelEdit_queries.spec.ts b/e2e-playwright/panels-suite/panelEdit_queries.spec.ts
index e13a04081a2..14deeb59706 100644
--- a/e2e-playwright/panels-suite/panelEdit_queries.spec.ts
+++ b/e2e-playwright/panels-suite/panelEdit_queries.spec.ts
@@ -42,7 +42,7 @@ test.describe(
       // Duplicate refId B
       // Open the actions menu
       await dashboardPage
-        .getByGrafanaSelector(selectors.components.QueryEditorRow.actionButton('Query actions menu'))
+        .getByGrafanaSelector(selectors.components.QueryEditorRow.actionButton('Actions menu'))
         .first()
         .click();
       // Click duplicate query in the menu
diff --git a/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts b/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts
index 2e320699497..7b096d253be 100644
--- a/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts
+++ b/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts
@@ -36,7 +36,7 @@ describe('Panel edit tests - queries', () => {
 
     // Duplicate refId B
     // Open the actions menu
-    e2e.components.QueryEditorRow.actionButton('Query actions menu').eq(0).should('be.visible').click();
+    e2e.components.QueryEditorRow.actionButton('Actions menu').eq(0).should('be.visible').click();
     // Click duplicate query in the menu
     cy.contains('Duplicate query').should('be.visible').click();
 
diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index a8f15f34198..3ab50c3ca27 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -630,7 +630,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
                   i18nKey="query.query-editor-row.focused-message"
                   values={{ queryName: query.refId, count: hiddenQueriesCount }}
                 >
-                  Query {query.refId} is focused, {'{{count}}'} queries are hidden from view.
+                  Query {'{{queryName}}'} is focused, {'{{count}}'} queries are hidden from view.
                 </Trans>
               </Text>
               <Button fill="text" size="sm" onClick={onFocusQuery}>
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 518cca5106f..bc8bb853327 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -12249,8 +12249,8 @@
   },
   "query": {
     "query-editor-row": {
-      "focused-message_one": "Query {{refId}} is focused, {{count}} queries are hidden from view.",
-      "focused-message_other": "Query {{refId}} is focused, {{count}} queries are hidden from view."
+      "focused-message_one": "Query {{queryName}} is focused, {{count}} queries are hidden from view.",
+      "focused-message_other": "Query {{queryName}} is focused, {{count}} queries are hidden from view."
     },
     "query-editor-row-header": {
       "hidden": "Hidden",