refactor: extract isUseTrends() function
This commit is contained in:
20
dist/datasource-zabbix/datasource.js
vendored
20
dist/datasource-zabbix/datasource.js
vendored
@@ -250,12 +250,12 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
|
||||
}
|
||||
|
||||
// Create request for each target
|
||||
var promises = _.map(options.targets, function (target) {
|
||||
var promises = _.map(options.targets, function (t) {
|
||||
var timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
|
||||
var timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
|
||||
|
||||
// Prevent changes of original object
|
||||
target = _.cloneDeep(target);
|
||||
var target = _.cloneDeep(t);
|
||||
_this.replaceTargetVariables(target, options);
|
||||
|
||||
// Apply Time-related functions (timeShift(), etc)
|
||||
@@ -270,9 +270,7 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
|
||||
timeTo = time_to;
|
||||
}
|
||||
|
||||
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + _this.trendsFrom) / 1000);
|
||||
var useTrendsRange = Math.ceil(utils.parseInterval(_this.trendsRange) / 1000);
|
||||
var useTrends = _this.trends && (timeFrom <= useTrendsFrom || timeTo - timeFrom >= useTrendsRange);
|
||||
var useTrends = _this.isUseTrends([timeFrom, timeTo]);
|
||||
|
||||
// Metrics or Text query mode
|
||||
if (target.mode !== 1) {
|
||||
@@ -639,6 +637,18 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
|
||||
});
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: 'isUseTrends',
|
||||
value: function isUseTrends(timeRange) {
|
||||
var _timeRange = _slicedToArray(timeRange, 2),
|
||||
timeFrom = _timeRange[0],
|
||||
timeTo = _timeRange[1];
|
||||
|
||||
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
|
||||
var useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
|
||||
var useTrends = this.trends && (timeFrom <= useTrendsFrom || timeTo - timeFrom >= useTrendsRange);
|
||||
return useTrends;
|
||||
}
|
||||
}]);
|
||||
|
||||
return ZabbixAPIDatasource;
|
||||
|
||||
2
dist/datasource-zabbix/datasource.js.map
vendored
2
dist/datasource-zabbix/datasource.js.map
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user