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

PanelModel: Make sure the angular options are passed to react panel type changed handler (#30441)

Browse Source
This commit is contained in:
Torkel Ödegaard
2021-01-20 18:28:27 +01:00
committed by GitHub
parent b9fd4dba36
commit 05e37e9253
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/dashboard/state/PanelModel.ts
View File

@@ -364,13 +364,13 @@ export class PanelModel implements DataConfigSource {
changePlugin(newPlugin: PanelPlugin) {
const pluginId = newPlugin.meta.id;
const oldOptions: any = this.getOptionsToRemember();
const oldFieldConfig = this.fieldConfig;
const prevFieldConfig = this.fieldConfig;
const oldPluginId = this.type;
const wasAngular = this.isAngularPlugin();
this.cachedPluginOptions[oldPluginId] = {
properties: oldOptions,
fieldConfig: oldFieldConfig,
fieldConfig: prevFieldConfig,
};
this.clearPropertiesBeforePluginChange();
@@ -378,15 +378,8 @@ export class PanelModel implements DataConfigSource {
// Let panel plugins inspect options from previous panel and keep any that it can use
if (newPlugin.onPanelTypeChanged) {
let oldOptions: any = {};
if (wasAngular) {
oldOptions = { angular: oldOptions };
} else if (oldOptions && oldOptions.options) {
oldOptions = oldOptions.options;
}
Object.assign(this.options, newPlugin.onPanelTypeChanged(this, oldPluginId, oldOptions, oldFieldConfig));
const prevOptions = wasAngular ? { angular: oldOptions } : oldOptions.options;
Object.assign(this.options, newPlugin.onPanelTypeChanged(this, oldPluginId, prevOptions, prevFieldConfig));
}
// switch