IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 09:26:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

influxdb: influxql: improve the handling of metadata query errors (#42500)

Browse Source
This commit is contained in:
Gábor Farkas 2021-11-30 17:17:40 +01:00 committed by GitHub
parent 0cde13d51f
commit 17e12dc784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/TagsSection.tsx
View File

@ -40,10 +40,20 @@ const Tag = ({ tag, isFirst, onRemove, onChange, getTagKeyOptions, getTagValueOp
const condition = getCondition(tag, isFirst);
const getTagKeySegmentOptions = () => {
return getTagKeyOptions().then((tags) => [
{ label: '-- remove filter --', value: undefined },
...tags.map(toSelectableValue),
]);
return getTagKeyOptions()
.catch((err) => {
// in this UI element we add a special item to the list of options,
// that is used to remove the element.
// this causes a problem: if `getTagKeyOptions` fails with an error,
// the remove-filter option is never added to the list,
// and the UI element can not be removed.
// to avoid it, we catch any potential errors coming from `getTagKeyOptions`,
// log the error, and pretend that the list of options is an empty list.
// this way the remove-item option can always be added to the list.
console.error(err);
return [];
})
.then((tags) => [{ label: '-- remove filter --', value: undefined }, ...tags.map(toSelectableValue)]);
};
const getTagValueSegmentOptions = () => {