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

query: more work on metrics tab changes

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-05-20 10:14:41 +02:00
parent 5909f9ef92
commit 912301fe24
7 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/features/panel/metrics_tab.ts
View File

@@ -36,8 +36,10 @@ export class MetricsTabCtrl {
}
this.dsSegment = uiSegmentSrv.newSegment({value: this.current.name, selectMode: true});
this.mixedDsSegment = uiSegmentSrv.newSegment({value: 'Add Query', selectMode: true});
this.nextRefId = this.getNextQueryLetter();
this.mixedDsSegment = uiSegmentSrv.newSegment({value: 'Add Query', selectMode: true, fake: true});
// update next ref id
this.panelCtrl.nextRefId = this.dashboard.getNextQueryLetter(this.panel);
}
getOptions(includeBuiltin) {
@@ -61,22 +63,13 @@ export class MetricsTabCtrl {
var ds = _.find(this.datasources, {name: this.mixedDsSegment.value});
if (ds) {
target.datasource = ds.name;
this.panelCtrl.panel.targets.push(target);
this.panelCtrl.addDataQuery(target);
this.mixedDsSegment.value = '';
}
}
getNextQueryLetter() {
return this.dashboard.getNextQueryLetter(this.panel);
}
addDataQuery() {
var target: any = {
isNew: true,
refId: this.getNextQueryLetter()
};
this.panelCtrl.panel.targets.push(target);
this.nextRefId = this.getNextQueryLetter();
addQuery() {
this.panelCtrl.addQuery({isNew: true});
}
}