Add JSON editor #1
Conversation
|
So we are gonna do that in this repo I guess :) I'll put my work into master so we can continue on top of that. |
| @@ -30,6 +30,13 @@ export class GenericDatasource { | |||
| query.adhocFilters = []; | |||
| } | |||
|
|
|||
| // strip empty json | |||
| query.targets = _.map(query.targets, d => { | |||
| if (d.data.trim() == "") { | |||
|
|
||
| // special handling when in table panel | ||
| if (!this.target.format) { | ||
| this.target.format = this.panelCtrl.panel.type === 'table' ? 'table' : 'timeseries'; |
There was a problem hiding this comment.
I have changed it to time_series according to grafana/simple-json-datasource#103 (comment)
There was a problem hiding this comment.
If ok I've prefer timeseries for readability. With the mysql source its only internal while with JSON its actually being sent to the data source.
| this.target.format = this.panelCtrl.panel.type === 'table' ? 'table' : 'timeseries'; | ||
| } | ||
|
|
||
| this.formats = [{ text: 'Time series', value: 'timeseries' }, { text: 'Table', value: 'table' }]; |
| } | ||
|
|
||
| getOptions(query) { | ||
| return this.datasource.metricFindQuery(query || ''); | ||
| } | ||
|
|
||
| // not used |
There was a problem hiding this comment.
if not used, can we toss it away?
There was a problem hiding this comment.
Didn't want to do that since its still in upstream? If remove then we can also scrap the part in the query editor.
|
Pleas don't. IMHO master should stay at upstream level- rather create a new |
|
@andig very well, |
|
Replaced by #2 |
Add json editor control