From 9ec202b8a194c0d8be8f3108c0ce76b27fb0f1cd Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 17:17:08 -0800
Subject: [PATCH] [Discover] Query Editor Shortcut Fires Incorrect Query
 (#9248) (#9310)

* fix discover enter bug



* Changeset file for PR #9248 created/updated

---------



(cherry picked from commit 57c4424048af6e6454942514f4b7f8520a13a804)

Signed-off-by: Sean Li <lnse@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
---
 changelogs/fragments/9248.yml                            | 2 ++
 src/plugins/data/public/ui/query_editor/query_editor.tsx | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/9248.yml

diff --git a/changelogs/fragments/9248.yml b/changelogs/fragments/9248.yml
new file mode 100644
index 00000000000..7144f2b5e74
--- /dev/null
+++ b/changelogs/fragments/9248.yml
@@ -0,0 +1,2 @@
+fix:
+- Fix Discover query editor enter shortcuts reverting date range ([#9248](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/9248))
\ No newline at end of file
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 5ad9d441a7b..37b1f56565a 100644
--- a/src/plugins/data/public/ui/query_editor/query_editor.tsx
+++ b/src/plugins/data/public/ui/query_editor/query_editor.tsx
@@ -80,6 +80,7 @@ export const QueryEditorUI: React.FC<Props> = (props) => {
   const editorQuery = props.query; // local query state managed by the editor. Not to be confused by the app query state.
 
   const queryString = getQueryService().queryString;
+  const timefilter = getQueryService().timefilter.timefilter;
   const languageManager = queryString.getLanguageService();
   const extensionMap = languageManager.getQueryEditorExtensionMap();
   const services = props.opensearchDashboards.services;
@@ -301,7 +302,7 @@ export const QueryEditorUI: React.FC<Props> = (props) => {
           query: editor.getValue(),
         };
 
-        onSubmit(newQuery);
+        onSubmit(newQuery, timefilter.getTime());
       });
 
       return () => {
@@ -358,11 +359,11 @@ export const QueryEditorUI: React.FC<Props> = (props) => {
 
       editor.addCommand(monaco.KeyCode.Enter, () => {
         const newQuery = {
-          ...query,
+          ...queryRef.current,
           query: editor.getValue(),
         };
 
-        onSubmit(newQuery);
+        onSubmit(newQuery, timefilter.getTime());
       });
     },
     provideCompletionItems,