opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 04:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Began work on handling panel type switching and keep setting

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-02-17 07:03:42 +01:00
parent 1d4dae7aa8
commit dede40d459
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/grafana-ui/src/types/panel.ts
View File

@ -25,10 +25,13 @@ export interface PanelEditorProps<T = any> {
onChange: (options: T) => void;
}
export type PreservePanelOptionsHandler<TOptions> = (pluginId: string, prevOptions: any) => Partial<TOptions>;
export class ReactPanelPlugin<TOptions = any> {
panel: ComponentClass<PanelProps<TOptions>>;
editor?: ComponentClass<PanelEditorProps<TOptions>>;
defaults?: TOptions;
preserveOptions?: PreservePanelOptionsHandler<TOptions>;
constructor(panel: ComponentClass<PanelProps<TOptions>>) {
this.panel = panel;
@ -41,6 +44,10 @@ export class ReactPanelPlugin<TOptions = any> {
setDefaults(defaults: TOptions) {
this.defaults = defaults;
}
setPreserveOptionsHandler(handler: PreservePanelOptionsHandler<TOptions>) {
this.preserveOptions = handler;
}
}
export interface PanelSize {

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

@ -76,21 +76,19 @@ export class DashboardPanel extends PureComponent<Props, State> {
// unmount angular panel
this.cleanUpAngularPanel();
if (panel.type !== pluginId) {
this.props.panel.changeType(pluginId, fromAngularPanel);
}
if (plugin.exports) {
this.setState({ plugin, angularPanel: null });
} else {
if (!plugin.exports) {
try {
plugin.exports = await importPluginModule(plugin.module);
} catch (e) {
plugin = getPanelPluginNotFound(pluginId);
}
this.setState({ plugin, angularPanel: null });
}
if (panel.type !== pluginId) {
this.props.panel.changeType(pluginId, fromAngularPanel);
}
this.setState({ plugin, angularPanel: null });
}
}

2
public/app/plugins/panel/bargauge/types.ts
View File

@ -19,6 +19,6 @@ export const defaults: BarGaugeOptions = {
suffix: '',
decimals: null,
},
thresholds: [{ index: 2, value: 80, color: 'red' }, { index: 0, value: -Infinity, color: 'green' }],
thresholds: [{ index: 1, value: 80, color: 'red' }, { index: 0, value: -Infinity, color: 'green' }],
valueMappings: [],
};

9
public/app/plugins/panel/gauge/module.tsx
View File

@ -8,3 +8,12 @@ export const reactPanel = new ReactPanelPlugin<GaugeOptions>(GaugePanel);
reactPanel.setEditor(GaugePanelEditor);
reactPanel.setDefaults(defaults);
reactPanel.setPreserveOptionsHandler((pluginId: string, prevOptions: any) => {
const options: Partial<GaugeOptions> = {};
if (prevOptions.valueOptions.unit) {
options.valueOptions = prevOptions.valueOptions;
}
return options;
});

2
public/app/plugins/panel/gauge/types.ts
View File

@ -31,5 +31,5 @@ export const defaults: GaugeOptions = {
unit: 'none',
},
valueMappings: [],
thresholds: [],
thresholds: [{ index: 1, value: 80, color: 'red' }, { index: 0, value: -Infinity, color: 'green' }],
};