Skip to content
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

Jump to bottom

Loki/Prometheus: Fix wrong queries executed in split view #60172

Merged
merged 4 commits into from Dec 12, 2022
Merged

Loki/Prometheus: Fix wrong queries executed in split view #60172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b58cf31
add context to monaco editors
svennergr Dec 12, 2022
73e283a
move id
svennergr Dec 12, 2022
debe866
use right key
svennergr Dec 12, 2022
e764331
add comment
svennergr Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 13 additions & 6 deletions public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
View file
Open in desktop
@@ -1,6 +1,7 @@
import { css } from '@emotion/css';
import React, { useRef, useEffect } from 'react';
import { useLatest } from 'react-use';
import { v4 as uuidv4 } from 'uuid';

import { GrafanaTheme2 } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
Expand Down Expand Up @@ -78,10 +79,10 @@ const getStyles = (theme: GrafanaTheme2) => {
};

const MonacoQueryField = ({ languageProvider, history, onBlur, onRunQuery, initialValue }: Props) => {
const id = uuidv4();
// we need only one instance of `overrideServices` during the lifetime of the react component
const overrideServicesRef = useRef(getOverrideServices());
const containerRef = useRef<HTMLDivElement>(null);

const langProviderRef = useLatest(languageProvider);
const historyRef = useLatest(history);
const onRunQueryRef = useLatest(onRunQuery);
Expand Down Expand Up @@ -115,8 +116,10 @@ const MonacoQueryField = ({ languageProvider, history, onBlur, onRunQuery, initi
ensureLogQL(monaco);
}}
onMount={(editor, monaco) => {
const isEditorFocused = editor.createContextKey<boolean>('isEditorFocused' + id, false);
// we setup on-blur
editor.onDidBlurEditorWidget(() => {
isEditorFocused.set(false);
onBlurRef.current(editor.getValue());
});
const dataProvider = new CompletionDataProvider(langProviderRef.current, historyRef.current);
Expand Down Expand Up @@ -162,14 +165,18 @@ const MonacoQueryField = ({ languageProvider, history, onBlur, onRunQuery, initi

editor.onDidContentSizeChange(updateElementHeight);
updateElementHeight();

// handle: shift + enter
// FIXME: maybe move this functionality into CodeEditor?
editor.addCommand(monaco.KeyMod.Shift | monaco.KeyCode.Enter, () => {
onRunQueryRef.current(editor.getValue());
});

editor.addCommand(
monaco.KeyMod.Shift | monaco.KeyCode.Enter,
() => {
onRunQueryRef.current(editor.getValue());
},
'runQueryCondition' + id
);

editor.onDidFocusEditorText(() => {
isEditorFocused.set(true);
if (editor.getValue().trim() === '') {
editor.trigger('', 'editor.action.triggerSuggest', {});
}
Expand Down
20 changes: 16 additions & 4 deletions public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ import { css } from '@emotion/css';
import { promLanguageDefinition } from 'monaco-promql';
import React, { useRef, useEffect } from 'react';
import { useLatest } from 'react-use';
import { v4 as uuidv4 } from 'uuid';

import { GrafanaTheme2 } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
Expand Down Expand Up @@ -87,11 +88,13 @@ const getStyles = (theme: GrafanaTheme2, placeholder: string) => {
};

const MonacoQueryField = (props: Props) => {
// we need only one instance of `overrideServices` during the lifetime of the react component
// we need only one instance of `overrideSerices` during the lifetime of the react component
svennergr marked this conversation as resolved.
Show resolved Hide resolved
const overrideServicesRef = useRef(getOverrideServices());
const containerRef = useRef<HTMLDivElement>(null);
const { languageProvider, history, onBlur, onRunQuery, initialValue, placeholder, onChange } = props;

const id = uuidv4();

const lpRef = useLatest(languageProvider);
const historyRef = useLatest(history);
const onRunQueryRef = useLatest(onRunQuery);
Expand Down Expand Up @@ -126,10 +129,15 @@ const MonacoQueryField = (props: Props) => {
ensurePromQL(monaco);
}}
onMount={(editor, monaco) => {
const isEditorFocused = editor.createContextKey<boolean>('isEditorFocused' + id, false);
// we setup on-blur
editor.onDidBlurEditorWidget(() => {
isEditorFocused.set(false);
onBlurRef.current(editor.getValue());
});
editor.onDidFocusEditorText(() => {
isEditorFocused.set(true);
});

// we construct a DataProvider object
const getSeries = (selector: string) => lpRef.current.getSeries(selector);
Expand Down Expand Up @@ -213,9 +221,13 @@ const MonacoQueryField = (props: Props) => {

// handle: shift + enter
// FIXME: maybe move this functionality into CodeEditor?
editor.addCommand(monaco.KeyMod.Shift | monaco.KeyCode.Enter, () => {
onRunQueryRef.current(editor.getValue());
});
editor.addCommand(
monaco.KeyMod.Shift | monaco.KeyCode.Enter,
() => {
onRunQueryRef.current(editor.getValue());
},
'isEditorFocused' + id
);

/* Something in this configuration of monaco doesn't bubble up [mod]+K, which the
command palette uses. Pass the event out of monaco manually
Expand Down