fix(snapshots): Fixed issue with empty snapshots, fixes grafana#4706

torkelo · torkelo · commit 635589658415 · 2016-04-14T11:06:48.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Bug fixes
 * **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702)
+* **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706)
 
 # 3.0.0-beta4 (2016-04-13)
 
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -65,7 +65,7 @@ class MetricsPanelCtrl extends PanelCtrl {
       var data = this.panel.snapshotData;
       // backward compatability
       if (!_.isArray(data)) {
-        data = data;
+        data = data.data;
       }
 
       this.events.emit('data-snapshot-load', data);
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
@@ -161,7 +161,7 @@ class GraphCtrl extends MetricsPanelCtrl {
 
   onDataSnapshotLoad(snapshotData) {
     this.annotationsPromise = this.annotationsSrv.getAnnotations(this.dashboard);
-    this.onDataReceived(snapshotData.data);
+    this.onDataReceived(snapshotData);
   }
 
   onDataError(err) {
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
@@ -56,7 +56,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
 
     this.events.on('data-received', this.onDataReceived.bind(this));
     this.events.on('data-error', this.onDataError.bind(this));
-    this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));
+    this.events.on('data-snapshot-load', this.onDataReceived.bind(this));
     this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
   }
 
@@ -71,10 +71,6 @@ class SingleStatCtrl extends MetricsPanelCtrl {
     this.render();
   }
 
-  onDataSnapshotLoad(snapshotData) {
-    this.onDataReceived(snapshotData.data);
-  }
-
   onDataError(err) {
     this.onDataReceived({data: []});
   }
diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts
@@ -60,7 +60,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
 
     this.events.on('data-received', this.onDataReceived.bind(this));
     this.events.on('data-error', this.onDataError.bind(this));
-    this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));
+    this.events.on('data-snapshot-load', this.onDataReceived.bind(this));
     this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
     this.events.on('init-panel-actions', this.onInitPanelActions.bind(this));
   }
@@ -86,10 +86,6 @@ class TablePanelCtrl extends MetricsPanelCtrl {
     return super.issueQueries(datasource);
   }
 
-  onDataSnapshotLoad(data) {
-    this.onDataReceived(data.data);
-  }
-
   onDataError(err) {
     this.dataRaw = [];
     this.render();

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class MetricsPanelCtrl extends PanelCtrl {`
`65`	`65`	`var data = this.panel.snapshotData;`
`66`	`66`	`// backward compatability`
`67`	`67`	`if (!_.isArray(data)) {`
`68`		`- data = data;`
	`68`	`+ data = data.data;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`this.events.emit('data-snapshot-load', data);`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ class GraphCtrl extends MetricsPanelCtrl {`
`161`	`161`
`162`	`162`	`onDataSnapshotLoad(snapshotData) {`
`163`	`163`	`this.annotationsPromise = this.annotationsSrv.getAnnotations(this.dashboard);`
`164`		`- this.onDataReceived(snapshotData.data);`
	`164`	`+ this.onDataReceived(snapshotData);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`onDataError(err) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {`
`56`	`56`
`57`	`57`	`this.events.on('data-received', this.onDataReceived.bind(this));`
`58`	`58`	`this.events.on('data-error', this.onDataError.bind(this));`
`59`		`- this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));`
	`59`	`+ this.events.on('data-snapshot-load', this.onDataReceived.bind(this));`
`60`	`60`	`this.events.on('init-edit-mode', this.onInitEditMode.bind(this));`
`61`	`61`	`}`
`62`	`62`
`@@ -71,10 +71,6 @@ class SingleStatCtrl extends MetricsPanelCtrl {`
`71`	`71`	`this.render();`
`72`	`72`	`}`
`73`	`73`
`74`		`- onDataSnapshotLoad(snapshotData) {`
`75`		`- this.onDataReceived(snapshotData.data);`
`76`		`- }`
`77`		`-`
`78`	`74`	`onDataError(err) {`
`79`	`75`	`this.onDataReceived({data: []});`
`80`	`76`	`}`