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

prevOptions should be optional

Browse Source
This commit is contained in:
ryan 2019-03-22 10:55:31 -07:00
parent d8595e9f4e
commit f9fb1210e9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ export type PanelMigrationHook<TOptions = any> = (options: Partial<TOptions>) =>
export type PanelTypeChangedHook<TOptions = any> = ( export type PanelTypeChangedHook<TOptions = any> = (
options: Partial<TOptions>, options: Partial<TOptions>,
prevPluginId: string, prevPluginId: string,
prevOptions: any prevOptions?: any
) => Partial<TOptions>; ) => Partial<TOptions>;
export class ReactPanelPlugin<TOptions = any> { export class ReactPanelPlugin<TOptions = any> {

14
public/app/plugins/panel/singlestat2/module.tsx
View File

@ -11,13 +11,15 @@ const optionsToKeep = ['valueOptions', 'stat', 'maxValue', 'maxValue', 'threshol
export const singleStatBaseOptionsCheck = ( export const singleStatBaseOptionsCheck = (
options: Partial<SingleStatBaseOptions>, options: Partial<SingleStatBaseOptions>,
prevPluginId: string, prevPluginId: string,
prevOptions: any prevOptions?: any
) => { ) => {
optionsToKeep.forEach(v => { if (prevOptions) {
if (prevOptions.hasOwnProperty(v)) { optionsToKeep.forEach(v => {
options[v] = cloneDeep(prevOptions.display); if (prevOptions.hasOwnProperty(v)) {
} options[v] = cloneDeep(prevOptions.display);
}); }
});
}
return options; return options;
}; };