public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check types better

Browse Source
This commit is contained in:
ryan
2019-03-13 13:07:01 -07:00
parent 75022ebd63
commit 0c086795e3
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/state/PanelModel.ts
+4 -1
View File
@@ -257,7 +257,10 @@ export class PanelModel {
// Callback that can validate and migrate any existing settings
if (hook) {
Object.assign(this.options, hook(this.options || {}, oldPluginId, oldOptions.options));
this.options = this.options || {};
const old = oldOptions ? oldOptions.options : null;
Object.assign(this.options, hook(this.options, oldPluginId, old));
}
}
public/app/plugins/panel/bargauge/module.tsx
+4 -2
View File
@@ -8,8 +8,10 @@ export const reactPanel = new ReactPanelPlugin<BarGaugeOptions>(BarGaugePanel);
reactPanel.setEditor(BarGaugePanelEditor);
reactPanel.setDefaults(defaults);
reactPanel.setPanelTypeChangedHook((options: BarGaugeOptions, prevPluginId: string, prevOptions: any) => {
if (prevOptions.valueOptions) {
reactPanel.setPanelTypeChangedHook((options: BarGaugeOptions, prevPluginId?: string, prevOptions?: any) => {
console.log('BAR Gauge', options, prevPluginId, prevOptions);
if (prevOptions && prevOptions.valueOptions) {
options.valueOptions = prevOptions.valueOptions;
options.thresholds = prevOptions.thresholds;
options.maxValue = prevOptions.maxValue;
public/app/plugins/panel/gauge/module.tsx
+4 -2
View File
@@ -8,8 +8,10 @@ export const reactPanel = new ReactPanelPlugin<GaugeOptions>(GaugePanel);
reactPanel.setEditor(GaugePanelEditor);
reactPanel.setDefaults(defaults);
reactPanel.setPanelTypeChangedHook((options: GaugeOptions, prevPluginId: string, prevOptions: any) => {
if (prevOptions.valueOptions) {
reactPanel.setPanelTypeChangedHook((options: GaugeOptions, prevPluginId?: string, prevOptions?: any) => {
console.log('BAR Gauge', options, prevPluginId, prevOptions);
if (prevOptions && prevOptions.valueOptions) {
options.valueOptions = prevOptions.valueOptions;
options.thresholds = prevOptions.thresholds;
options.maxValue = prevOptions.maxValue;