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

Fix: Value mappings match against string values (#25929)

Browse Source 
* Use standard input for value mappings value

* add test and case for matching string values

* re add number on rangemap

* remove FieldTypeNumber required
This commit is contained in:
Peter Holmberg 2020-06-30 17:03:39 +02:00 committed by GitHub
parent 275c37503a
commit 20db5680d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/grafana-data/src/utils/valueMappings.test.ts
View File

@ -78,4 +78,15 @@ describe('Format value with value mappings', () => {
expect(getMappedValue(valueMappings, value).text).toEqual('1-20');
});
it('should map value text to mapping', () => {
const valueMappings: ValueMapping[] = [
{ id: 0, operator: '', text: '1-20', type: MappingType.RangeToText, from: '1', to: '20' },
{ id: 1, operator: '', text: 'ELVA', type: MappingType.ValueToText, value: 'elva' },
];
const value = 'elva';
expect(getMappedValue(valueMappings, value).text).toEqual('ELVA');
});
});

4
packages/grafana-data/src/utils/valueMappings.ts
View File

@ -19,7 +19,9 @@ const addValueToTextMappingText = (
const valueToTextMappingAsNumber = parseFloat(valueToTextMapping.value as string);
if (isNaN(valueAsNumber) || isNaN(valueToTextMappingAsNumber)) {
return allValueMappings;
if (value === valueToTextMapping.value) {
return allValueMappings.concat(valueToTextMapping);
}
}
if (valueAsNumber !== valueToTextMappingAsNumber) {

1
packages/grafana-ui/src/components/ValueMappingsEditor/MappingRow.tsx
View File

@ -83,7 +83,6 @@ export const MappingRow: React.FC<Props> = ({ valueMapping, updateValueMapping,
<>
<Field label="Value">
<Input
type="number"
defaultValue={(valueMapping as ValueMap).value}
onBlur={e => onMappingValueChange(e.currentTarget.value)}
onKeyDown={onKeyDown(onMappingValueChange)}

2
packages/grafana-ui/src/utils/standardEditors.tsx
View File

@ -161,7 +161,7 @@ export const getStandardFieldConfigs = () => {
process: valueMappingsOverrideProcessor,
settings: {},
defaultValue: [],
shouldApply: field => field.type === FieldType.number,
shouldApply: () => true,
category: ['Value mappings'],
getItemsCount: (value?) => (value ? value.length : 0),
};