mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fix issue with old queries running when using the run button
This commit is contained in:
parent
13acffb600
commit
e7b87fa201
@ -11,6 +11,7 @@ import { CompletionProvider } from './autocomplete';
|
||||
interface Props {
|
||||
value: string;
|
||||
onChange: (val: string) => void;
|
||||
onBlur: () => void;
|
||||
onRunQuery: (value: string) => void;
|
||||
getLabelNames: () => string[];
|
||||
getLabelValues: (label: string) => Promise<string[]>;
|
||||
@ -33,6 +34,7 @@ export function LabelsEditor(props: Props) {
|
||||
value={props.value}
|
||||
language={langId}
|
||||
onChange={props.onChange}
|
||||
onBlur={props.onBlur}
|
||||
containerStyles={styles.queryField}
|
||||
monacoOptions={{
|
||||
folding: false,
|
||||
|
@ -25,7 +25,7 @@ export function QueryEditor(props: Props) {
|
||||
}
|
||||
|
||||
const profileTypes = useProfileTypes(datasource);
|
||||
const { getLabelNames, getLabelValues, onLabelSelectorChange } = useLabels(range, datasource, query, onChange);
|
||||
const { getLabelNames, getLabelValues, onLabelSelectorChange, onBlur } = useLabels(range, datasource, query, onChange);
|
||||
useNormalizeQuery(query, profileTypes, onChange, app);
|
||||
|
||||
let cascader = <LoadingPlaceholder text={'Loading'} />;
|
||||
@ -53,6 +53,7 @@ export function QueryEditor(props: Props) {
|
||||
<LabelsEditor
|
||||
value={query.labelSelector}
|
||||
onChange={onLabelSelectorChange}
|
||||
onBlur={onBlur}
|
||||
onRunQuery={handleRunQuery}
|
||||
getLabelNames={getLabelNames}
|
||||
getLabelValues={getLabelValues}
|
||||
@ -182,14 +183,15 @@ function useLabels(
|
||||
|
||||
const onLabelSelectorChange = useCallback(
|
||||
(value: string) => {
|
||||
// onChange({ ...query, labelSelector: value });
|
||||
setRawQuery({
|
||||
data: value,
|
||||
})
|
||||
query.labelSelector = value
|
||||
},
|
||||
[setRawQuery, query]
|
||||
}, [setRawQuery]
|
||||
);
|
||||
|
||||
return { getLabelNames, getLabelValues, onLabelSelectorChange };
|
||||
const onBlur = useCallback(() => {
|
||||
onChange({ ...query, labelSelector: rawQuery.data });
|
||||
}, [query, onChange, rawQuery.data])
|
||||
|
||||
return { getLabelNames, getLabelValues, onLabelSelectorChange, onBlur };
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user