noImplicitAny: 1670 errors (#18035)

* Sub 2000 errors

* Down to 1670 errors

* Minor fixes
This commit is contained in:
Tobias Skarhed
2019-07-11 17:05:45 +02:00
committed by Torkel Ödegaard
parent 6aa58182c7
commit e1cec1069c
34 changed files with 300 additions and 271 deletions

View File

@@ -1,16 +1,17 @@
import * as queryDef from './query_def';
import { ElasticsearchAggregation } from './types';
export class ElasticQueryBuilder {
timeField: string;
esVersion: number;
constructor(options) {
constructor(options: any) {
this.timeField = options.timeField;
this.esVersion = options.esVersion;
}
getRangeFilter() {
const filter = {};
const filter: any = {};
filter[this.timeField] = {
gte: '$timeFrom',
lte: '$timeTo',
@@ -20,7 +21,7 @@ export class ElasticQueryBuilder {
return filter;
}
buildTermsAgg(aggDef, queryNode, target) {
buildTermsAgg(aggDef: ElasticsearchAggregation, queryNode: { terms?: any; aggs?: any }, target: { metrics: any[] }) {
let metricRef, metric, y;
queryNode.terms = { field: aggDef.field };
@@ -63,7 +64,7 @@ export class ElasticQueryBuilder {
return queryNode;
}
getDateHistogramAgg(aggDef) {
getDateHistogramAgg(aggDef: ElasticsearchAggregation) {
const esAgg: any = {};
const settings = aggDef.settings || {};
esAgg.interval = settings.interval;
@@ -87,7 +88,7 @@ export class ElasticQueryBuilder {
return esAgg;
}
getHistogramAgg(aggDef) {
getHistogramAgg(aggDef: ElasticsearchAggregation) {
const esAgg: any = {};
const settings = aggDef.settings || {};
esAgg.interval = settings.interval;
@@ -100,8 +101,8 @@ export class ElasticQueryBuilder {
return esAgg;
}
getFiltersAgg(aggDef) {
const filterObj = {};
getFiltersAgg(aggDef: ElasticsearchAggregation) {
const filterObj: any = {};
for (let i = 0; i < aggDef.settings.filters.length; i++) {
const query = aggDef.settings.filters[i].query;
let label = aggDef.settings.filters[i].label;
@@ -117,7 +118,7 @@ export class ElasticQueryBuilder {
return filterObj;
}
documentQuery(query, size) {
documentQuery(query: any, size: number) {
query.size = size;
query.sort = {};
query.sort[this.timeField] = { order: 'desc', unmapped_type: 'boolean' };
@@ -136,12 +137,12 @@ export class ElasticQueryBuilder {
return query;
}
addAdhocFilters(query, adhocFilters) {
addAdhocFilters(query: any, adhocFilters: any) {
if (!adhocFilters) {
return;
}
let i, filter, condition, queryCondition;
let i, filter, condition: any, queryCondition: any;
for (i = 0; i < adhocFilters.length; i++) {
filter = adhocFilters[i];
@@ -183,7 +184,7 @@ export class ElasticQueryBuilder {
}
}
build(target, adhocFilters?, queryString?) {
build(target: any, adhocFilters?: any, queryString?: string) {
// make sure query has defaults;
target.metrics = target.metrics || [queryDef.defaultMetricAgg()];
target.bucketAggs = target.bucketAggs || [queryDef.defaultBucketAgg()];
@@ -224,7 +225,7 @@ export class ElasticQueryBuilder {
for (i = 0; i < target.bucketAggs.length; i++) {
const aggDef = target.bucketAggs[i];
const esAgg = {};
const esAgg: any = {};
switch (aggDef.type) {
case 'date_histogram': {
@@ -265,8 +266,8 @@ export class ElasticQueryBuilder {
continue;
}
const aggField = {};
let metricAgg = null;
const aggField: any = {};
let metricAgg: any = null;
if (queryDef.isPipelineAgg(metric.type)) {
if (queryDef.isPipelineAggWithMultipleBucketPaths(metric.type)) {
@@ -323,7 +324,7 @@ export class ElasticQueryBuilder {
return query;
}
getTermsQuery(queryDef) {
getTermsQuery(queryDef: any) {
const query: any = {
size: 0,
query: {
@@ -368,7 +369,7 @@ export class ElasticQueryBuilder {
return query;
}
getLogsQuery(target, querystring) {
getLogsQuery(target: any, querystring: string) {
let query: any = {
size: 0,
query: {