IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: Fix span name being dropped from the query (#62257)

Browse Source
This commit is contained in:
Hamas Shafiq 2023-01-31 14:11:29 +00:00 committed by GitHub
parent 029253d5f6
commit c3b476e1dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.tsx
View File

@ -92,20 +92,6 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
}
};
const onSpanNameChange = (v: SelectableValue<string>) => {
// If the 'x' icon is clicked to clear the selected span name, remove spanName from the query object.
if (!v) {
delete query.spanName;
return;
}
if (spanOptions?.find((obj) => obj.value === v.value)) {
onChange({
...query,
spanName: v.value,
});
}
};
const handleOnChange = useCallback(
(value) => {
onChange({
@ -130,11 +116,11 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
loadOptions('serviceName');
}}
isLoading={isLoading.serviceName}
value={serviceOptions?.find((v) => v?.value === query.serviceName) || undefined}
value={serviceOptions?.find((v) => v?.value === query.serviceName) || query.serviceName}
onChange={(v) => {
onChange({
...query,
serviceName: v?.value || undefined,
serviceName: v?.value,
});
}}
placeholder="Select a service"
@ -154,7 +140,13 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
loadOptions('spanName');
}}
isLoading={isLoading.spanName}
onChange={onSpanNameChange}
value={spanOptions?.find((v) => v?.value === query.spanName) || query.spanName}
onChange={(v) => {
onChange({
...query,
spanName: v?.value,
});
}}
placeholder="Select a span"
isClearable
onKeyDown={onKeyDown}