Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle user submitted zero

pull/10616/head
Andrew Watkins 2017-07-24 11:31:32 -07:00
parent 41d175e980
commit 15e41284e3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/spec/shared/parsing/getRangeForDygraphSpec.js
View File

@ -6,7 +6,7 @@ const mid = 10
const min = 5 const min = 5
const kapacitor = {value: null, rangeValue: null, operator: null} const kapacitor = {value: null, rangeValue: null, operator: null}
describe('getRangeForDygraphSpec', () => { describe.only('getRangeForDygraphSpec', () => {
it('gets the range for one timeSeries', () => { it('gets the range for one timeSeries', () => {
const timeSeries = [[date, min], [date, mid], [date, max]] const timeSeries = [[date, min], [date, mid], [date, max]]
const actual = getRange(timeSeries) const actual = getRange(timeSeries)

16
ui/src/shared/parsing/getRangeForDygraph.js
View File

@ -1,10 +1,18 @@
const PADDING_FACTOR = 0.1 const PADDING_FACTOR = 0.1
export default function getRange( const considerZero = (userNumber, number) => {
if (typeof userNumber === 'number') {
return userNumber
}
return number
}
const getRange = (
timeSeries, timeSeries,
userSelectedRange = [null, null], userSelectedRange = [null, null],
ruleValues = {value: null, rangeValue: null} ruleValues = {value: null, rangeValue: null}
) { ) => {
const {value, rangeValue, operator} = ruleValues const {value, rangeValue, operator} = ruleValues
const subtractPadding = val => +val - Math.abs(val * PADDING_FACTOR) const subtractPadding = val => +val - Math.abs(val * PADDING_FACTOR)
@ -56,5 +64,7 @@ export default function getRange(
const [userMin, userMax] = userSelectedRange const [userMin, userMax] = userSelectedRange
const [min, max] = range const [min, max] = range
return [+userMin || min, +userMax || max] return [considerZero(userMin, min), considerZero(userMax, max)]
} }
export default getRange