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

Merge branch 'tsconfig-no-implicit-this'

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-08-30 11:46:13 +02:00
parent b8e6817732 a8547ae36e
commit 36bc8b77fb
27 changed files with 90 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/elasticsearch/datasource.ts
View File

@ -203,7 +203,7 @@ export class ElasticDatasource {
this.timeSrv.setTime({ from: 'now-1m', to: 'now' }, true);
// validate that the index exist and has date field
return this.getFields({ type: 'date' }).then(
function(dateFields) {
dateFields => {
const timeField = _.find(dateFields, { text: this.timeField });
if (!timeField) {
return {
@ -212,7 +212,7 @@ export class ElasticDatasource {
};
}
return { status: 'success', message: 'Index OK. Time field name OK.' };
}.bind(this),
},
function(err) {
console.log(err);
if (err.data && err.data.error) {

2
public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts
View File

@ -5,7 +5,7 @@ import { ElasticDatasource } from '../datasource';
import * as dateMath from 'app/core/utils/datemath';
describe('ElasticDatasource', function() {
describe('ElasticDatasource', function(this: any) {
const backendSrv = {
datasourceRequest: jest.fn(),
};