Skip to content

[Disccover][ES|QL] Attempt to preventing edit query overwriting ofter submission of query #223394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kertal wants to merge 11 commits into from
Closed

[Disccover][ES|QL] Attempt to preventing edit query overwriting ofter submission of query #223394

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
feaea81
Attempt to preventing edit query overwriting ofter submission of query
kertal Jun 11, 2025
bd8ad3a
Fix race condition in the inline editor mode
kertal Jun 11, 2025
9aa3b5c
Fix another test
kertal Jun 11, 2025
283c775
Merge branch 'main' into discover-esql-final-attempt-to-prevent-query…
kertal Jun 12, 2025
8cf92e9
Cleanup
kertal Jun 12, 2025
5dcabd0
Merge remote-tracking branch 'origin/discover-esql-final-attempt-to-p…
kertal Jun 12, 2025
4f7a38b
Another test to fix
kertal Jun 12, 2025
0678621
Another test to fix it
kertal Jun 13, 2025
3c75aa5
Cleanup
kertal Jun 13, 2025
6a3526d
Merge remote-tracking branch 'upstream/main' into discover-esql-final…
kertal Jun 13, 2025
eb96044
Another test
kertal Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,13 @@ export const ESQLEditor = memo(function ESQLEditor({
});
const onQueryUpdate = useCallback(
(value: string) => {
if (!editorIsInline) {
// preventing a race condition in the inline editor mode
setCode(value);
}
onTextLangQueryChange({ esql: value } as AggregateQuery);
},
[onTextLangQueryChange]
[onTextLangQueryChange, setCode, editorIsInline]
);

const onQuerySubmit = useCallback(() => {
Expand Down Expand Up @@ -224,11 +228,11 @@ export const ESQLEditor = memo(function ESQLEditor({

useEffect(() => {
if (editor1.current) {
if (code !== fixedQuery) {
if (code !== fixedQuery && (editorIsInline || !isQueryLoading)) {
setCode(fixedQuery);
}
}
}, [code, fixedQuery]);
}, [code, fixedQuery, isQueryLoading, editorIsInline]);

// Enable the variables service if the feature is supported in the consumer app
useEffect(() => {
Expand Down