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

minor code refactor

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-01-08 15:54:12 +01:00
parent 6f6825c53a
commit df83c4650d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/dashboard/dashgrid/QueriesTab.tsx
View File

@ -50,17 +50,21 @@ export class QueriesTab extends PureComponent<Props, State> {
constructor(props) {
super(props);
const { panel } = props;
this.state = {
currentDS: this.datasources.find(datasource => datasource.value === panel.datasource),
isLoadingHelp: false,
currentDS: this.findCurrentDataSource(),
helpContent: null,
isPickerOpen: false,
isAddingMixed: false,
};
}
findCurrentDataSource(): DataSourceSelectItem {
const { panel } = this.props;
return this.datasources.find(datasource => datasource.value === panel.datasource) || this.datasources[0];
}
getAngularQueryComponentScope(): AngularQueryComponentScope {
const { panel, dashboard } = this.props;

2
public/app/features/dashboard/dashgrid/QueryOptions.tsx
View File

@ -94,7 +94,7 @@ export class QueryOptions extends PureComponent<Props, State> {
renderOptions() {
const { datasource, panel } = this.props;
const queryOptions = datasource && datasource.meta ? datasource.meta.queryOptions : undefined;
const { queryOptions } = datasource.meta;
if (!queryOptions) {
return null;