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

groupbys is array of arrays

pull/10616/head
ebb-tide 2018-05-01 20:19:59 -07:00
parent 4e3ac68bae
commit 3c3a7af23d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/utils/groupBy.js
View File

@ -42,7 +42,7 @@ const constructResults = (raw, groupBys) => {
const successfulResults = _.filter(results, r => _.isNil(r.error)) const successfulResults = _.filter(results, r => _.isNil(r.error))
if (groupBys[index]) { if (!_.isEmpty(groupBys[index])) {
return groupByMap(successfulResults, index, groupBys[index]) return groupByMap(successfulResults, index, groupBys[index])
} }
return map(successfulResults, r => ({...r, responseIndex: index})) return map(successfulResults, r => ({...r, responseIndex: index}))
@ -137,7 +137,7 @@ const insertGroupByValues = (
const timeSeries = [] const timeSeries = []
let existingRowIndex let existingRowIndex
forEach(serieses, (s, sind) => { forEach(serieses, (s, sind) => {
if (groupBys[s.responseIndex]) { if (!_.isEmpty(groupBys[s.responseIndex])) {
forEach(s.values, vs => { forEach(s.values, vs => {
timeSeries.push({time: vs[0], values: clone(dashArray)}) timeSeries.push({time: vs[0], values: clone(dashArray)})
existingRowIndex = timeSeries.length - 1 existingRowIndex = timeSeries.length - 1
@ -193,7 +193,7 @@ const constructTimeSeries = (
const seriesIndex = cells.seriesIndex[i] const seriesIndex = cells.seriesIndex[i]
const responseIndex = cells.responseIndex[i] const responseIndex = cells.responseIndex[i]
if (groupBys[cells.responseIndex[i]]) { if (!_.isEmpty(groupBys[cells.responseIndex[i]])) {
// we've already inserted GroupByValues // we've already inserted GroupByValues
continue continue
} }
@ -225,7 +225,7 @@ const constructTimeSeries = (
export const groupByTimeSeriesTransform = (raw, groupBys) => { export const groupByTimeSeriesTransform = (raw, groupBys) => {
if (!groupBys) { if (!groupBys) {
groupBys = Array(raw.length).fill(false) groupBys = Array(raw.length).fill([])
} }
const results = constructResults(raw, groupBys) const results = constructResults(raw, groupBys)

2
ui/src/utils/timeSeriesTransformers.js
View File

@ -30,7 +30,7 @@ export const timeSeriesToDygraph = (raw = [], isInDataExplorer) => {
const computeGroupBys = queryASTs => { const computeGroupBys = queryASTs => {
return queryASTs.map(queryAST => { return queryASTs.map(queryAST => {
return _.get(queryAST, ['groupBy', 'tags'], false) return _.get(queryAST, ['groupBy', 'tags'], [])
}) })
} }