From 2bd7d5ddab1756d015a08766015b71e6cb1e8cb0 Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Thu, 13 Nov 2025 12:01:59 -0800
Subject: [PATCH] chore: add a nice UI message letting user know about focused
 query

---
 .../query/components/QueryEditorRow.tsx       | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index c9a6d7d7157..8628a344eac 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -23,7 +23,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
 import { getDataSourceSrv, renderLimitedComponents, reportInteraction, usePluginComponents } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
-import { Badge, ErrorBoundaryAlert, List } from '@grafana/ui';
+import { Badge, ErrorBoundaryAlert, List, Text } from '@grafana/ui';
 import { OperationRowHelp } from 'app/core/components/QueryOperationRow/OperationRowHelp';
 import {
   QueryOperationAction,
@@ -562,12 +562,33 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
       </QueryOperationRow>
     );
 
+    const { queries } = this.props;
+    const hiddenQueriesCount = queries.length - 1; // Total queries minus the focused one
+
     return (
       <div
         data-testid="query-editor-row"
         aria-label={selectors.components.QueryEditorRows.rows}
         className={focusedWrapperStyle}
       >
+        {isFocused && (
+          <div className={getFocusedBannerStyle()}>
+            <Text color="primary" variant="bodySmall" italic>
+              <Trans
+                i18nKey="query.query-editor-row.focused-message"
+                values={{ queryName: query.refId, count: hiddenQueriesCount }}
+              >
+                Query {query.refId} is focused, {hiddenQueriesCount}{' '}
+                {hiddenQueriesCount === 1 ? (
+                  <Trans i18nKey="query.query-editor-row.focused-singular">query is</Trans>
+                ) : (
+                  <Trans i18nKey="query.query-editor-row.focused-plural">all other queries are</Trans>
+                )}{' '}
+                hidden from view.
+              </Trans>
+            </Text>
+          </div>
+        )}
         {queryLibraryRef && (
           <MaybeQueryLibraryEditingHeader
             query={query}
@@ -705,3 +726,8 @@ const getFocusedRowStyle = () =>
     // Remove margins when focused to maximize space
     marginBottom: 0,
   });
+
+const getFocusedBannerStyle = () =>
+  css({
+    marginBottom: '10px',
+  });