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

TextPanel: Fixes problems where text panel would show old content (#28643)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-10-30 08:22:04 +01:00 committed by GitHub
parent 5a83fc574a
commit 16a1d2f744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/plugins/panel/text/textPanelMigrationHandler.test.ts
View File

@ -8,12 +8,30 @@ describe('textPanelMigrationHandler', () => {
const panel: any = { const panel: any = {
content: '<span>Hello World<span>', content: '<span>Hello World<span>',
mode: 'html', mode: 'html',
options: {},
}; };
const result = textPanelMigrationHandler(panel); const result = textPanelMigrationHandler(panel);
expect(result.content).toEqual('<span>Hello World<span>'); expect(result.content).toEqual('<span>Hello World<span>');
expect(result.mode).toEqual('html'); expect(result.mode).toEqual('html');
expect(panel.content).toBeUndefined();
expect(panel.mode).toBeUndefined();
});
});
describe('when invoked and previous version 7.1 or later', () => {
it('then not migrate options', () => {
const panel: any = {
content: '<span>Hello World<span>',
mode: 'html',
options: { content: 'New content' },
pluginVersion: '7.1.0',
};
const result = textPanelMigrationHandler(panel);
expect(result.content).toEqual('New content');
}); });
}); });

20
public/app/plugins/panel/text/textPanelMigrationHandler.ts
View File

@ -2,19 +2,27 @@ import { PanelModel } from '@grafana/data';
import { TextMode, TextOptions } from './types'; import { TextMode, TextOptions } from './types';
export const textPanelMigrationHandler = (panel: PanelModel<TextOptions>): Partial<TextOptions> => { export const textPanelMigrationHandler = (panel: PanelModel<TextOptions>): Partial<TextOptions> => {
const previousVersion = parseFloat(panel.pluginVersion || '6.1');
let options = panel.options;
// Migrates old Angular based text panel props to new props // Migrates old Angular based text panel props to new props
if (panel.hasOwnProperty('content') && panel.hasOwnProperty('mode')) { if (panel.hasOwnProperty('content') && panel.hasOwnProperty('mode')) {
const oldTextPanel: { content: string; mode: string } = (panel as unknown) as any; const oldTextPanel: any = panel as any;
const content = oldTextPanel.content; const content = oldTextPanel.content;
const mode = (oldTextPanel.mode as unknown) as TextMode; const mode = oldTextPanel.mode as TextMode;
return { content, mode }; delete oldTextPanel.content;
delete oldTextPanel.mode;
if (previousVersion < 7.1) {
options = { content, mode };
}
} }
// The 'text' mode has been removed so we need to update any panels still using it to markdown // The 'text' mode has been removed so we need to update any panels still using it to markdown
if (panel.options.mode !== 'html' && panel.options.mode !== 'markdown') { if (options.mode !== 'html' && options.mode !== 'markdown') {
return { content: panel.options.content, mode: 'markdown' }; options = { ...options, mode: 'markdown' };
} }
return panel.options; return options;
}; };