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

make sure the validator is called before setState

Browse Source
This commit is contained in:
ryan 2019-03-12 16:35:22 -07:00
parent 7311b14da1
commit 09ba8cd5d3
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/app/features/dashboard/dashgrid/DashboardPanel.tsx
View File

@ -81,37 +81,35 @@ export class DashboardPanel extends PureComponent<Props, State> {
}
if (plugin.exports) {
this.validateOptions(plugin, panel);
this.setState({ plugin, angularPanel: null });
} else {
try {
plugin.exports = await importPluginModule(plugin.module);
this.validateOptions(plugin, panel);
} catch (e) {
plugin = getPanelPluginNotFound(pluginId);
}
this.setState({ plugin, angularPanel: null });
}
// Clean the options when switching plugins
// ??? is there a better way that will make sure to call componentDidUpdate ???
// The panel constructor may have already run
const { reactPanel } = plugin.exports;
if (reactPanel && reactPanel.optionsValidator) {
panel.options = reactPanel.optionsValidator(panel);
}
}
}
// This is be called before the plugin constructor, so the initial properties are valid
validateOptions = (plugin: PanelPlugin, panel: PanelModel) => {
const { reactPanel } = plugin.exports;
if (reactPanel && reactPanel.optionsValidator) {
panel.options = reactPanel.optionsValidator(panel);
}
};
componentDidMount() {
this.loadPlugin(this.props.panel.type);
}
componentDidUpdate(prevProps: Props, prevState: State) {
componentDidUpdate() {
if (!this.element || this.state.angularPanel) {
const { plugin } = this.state;
if (plugin && plugin !== prevState.plugin) {
console.log('PLUGIN Changed', plugin);
}
return;
}