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

WIP change name to value

pull/2128/head
Andrew Watkins 2017-10-17 12:44:16 -07:00
parent 54bb1de47f
commit 7d483d87df
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ui/spec/data_explorer/reducers/queryConfigSpec.js
View File

@ -83,7 +83,7 @@ describe('Chronograf.Reducers.DataExplorer.queryConfigs', () => {
state = reducer(
three,
addInitialField(queryId, {
name: 'a great field',
value: 'a great field',
type: 'field',
})
)
@ -133,7 +133,7 @@ describe('Chronograf.Reducers.DataExplorer.queryConfigs', () => {
const newState = reducer(
state,
toggleField(queryId, {
name: 'f2',
value: 'f2',
type: 'field',
})
)
@ -141,28 +141,28 @@ describe('Chronograf.Reducers.DataExplorer.queryConfigs', () => {
expect(newState[queryId].fields.length).to.equal(2)
expect(newState[queryId].fields[1].alias).to.deep.equal('mean_f2')
expect(newState[queryId].fields[1].args).to.deep.equal([
{name: 'f2', type: 'field'},
{value: 'f2', type: 'field'},
])
expect(newState[queryId].fields[1].name).to.deep.equal('mean')
expect(newState[queryId].fields[1].value).to.deep.equal('mean')
})
it('applies a func to newly selected fields', () => {
expect(state[queryId].fields.length).to.equal(1)
expect(state[queryId].fields[0].type).to.equal('func')
expect(state[queryId].fields[0].name).to.equal('mean')
expect(state[queryId].fields[0].value).to.equal('mean')
const newState = reducer(
state,
toggleField(queryId, {
name: 'f2',
value: 'f2',
type: 'field',
})
)
expect(newState[queryId].fields[1].name).to.equal('mean')
expect(newState[queryId].fields[1].value).to.equal('mean')
expect(newState[queryId].fields[1].alias).to.equal('mean_f2')
expect(newState[queryId].fields[1].args).to.deep.equal([
{name: 'f2', type: 'field'},
{value: 'f2', type: 'field'},
])
expect(newState[queryId].fields[1].type).to.equal('func')
})
@ -173,7 +173,7 @@ describe('Chronograf.Reducers.DataExplorer.queryConfigs', () => {
const newState = reducer(
state,
toggleField(queryId, {name: 'fk1', type: 'field'})
toggleField(queryId, {value: 'fk1', type: 'field'})
)
expect(newState[queryId].fields.length).to.equal(1)
@ -183,10 +183,10 @@ describe('Chronograf.Reducers.DataExplorer.queryConfigs', () => {
describe('DE_APPLY_FUNCS_TO_FIELD', () => {
it('applies new functions to a field', () => {
const f1 = {name: 'f1', type: 'field'}
const f2 = {name: 'f2', type: 'field'}
const f3 = {name: 'f3', type: 'field'}
const f4 = {name: 'f4', type: 'field'}
const f1 = {value: 'f1', type: 'field'}
const f2 = {value: 'f2', type: 'field'}
const f3 = {value: 'f3', type: 'field'}
const f4 = {value: 'f4', type: 'field'}
const initialState = {
[queryId]: {
@ -194,38 +194,38 @@ describe('Chronograf.Reducers.DataExplorer.queryConfigs', () => {
database: 'db1',
measurement: 'm1',
fields: [
{name: 'fn1', type: 'func', args: [f1], alias: `fn1_${f1.name}`},
{name: 'fn1', type: 'func', args: [f2], alias: `fn1_${f2.name}`},
{name: 'fn2', type: 'func', args: [f1], alias: `fn2_${f1.name}`},
{value: 'fn1', type: 'func', args: [f1], alias: `fn1_${f1.value}`},
{value: 'fn1', type: 'func', args: [f2], alias: `fn1_${f2.value}`},
{value: 'fn2', type: 'func', args: [f1], alias: `fn2_${f1.value}`},
],
},
}
const action = applyFuncsToField(queryId, {
field: {name: 'f1', type: 'field'},
field: {value: 'f1', type: 'field'},
funcs: [
{name: 'fn3', type: 'func', args: []},
{name: 'fn4', type: 'func', args: []},
{value: 'fn3', type: 'func', args: []},
{value: 'fn4', type: 'func', args: []},
],
})
const nextState = reducer(initialState, action)
expect(nextState[queryId].fields).to.deep.equal([
{name: 'fn3', type: 'func', args: [f1], alias: `fn3_${f1.name}`},
{name: 'fn4', type: 'func', args: [f1], alias: `fn4_${f1.name}`},
{name: 'fn1', type: 'func', args: [f2], alias: `fn1_${f2.name}`},
{value: 'fn3', type: 'func', args: [f1], alias: `fn3_${f1.value}`},
{value: 'fn4', type: 'func', args: [f1], alias: `fn4_${f1.value}`},
{value: 'fn1', type: 'func', args: [f2], alias: `fn1_${f2.value}`},
])
})
})
describe('DE_REMOVE_FUNCS', () => {
it('removes all functions and group by time when one field has no funcs applied', () => {
const f1 = {name: 'f1', type: 'field'}
const f2 = {name: 'f2', type: 'field'}
const f1 = {value: 'f1', type: 'field'}
const f2 = {value: 'f2', type: 'field'}
const fields = [
{name: 'fn1', type: 'func', args: [f1], alias: `fn1_${f1.name}`},
{name: 'fn1', type: 'func', args: [f2], alias: `fn1_${f2.name}`},
{value: 'fn1', type: 'func', args: [f1], alias: `fn1_${f1.value}`},
{value: 'fn1', type: 'func', args: [f2], alias: `fn1_${f2.value}`},
]
const groupBy = {time: '1m', tags: []}

40
ui/src/utils/queryTransitions.js
View File

@ -45,32 +45,32 @@ export const toggleKapaField = (query, field) => {
}
}
export const buildInitialField = name => [
export const buildInitialField = value => [
{
type: 'func',
alias: `mean_${name}`,
args: [{name, type: 'field'}],
name: 'mean',
alias: `mean_${value}`,
args: [{value, type: 'field'}],
value: 'mean',
},
]
export const addInitialField = (query, field, groupBy) => {
return {
...query,
fields: buildInitialField(field.name),
fields: buildInitialField(field.value),
groupBy,
}
}
export const toggleField = (query, {name}) => {
export const toggleField = (query, {value}) => {
const {fields = [], groupBy} = query
const isSelected = hasField(name, fields)
const isSelected = hasField(value, fields)
const newFuncs = fields.filter(f => f.type === 'func')
if (isSelected) {
// if list is all fields, remove that field
// if list is all funcs, remove all funcs that match
const newFields = removeField(name, fields)
const newFields = removeField(value, fields)
if (!newFields.length) {
return {
...query,
@ -91,15 +91,15 @@ export const toggleField = (query, {name}) => {
if (!newFuncs.length) {
return {
...query,
fields: [...fields, {name, type: 'field'}],
fields: [...fields, {value, type: 'field'}],
}
}
const defaultField = {
type: 'func',
alias: `mean_${name}`,
args: [{name, type: 'field'}],
name: 'mean',
alias: `mean_${value}`,
args: [{value, type: 'field'}],
value: 'mean',
}
return {
@ -137,12 +137,12 @@ export const applyFuncsToField = (query, {field, funcs = []}, groupBy) => {
return [
...acc,
funcs.map(func => {
const {name, type} = func
const args = [{name: f.name, type: 'field'}]
const alias = func.alias ? func.alias : `${func.name}_${f.name}`
const {value, type} = func
const args = [{value: f.value, type: 'field'}]
const alias = func.alias ? func.alias : `${func.value}_${f.value}`
return {
name,
value,
type,
args,
alias,
@ -151,12 +151,12 @@ export const applyFuncsToField = (query, {field, funcs = []}, groupBy) => {
]
}
const fieldToChange = f.args.find(a => a.name === field.name)
const fieldToChange = f.args.find(a => a.value === field.value)
// Apply new funcs to field
if (fieldToChange) {
const newFuncs = funcs.reduce((acc2, func) => {
const funcsToChange = getFuncsByFieldName(fieldToChange.name, acc)
const dup = funcsToChange.find(a => a.name === func.name)
const funcsToChange = getFuncsByFieldName(fieldToChange.value, acc)
const dup = funcsToChange.find(a => a.value === func.value)
if (dup) {
return acc2
@ -167,7 +167,7 @@ export const applyFuncsToField = (query, {field, funcs = []}, groupBy) => {
{
...func,
args: [field],
alias: `${func.name}_${field.name}`,
alias: `${func.value}_${field.value}`,
},
]
}, [])