opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-24 10:24:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

when changing table, refresh panel once after columns have been changed

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-08-30 15:11:54 +02:00
parent a06a6b6517
commit 5ceaa21e3b
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@ -201,26 +201,26 @@ export class PostgresQueryCtrl extends QueryCtrl {
tableChanged() { tableChanged() {
this.target.table = this.tableSegment.value; this.target.table = this.tableSegment.value;
this.datasource.metricFindQuery(this.metaBuilder.buildColumnQuery('time')).then(result => { let task1 = this.datasource.metricFindQuery(this.metaBuilder.buildColumnQuery('time')).then(result => {
// check if time column is still valid // check if time column is still valid
if (result.length > 0) { if (result.length > 0 && !_.find(result, (r: any) => r.text === this.target.timeColumn)) {
if (!_.find(result, (r: any) => r.text === this.target.timeColumn)) { let segment = this.uiSegmentSrv.newSegment(result[0].text);
let segment = this.uiSegmentSrv.newSegment(result[0].text); this.timeColumnSegment.html = segment.html;
this.timeColumnSegment.html = segment.html; this.timeColumnSegment.value = segment.value;
this.timeColumnSegment.value = segment.value;
this.timeColumnChanged(); return this.timeColumnChanged(false);
}
} }
}); });
let task2 = this.datasource.metricFindQuery(this.metaBuilder.buildColumnQuery('value')).then(result => {
this.datasource.metricFindQuery(this.metaBuilder.buildColumnQuery('value')).then(result => {
if (result.length > 0) { if (result.length > 0) {
this.target.select = [[{ type: 'column', params: [result[0].text] }]]; this.target.select = [[{ type: 'column', params: [result[0].text] }]];
this.target.where = []; this.target.where = [];
this.target.group = []; this.target.group = [];
} }
this.updateProjection(); this.updateProjection();
});
this.$q.all([task1, task2]).then(() => {
this.panelCtrl.refresh(); this.panelCtrl.refresh();
}); });
} }
@ -232,9 +232,9 @@ export class PostgresQueryCtrl extends QueryCtrl {
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
timeColumnChanged() { timeColumnChanged(refresh?: boolean) {
this.target.timeColumn = this.timeColumnSegment.value; this.target.timeColumn = this.timeColumnSegment.value;
this.datasource.metricFindQuery(this.metaBuilder.buildDatatypeQuery(this.target.timeColumn)).then(result => { return this.datasource.metricFindQuery(this.metaBuilder.buildDatatypeQuery(this.target.timeColumn)).then(result => {
if (result.length === 1) { if (result.length === 1) {
if (this.target.timeColumnType !== result[0].text) { if (this.target.timeColumnType !== result[0].text) {
this.target.timeColumnType = result[0].text; this.target.timeColumnType = result[0].text;
@ -253,9 +253,12 @@ export class PostgresQueryCtrl extends QueryCtrl {
} }
} }
} }
this.updatePersistedParts();
if (refresh !== false) {
this.panelCtrl.refresh();
}
}); });
this.updatePersistedParts();
this.panelCtrl.refresh();
} }
getMetricColumnSegments() { getMetricColumnSegments() {