Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): avoid single stat crash #14423

Merged
merged 1 commit into from
Jul 23, 2019
Merged

fix(ui): avoid single stat crash #14423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ui/src/shared/utils/latestValues.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,24 @@ describe('latestValues', () => {
,result,table,_time,_value,foo
,,0,2018-12-10T18:29:48Z,1,7.0
,,0,2018-12-10T18:40:18Z,2,8.0`

const table = fromFlux(resp).table
const result = latestValues(table)

expect(result).toEqual([4, 6.0, 2.0, 8.0])
})

test('ignores rows with empty values', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the test!!

const resp = `#group,false,false,true,true,true,true,true,false,false
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,double,dateTime:RFC3339
#default,mean,,,,,,,,
,result,table,_start,_stop,_field,_measurement,host,_value,_time
,,0,2019-07-23T16:59:55.077422828Z,2019-07-23T17:04:55.077422828Z,used_percent,mem,oox4k.local,51.3,2019-07-23T17:04:00Z
,,0,2019-07-23T16:59:55.077422828Z,2019-07-23T17:04:55.077422828Z,used_percent,mem,oox4k.local,,2019-07-23T17:04:45Z`

const table = fromFlux(resp).table
const result = latestValues(table)

expect(result).toEqual([51.3])
})
})
6 changes: 3 additions & 3 deletions ui/src/shared/utils/latestValues.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {range, flatMap} from 'lodash'
import {range, flatMap, isFinite} from 'lodash'
import {Table, NumericColumnData} from '@influxdata/giraffe'

/*
Expand Down Expand Up @@ -97,7 +97,7 @@ export const latestValues = (table: Table): number[] => {
const d = (i: number) => {
const time = timeColData[i]

if (time && valueColsData.some(colData => !isNaN(colData[i]))) {
if (time && valueColsData.some(colData => isFinite(colData[i]))) {
return time
}

Expand All @@ -111,7 +111,7 @@ export const latestValues = (table: Table): number[] => {
valueColsData.map(colData => colData[i])
)

const definedLatestValues = latestValues.filter(x => !isNaN(x))
const definedLatestValues = latestValues.filter(x => isFinite(x))

return definedLatestValues
}
61 changes: 34 additions & 27 deletions ui/src/timeMachine/components/Vis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {AutoSizer} from 'react-virtualized'
import EmptyQueryView, {ErrorFormat} from 'src/shared/components/EmptyQueryView'
import ViewSwitcher from 'src/shared/components/ViewSwitcher'
import RawFluxDataTable from 'src/timeMachine/components/RawFluxDataTable'
import ErrorBoundary from 'src/shared/components/ErrorBoundary'

// Utils
import {getActiveTimeMachine} from 'src/timeMachine/selectors'
Expand Down Expand Up @@ -74,33 +75,39 @@ const TimeMachineVis: SFC<Props> = ({

return (
<div className="time-machine--view">
<EmptyQueryView
loading={loading}
errorFormat={ErrorFormat.Scroll}
errorMessage={errorMessage}
isInitialFetch={isInitialFetch}
queries={viewProperties.queries}
hasResults={checkResultsLength(giraffeResult)}
>
{isViewingRawData ? (
<AutoSizer>
{({width, height}) =>
width &&
height && (
<RawFluxDataTable files={files} width={width} height={height} />
)
}
</AutoSizer>
) : (
<ViewSwitcher
giraffeResult={giraffeResult}
files={files}
loading={loading}
properties={resolvedViewProperties}
timeZone={timeZone}
/>
)}
</EmptyQueryView>
<ErrorBoundary>
<EmptyQueryView
loading={loading}
errorFormat={ErrorFormat.Scroll}
errorMessage={errorMessage}
isInitialFetch={isInitialFetch}
queries={viewProperties.queries}
hasResults={checkResultsLength(giraffeResult)}
>
{isViewingRawData ? (
<AutoSizer>
{({width, height}) =>
width &&
height && (
<RawFluxDataTable
files={files}
width={width}
height={height}
/>
)
}
</AutoSizer>
) : (
<ViewSwitcher
giraffeResult={giraffeResult}
files={files}
loading={loading}
properties={resolvedViewProperties}
timeZone={timeZone}
/>
)}
</EmptyQueryView>
</ErrorBoundary>
</div>
)
}
Expand Down