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

Table Panel: Fix panel migration for options cell type (#66305)

Browse Source
This commit is contained in:
Ryan McKinley
2023-04-12 08:52:44 -07:00
committed by GitHub
parent d49b79fb24
commit b83627a661
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/dashboard/state/DashboardMigrator.test.ts
View File

@@ -3,6 +3,7 @@ import { each, map } from 'lodash';
import { DataLinkBuiltInVars, MappingType } from '@grafana/data';
import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
import { setDataSourceSrv } from '@grafana/runtime';
import { FieldConfigSource } from '@grafana/schema';
import { config } from 'app/core/config';
import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
import { mockDataSource, MockDataSourceSrv } from 'app/features/alerting/unified/mocks';
@@ -2196,8 +2197,7 @@ describe('when migrating table cell display mode to cell options', () => {
inspect: false,
},
},
overrides: [],
},
} as unknown as FieldConfigSource, // missing overrides
},
// @ts-expect-error
{

16
public/app/features/dashboard/state/DashboardMigrator.ts
View File

@@ -825,14 +825,14 @@ export class DashboardMigrator {
}
// Update any overrides referencing the cell display mode
for (let i = 0; i < panel.fieldConfig.overrides.length; i++) {
for (let j = 0; j < panel.fieldConfig.overrides[i].properties.length; j++) {
let overrideDisplayMode = panel.fieldConfig.overrides[i].properties[j].value;
if (panel.fieldConfig.overrides[i].properties[j].id === 'custom.displayMode') {
panel.fieldConfig.overrides[i].properties[j].id = 'custom.cellOptions';
panel.fieldConfig.overrides[i].properties[j].value =
migrateTableDisplayModeToCellOptions(overrideDisplayMode);
if (panel.fieldConfig?.overrides) {
for (const override of panel.fieldConfig.overrides) {
for (let j = 0; j < override.properties?.length ?? 0; j++) {
let overrideDisplayMode = override.properties[j].value;
if (override.properties[j].id === 'custom.displayMode') {
override.properties[j].id = 'custom.cellOptions';
override.properties[j].value = migrateTableDisplayModeToCellOptions(overrideDisplayMode);
}
}
}
}