refactored and added tests for panel model remember properties

public/app/features/dashboard/panel_model.ts

@@ -55,12 +55,6 @@ const mustKeepProps: { [str: string]: boolean } = {
   cachedPluginOptions: true,
   cachedPluginOptions: true,
 };
 };
 
 
-// Keep current option value when switching visualization
-const keepLatestProps: { [str: string]: boolean } = {
-  title: true,
-  description: true,
-};
-
 const defaults: any = {
 const defaults: any = {
   gridPos: { x: 0, y: 0, h: 3, w: 6 },
   gridPos: { x: 0, y: 0, h: 3, w: 6 },
   datasource: null,
   datasource: null,
@@ -132,7 +126,7 @@ export class PanelModel {
   }
   }
 
 
   private getOptionsKey() {
   private getOptionsKey() {
-    return 'options-' + this.type;
+    return PANEL_OPTIONS_KEY_PREFIX + this.type;
   }
   }
 
 
   getSaveModel() {
   getSaveModel() {
@@ -196,9 +190,9 @@ export class PanelModel {
     this.events.emit('panel-initialized');
     this.events.emit('panel-initialized');
   }
   }
 
 
-  getPanelOptions() {
+  private getOptionsToRemember() {
     return Object.keys(this).reduce((acc, property) => {
     return Object.keys(this).reduce((acc, property) => {
-      if (notPersistedProperties[property]) {
+      if (notPersistedProperties[property] || mustKeepProps[property]) {
         return acc;
         return acc;
       }
       }
       return {
       return {
@@ -208,23 +202,15 @@ export class PanelModel {
     }, {});
     }, {});
   }
   }
 
 
-  saveCurrentPanelOptions() {
-    const currentOptions = this.getPanelOptions();
-    this.cachedPluginOptions[this.type] = currentOptions;
+  private saveCurrentPanelOptions() {
+    this.cachedPluginOptions[this.type] = this.getOptionsToRemember();
   }
   }
 
 
-  restorePanelOptions(pluginId: string) {
-    const currentOptions = this.getPanelOptions();
+  private restorePanelOptions(pluginId: string) {
     const prevOptions = this.cachedPluginOptions[pluginId] || {};
     const prevOptions = this.cachedPluginOptions[pluginId] || {};
-    const newOptions = Object.keys(prevOptions).reduce((acc, currKey: string) => {
-      return {
-        ...acc,
-        [currKey]: keepLatestProps[currKey] ? currentOptions[currKey] : prevOptions[currKey],
-      };
-    }, {});
 
 
-    Object.keys(newOptions).map(property => {
-      this[property] = newOptions[property];
+    Object.keys(prevOptions).map(property => {
+      this[property] = prevOptions[property];
     });
     });
   }
   }
 
 
@@ -232,15 +218,12 @@ export class PanelModel {
     this.saveCurrentPanelOptions();
     this.saveCurrentPanelOptions();
     this.type = pluginId;
     this.type = pluginId;
 
 
-    // for now we need to remove alert rules when changing type
-    delete this.alert;
-
     // for angular panels only we need to remove all events and let angular panels do some cleanup
     // for angular panels only we need to remove all events and let angular panels do some cleanup
     if (fromAngularPanel) {
     if (fromAngularPanel) {
       this.destroy();
       this.destroy();
 
 
       for (const key of _.keys(this)) {
       for (const key of _.keys(this)) {
-        if (mustKeepProps[key] || key.indexOf(PANEL_OPTIONS_KEY_PREFIX) === 0) {
+        if (mustKeepProps[key]) {
           continue;
           continue;
         }
         }
 
 

public/app/features/dashboard/specs/panel_model.test.ts

+import _ from 'lodash';
+import { PanelModel } from '../panel_model';
+
+describe('PanelModel', () => {
+  describe('when creating new panel model', () => {
+    let model;
+
+    beforeEach(() => {
+      model = new PanelModel({
+        type: 'table',
+        showColumns: true,
+      });
+    });
+
+    it('should apply defaults', () => {
+      expect(model.gridPos.h).toBe(3);
+    });
+
+    it('should set model props on instance', () => {
+      expect(model.showColumns).toBe(true);
+    });
+
+    it('getSaveModel should remove defaults', () => {
+      const saveModel = model.getSaveModel();
+      expect(saveModel.gridPos).toBe(undefined);
+    });
+
+    it('getSaveModel should remove nonPersistedProperties', () => {
+      const saveModel = model.getSaveModel();
+      expect(saveModel.events).toBe(undefined);
+    });
+
+    describe('when changing panel type', () => {
+      beforeEach(() => {
+        model.changeType('graph', true);
+        model.alert = { id: 2 };
+      });
+
+      it('should remove table properties but keep core props', () => {
+        expect(model.showColumns).toBe(undefined);
+      });
+
+      it('should restore table properties when changing back', () => {
+        model.changeType('table', true);
+        expect(model.showColumns).toBe(true);
+      });
+
+      it('should remove alert rule when changing type that does not support it', () => {
+        model.changeType('table', true);
+        expect(model.alert).toBe(undefined);
+      });
+    });
+  });
+});