Merge pull request #4793 from daniellee/panel_defaults

fix(panels): avoid deep copy problem for panel defaults

public/app/plugins/panel/graph/module.ts

@@ -13,7 +13,20 @@ import TimeSeries from 'app/core/time_series2';
 import * as fileExport from 'app/core/utils/file_export';
 import {MetricsPanelCtrl} from 'app/plugins/sdk';
 
-var panelDefaults = {
+class GraphCtrl extends MetricsPanelCtrl {
+  static template = template;
+
+  hiddenSeries: any = {};
+  seriesList: any = [];
+  logScales: any;
+  unitFormats: any;
+  annotationsPromise: any;
+  datapointsCount: number;
+  datapointsOutside: boolean;
+  datapointsWarning: boolean;
+  colors: any = [];
+
+  panelDefaults = {
     // datasource name, null = default datasource
     datasource: null,
     // sets client side (flot) or native graphite png renderer (png)
@@ -90,29 +103,16 @@ var panelDefaults = {
     aliasColors: {},
     // other style overrides
     seriesOverrides: [],
-};
-
-class GraphCtrl extends MetricsPanelCtrl {
-  static template = template;
-
-  hiddenSeries: any = {};
-  seriesList: any = [];
-  logScales: any;
-  unitFormats: any;
-  annotationsPromise: any;
-  datapointsCount: number;
-  datapointsOutside: boolean;
-  datapointsWarning: boolean;
-  colors: any = [];
+  };
 
   /** @ngInject */
   constructor($scope, $injector, private annotationsSrv) {
     super($scope, $injector);
 
-    _.defaults(this.panel, angular.copy(panelDefaults));
-    _.defaults(this.panel.tooltip, panelDefaults.tooltip);
-    _.defaults(this.panel.grid, panelDefaults.grid);
-    _.defaults(this.panel.legend, panelDefaults.legend);
+    _.defaults(this.panel, angular.copy(this.panelDefaults));
+    _.defaults(this.panel.tooltip, this.panelDefaults.tooltip);
+    _.defaults(this.panel.grid, this.panelDefaults.grid);
+    _.defaults(this.panel.legend, this.panelDefaults.legend);
 
     this.colors = $scope.$root.colors;
 

public/app/plugins/panel/pluginlist/module.ts

@@ -4,20 +4,20 @@ import _ from 'lodash';
 import config from 'app/core/config';
 import {PanelCtrl} from '../../../features/panel/panel_ctrl';
 
-// Set and populate defaults
-var panelDefaults = {
-};
-
 class PluginListCtrl extends PanelCtrl {
   static templateUrl = 'module.html';
 
   pluginList: any[];
   viewModel: any;
 
+  // Set and populate defaults
+  panelDefaults = {
+  };
+
   /** @ngInject */
   constructor($scope, $injector, private backendSrv, private $location) {
     super($scope, $injector);
-    _.defaults(this.panel, panelDefaults);
+    _.defaults(this.panel, this.panelDefaults);
 
     this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
     this.pluginList = [];

public/app/plugins/panel/singlestat/module.ts

@@ -11,8 +11,16 @@ import config from 'app/core/config';
 import TimeSeries from 'app/core/time_series2';
 import {MetricsPanelCtrl} from 'app/plugins/sdk';
 
-// Set and populate defaults
-var panelDefaults = {
+class SingleStatCtrl extends MetricsPanelCtrl {
+  static templateUrl = 'module.html';
+
+  series: any[];
+  data: any;
+  fontSizes: any[];
+  unitFormats: any[];
+
+  // Set and populate defaults
+  panelDefaults = {
     links: [],
     datasource: null,
     maxDataPoints: 100,
@@ -47,20 +55,12 @@ var panelDefaults = {
       maxValue: 100,
       thresholdLabels: true
     }
-};
-
-class SingleStatCtrl extends MetricsPanelCtrl {
-  static templateUrl = 'module.html';
-
-  series: any[];
-  data: any;
-  fontSizes: any[];
-  unitFormats: any[];
+  };
 
   /** @ngInject */
   constructor($scope, $injector, private $location, private linkSrv) {
     super($scope, $injector);
-    _.defaults(this.panel, panelDefaults);
+    _.defaults(this.panel, this.panelDefaults);
 
     this.events.on('data-received', this.onDataReceived.bind(this));
     this.events.on('data-error', this.onDataError.bind(this));

public/app/plugins/panel/table/module.ts

@@ -10,7 +10,14 @@ import {transformDataToTable} from './transformers';
 import {tablePanelEditor} from './editor';
 import {TableRenderer} from './renderer';
 
-var panelDefaults = {
+class TablePanelCtrl extends MetricsPanelCtrl {
+  static templateUrl = 'module.html';
+
+  pageIndex: number;
+  dataRaw: any;
+  table: any;
+
+  panelDefaults = {
     targets: [{}],
     transform: 'timeseries_to_columns',
     pageSize: null,
@@ -35,14 +42,7 @@ var panelDefaults = {
     scroll: true,
     fontSize: '100%',
     sort: {col: 0, desc: true},
-};
-
-class TablePanelCtrl extends MetricsPanelCtrl {
-  static templateUrl = 'module.html';
-
-  pageIndex: number;
-  dataRaw: any;
-  table: any;
+  };
 
   /** @ngInject */
   constructor($scope, $injector, private annotationsSrv) {
@@ -56,7 +56,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
       delete this.panel.fields;
     }
 
-    _.defaults(this.panel, panelDefaults);
+    _.defaults(this.panel, this.panelDefaults);
 
     this.events.on('data-received', this.onDataReceived.bind(this));
     this.events.on('data-error', this.onDataError.bind(this));

public/app/plugins/panel/text/module.ts

@@ -3,23 +3,21 @@
 import _ from 'lodash';
 import {PanelCtrl} from 'app/plugins/sdk';
 
- // Set and populate defaults
-var panelDefaults = {
-  mode    : "markdown", // 'html', 'markdown', 'text'
-  content : "# title",
-};
-
 export class TextPanelCtrl extends PanelCtrl {
   static templateUrl = `public/app/plugins/panel/text/module.html`;
 
   remarkable: any;
   content: string;
-
+  // Set and populate defaults
+  panelDefaults = {
+    mode    : "markdown", // 'html', 'markdown', 'text'
+    content : "# title",
+  };
   /** @ngInject */
   constructor($scope, $injector, private templateSrv, private $sce) {
     super($scope, $injector);
 
-    _.defaults(this.panel, panelDefaults);
+    _.defaults(this.panel, this.panelDefaults);
 
     this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
     this.events.on('refresh', this.onRender.bind(this));