typescript: stricter typescript option

This commit is contained in:
Torkel Ödegaard
2017-09-26 11:24:58 +02:00
parent ff108bd871
commit 7b42e13c79
12 changed files with 72 additions and 55 deletions

View File

@@ -142,34 +142,34 @@ export class DataProcessor {
let fields = [];
var firstItem = dataList[0];
let fieldParts = [];
function getPropertiesRecursive(obj) {
_.forEach(obj, (value, key) => {
if (_.isObject(value)) {
fieldParts.push(key);
getPropertiesRecursive(value);
} else {
if (!onlyNumbers || _.isNumber(value)) {
let field = fieldParts.concat(key).join('.');
fields.push(field);
}
_.forEach(obj, (value, key) => {
if (_.isObject(value)) {
fieldParts.push(key);
getPropertiesRecursive(value);
} else {
if (!onlyNumbers || _.isNumber(value)) {
let field = fieldParts.concat(key).join('.');
fields.push(field);
}
});
fieldParts.pop();
}
});
fieldParts.pop();
}
if (firstItem.type === 'docs') {
if (firstItem.datapoints.length === 0) {
return [];
}
getPropertiesRecursive(firstItem.datapoints[0]);
return fields;
}
return fields;
}
getXAxisValueOptions(options) {
switch (this.panel.xaxis.mode) {
case 'time': {
return [];
}
case 'series': {
return [
{text: 'Avg', value: 'avg'},
@@ -180,6 +180,8 @@ export class DataProcessor {
];
}
}
return [];
}
pluckDeep(obj: any, property: string) {

View File

@@ -120,6 +120,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
if (panelWidth === 0) {
return true;
}
return false;
}
function drawHook(plot) {
@@ -385,6 +387,7 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
if (legendSideLastValue !== null && panel.legend.rightSide !== legendSideLastValue) {
return true;
}
return false;
}
function addTimeAxis(options) {

View File

@@ -21,7 +21,7 @@ function elasticHistogramToHeatmap(seriesList) {
for (let series of seriesList) {
let bound = Number(series.alias);
if (isNaN(bound)) {
return;
return heatmap;
}
for (let point of series.datapoints) {
@@ -384,36 +384,40 @@ function isHeatmapDataEqual(objA: any, objB: any): boolean {
let is_eql = !emptyXOR(objA, objB);
_.forEach(objA, (xBucket: XBucket, x) => {
if (objB[x]) {
if (objB[x]) {
if (emptyXOR(xBucket.buckets, objB[x].buckets)) {
is_eql = false;
return false;
}
_.forEach(xBucket.buckets, (yBucket: YBucket, y) => {
if (objB[x].buckets && objB[x].buckets[y]) {
if (objB[x].buckets[y].values) {
is_eql = _.isEqual(_.sortBy(yBucket.values), _.sortBy(objB[x].buckets[y].values));
if (!is_eql) {
return false;
}
} else {
is_eql = false;
return false;
}
} else {
is_eql = false;
return false;
}
});
if (!is_eql) {
return false;
}
} else {
is_eql = false;
return false;
}
_.forEach(xBucket.buckets, (yBucket: YBucket, y) => {
if (objB[x].buckets && objB[x].buckets[y]) {
if (objB[x].buckets[y].values) {
is_eql = _.isEqual(_.sortBy(yBucket.values), _.sortBy(objB[x].buckets[y].values));
if (!is_eql) {
return false;
} else {
return true;
}
} else {
is_eql = false;
return false;
}
} else {
is_eql = false;
return false;
}
});
if (!is_eql) {
return false;
} else {
return true;
}
} else {
is_eql = false;
return false;
}
});
return is_eql;
@@ -425,11 +429,11 @@ function emptyXOR(foo: any, bar: any): boolean {
export {
convertToHeatMap,
elasticHistogramToHeatmap,
convertToCards,
mergeZeroBuckets,
getMinLog,
getValueBucketBound,
isHeatmapDataEqual,
calculateBucketSize
elasticHistogramToHeatmap,
convertToCards,
mergeZeroBuckets,
getMinLog,
getValueBucketBound,
isHeatmapDataEqual,
calculateBucketSize
};

View File

@@ -137,6 +137,7 @@ transformers['table'] = {
if (!data || data.length === 0) {
return [];
}
return data[0].columns;
},
transform: function(data, panel, model) {
if (!data || data.length === 0) {