From 528982ab0fd7517f8f187c6b6cd1c82044af39e3 Mon Sep 17 00:00:00 2001
From: Suchit Sahoo <suchsah@amazon.com>
Date: Fri, 13 Dec 2024 03:14:38 +0000
Subject: [PATCH] Fix as per the comments

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>
---
 .../lib/__snapshots__/query_result.test.tsx.snap                | 2 +-
 .../query/query_string/language_service/lib/query_result.tsx    | 2 +-
 src/plugins/data/public/ui/query_editor/editors/shared.tsx      | 2 +-
 src/plugins/data/public/ui/query_editor/language_selector.tsx   | 2 +-
 src/plugins/data/public/ui/query_editor/query_editor.tsx        | 2 +-
 .../data/public/ui/query_editor/query_editor_top_row.tsx        | 1 -
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/data/public/query/query_string/language_service/lib/__snapshots__/query_result.test.tsx.snap b/src/plugins/data/public/query/query_string/language_service/lib/__snapshots__/query_result.test.tsx.snap
index be3e7de5198..7588ef567b0 100644
--- a/src/plugins/data/public/query/query_string/language_service/lib/__snapshots__/query_result.test.tsx.snap
+++ b/src/plugins/data/public/query/query_string/language_service/lib/__snapshots__/query_result.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`Query Result show error status with error message 2`] = `
       <EuiText
         className="editor__footerItem"
         color="danger"
-        data-test-subj="editorfooterItem"
+        data-test-subj="editorFooterItem"
         size="xs"
       >
         Error
diff --git a/src/plugins/data/public/query/query_string/language_service/lib/query_result.tsx b/src/plugins/data/public/query/query_string/language_service/lib/query_result.tsx
index f761c896e85..2af3e81fc44 100644
--- a/src/plugins/data/public/query/query_string/language_service/lib/query_result.tsx
+++ b/src/plugins/data/public/query/query_string/language_service/lib/query_result.tsx
@@ -133,7 +133,7 @@ export function QueryResult(props: { queryStatus: QueryStatus }) {
             size="xs"
             color="danger"
             className="editor__footerItem"
-            data-test-subj="editorfooterItem"
+            data-test-subj="editorFooterItem"
           >
             {i18n.translate('data.query.languageService.queryResults.error', {
               defaultMessage: `Error`,
diff --git a/src/plugins/data/public/ui/query_editor/editors/shared.tsx b/src/plugins/data/public/ui/query_editor/editors/shared.tsx
index a7caa780f63..8b2da76091a 100644
--- a/src/plugins/data/public/ui/query_editor/editors/shared.tsx
+++ b/src/plugins/data/public/ui/query_editor/editors/shared.tsx
@@ -98,7 +98,7 @@ export const SingleLineInput: React.FC<SingleLineInputProps> = ({
   return (
     <div
       className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group osdQueryBar__wrap"
-      data-test-subj="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group osdQueryBar__wrap"
+      data-test-subj="osdQueryBarWrapper"
     >
       {prepend}
       <div
diff --git a/src/plugins/data/public/ui/query_editor/language_selector.tsx b/src/plugins/data/public/ui/query_editor/language_selector.tsx
index e1168849b9f..d7aa770f7fe 100644
--- a/src/plugins/data/public/ui/query_editor/language_selector.tsx
+++ b/src/plugins/data/public/ui/query_editor/language_selector.tsx
@@ -117,7 +117,7 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
         <EuiContextMenuItem
           key={language.label}
           className="languageSelector__menuItem"
-          data-test-subj="languageSelector"
+          data-test-subj="languageSelectorMenuItem"
           icon={language.label === selectedLanguage.label ? 'check' : 'empty'}
           onClick={() => handleLanguageChange(language.value)}
         >
diff --git a/src/plugins/data/public/ui/query_editor/query_editor.tsx b/src/plugins/data/public/ui/query_editor/query_editor.tsx
index af9d67ad62a..a9d84f29e69 100644
--- a/src/plugins/data/public/ui/query_editor/query_editor.tsx
+++ b/src/plugins/data/public/ui/query_editor/query_editor.tsx
@@ -433,7 +433,7 @@ export const QueryEditorUI: React.FC<Props> = (props) => {
             : languageEditor.TopBar.Expanded && languageEditor.TopBar.Expanded()}
         </div>
         {languageSelector}
-        <div className="osdQueryEditor__querycontrols" data-test-subj="osdQueryEditorQuerycontrols">
+        <div className="osdQueryEditor__querycontrols" data-test-subj="osdQueryEditorQueryControls">
           <EuiFlexGroup responsive={false} gutterSize="s" alignItems="center">
             <div
               ref={queryControlsContainer}
diff --git a/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx b/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx
index 24d79a277e7..a6d33ddf7cf 100644
--- a/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx
+++ b/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx
@@ -199,7 +199,6 @@ export default function QueryEditorTopRow(props: QueryEditorTopRowProps) {
           onSubmit={onInputSubmit}
           persistedLog={persistedLog}
           className="osdQueryEditor"
-          data-test-subj="osdQueryEditor"
           dataTestSubj={props.dataTestSubj}
           filterBar={props.filterBar}
           savedQueryManagement={props.savedQueryManagement}