IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

AngularPanels: Fixed loading state indication for angular panels (#17900)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-07-03 16:58:38 +02:00 committed by GitHub
parent 98147fd52b
commit b1126cb0ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2225 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2213
devenv/dev-dashboards/panel-common/lazy_loading.json Normal file
View File

File diff suppressed because it is too large Load Diff

26
public/app/features/panel/metrics_panel_ctrl.ts
View File

@ -89,16 +89,13 @@ class MetricsPanelCtrl extends PanelCtrl {
this.loading = true;
// load datasource service
return (
this.datasourceSrv
.get(this.panel.datasource, this.panel.scopedVars)
.then(this.updateTimeRange.bind(this))
.then(this.issueQueries.bind(this))
// NOTE handleQueryResult is called by panelDataObserver
.catch((err: any) => {
this.processDataError(err);
})
);
return this.datasourceSrv
.get(this.panel.datasource, this.panel.scopedVars)
.then(this.updateTimeRange.bind(this))
.then(this.issueQueries.bind(this))
.catch((err: any) => {
this.processDataError(err);
});
}
processDataError(err: any) {
@ -134,7 +131,11 @@ class MetricsPanelCtrl extends PanelCtrl {
return;
}
this.loading = false;
// Ignore data in loading state
if (data.state === LoadingState.Loading) {
this.loading = true;
return;
}
if (data.request) {
const { range, timeInfo } = data.request;
@ -223,12 +224,9 @@ class MetricsPanelCtrl extends PanelCtrl {
}
handleDataFrame(data: DataFrame[]) {
this.loading = false;
if (this.dashboard && this.dashboard.snapshot) {
this.panel.snapshotData = data;
}
// Subclasses that asked for DataFrame will override
}