IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

MatcherUI: show field name even when not found in results (#33102)

Browse Source
This commit is contained in:
Ryan McKinley 2021-04-19 00:02:58 -07:00 committed by GitHub
parent 6271777ec6
commit 98789e7ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx
View File

@ -6,7 +6,7 @@ import { Select } from '../Select/Select';
export const FieldNameMatcherEditor = memo<MatcherUIProps<string>>((props) => {
const { data, options, onChange: onChangeFromProps } = props;
const names = useFieldDisplayNames(data);
const selectOptions = useSelectOptions(names);
const selectOptions = useSelectOptions(names, options);
const onChange = useCallback(
(selection: SelectableValue<string>) => {
@ -46,11 +46,18 @@ const useFieldDisplayNames = (data: DataFrame[]): Set<string> => {
}, [data]);
};
const useSelectOptions = (displayNames: Set<string>): Array<SelectableValue<string>> => {
const useSelectOptions = (displayNames: Set<string>, currentName: string): Array<SelectableValue<string>> => {
return useMemo(() => {
return Array.from(displayNames).map((n) => ({
const vals = Array.from(displayNames).map((n) => ({
value: n,
label: n,
}));
}, [displayNames]);
if (currentName && !displayNames.has(currentName)) {
vals.push({
value: currentName,
label: `${currentName} (not found)`,
});
}
return vals;
}, [displayNames, currentName]);
};