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) => { 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) => { query: editor.getValue(), }; - onSubmit(newQuery); + onSubmit(newQuery, timefilter.getTime()); }); return () => { @@ -358,11 +359,11 @@ export const QueryEditorUI: React.FC = (props) => { editor.addCommand(monaco.KeyCode.Enter, () => { const newQuery = { - ...query, + ...queryRef.current, query: editor.getValue(), }; - onSubmit(newQuery); + onSubmit(newQuery, timefilter.getTime()); }); }, provideCompletionItems,