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

Geomap: Fix tooltip field name regression (#75511)

Browse Source
This commit is contained in:
Nathan Marrs 2023-10-03 22:43:12 +02:00 committed by GitHub
parent ad851ea952
commit 7875dbc6eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/grafana-data/src/field/fieldState.test.ts
View File

@ -15,6 +15,11 @@ function checkScenario(scenario: TitleScenario): string {
return getFieldDisplayName(field, frame, scenario.frames); return getFieldDisplayName(field, frame, scenario.frames);
} }
jest.mock('lodash', () => ({
...jest.requireActual('lodash'),
isEqual: jest.fn().mockImplementation((obj1, obj2) => obj1 === obj2),
}));
describe('getFieldDisplayName', () => { describe('getFieldDisplayName', () => {
it('Should add suffix for comparison frames', () => { it('Should add suffix for comparison frames', () => {
const frame = toDataFrame({ const frame = toDataFrame({

4
packages/grafana-data/src/field/fieldState.ts
View File

@ -1,3 +1,5 @@
import { isEqual } from 'lodash';
import { DataFrame, Field, TIME_SERIES_VALUE_FIELD_NAME, FieldType, TIME_SERIES_TIME_FIELD_NAME } from '../types'; import { DataFrame, Field, TIME_SERIES_VALUE_FIELD_NAME, FieldType, TIME_SERIES_TIME_FIELD_NAME } from '../types';
import { formatLabels } from '../utils/labels'; import { formatLabels } from '../utils/labels';
@ -165,7 +167,7 @@ function getUniqueFieldName(field: Field, frame?: DataFrame) {
for (let i = 0; i < frame.fields.length; i++) { for (let i = 0; i < frame.fields.length; i++) {
const otherField = frame.fields[i]; const otherField = frame.fields[i];
if (field === otherField) { if (isEqual(field, otherField)) {
foundSelf = true; foundSelf = true;
if (dupeCount > 0) { if (dupeCount > 0) {

5
public/app/features/visualization/data-hover/DataHoverView.tsx
View File

@ -72,8 +72,11 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
}); });
} }
// Sanitize field by removing hovered property to fix unique display name issue
const { hovered, ...sanitizedField } = field;
displayValues.push({ displayValues.push({
name: getFieldDisplayName(field, data), name: getFieldDisplayName(sanitizedField, data),
value, value,
valueString: formattedValueToString(fieldDisplay), valueString: formattedValueToString(fieldDisplay),
highlight: field.hovered, highlight: field.hovered,