From 0c086795e3fb854098cae0552be29d739df83e41 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Wed, 13 Mar 2019 13:07:01 -0700
Subject: [PATCH] check types better

---
 public/app/features/dashboard/state/PanelModel.ts | 5 ++++-
 public/app/plugins/panel/bargauge/module.tsx      | 6 ++++--
 public/app/plugins/panel/gauge/module.tsx         | 6 ++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index ddbd2f79440..128bd8d0785 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -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));
     }
   }
 
diff --git a/public/app/plugins/panel/bargauge/module.tsx b/public/app/plugins/panel/bargauge/module.tsx
index 14fc7696d25..af757f756ac 100644
--- a/public/app/plugins/panel/bargauge/module.tsx
+++ b/public/app/plugins/panel/bargauge/module.tsx
@@ -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;
diff --git a/public/app/plugins/panel/gauge/module.tsx b/public/app/plugins/panel/gauge/module.tsx
index 8d179f7b403..b9124aea8b9 100644
--- a/public/app/plugins/panel/gauge/module.tsx
+++ b/public/app/plugins/panel/gauge/module.tsx
@@ -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;