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

Merge pull request #3101 from influxdata/bugfix/tempvar 

Fix templateVariables not loading properly.  Other variables were amazed
pull/10616/head
Andrew Watkins 2018-03-30 15:32:00 -07:00 committed by GitHub
parent fe8535f5b8 9a9708b11f
commit 588338877d
3 changed files with 114 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@
### Bug Fixes
1. [#2950](https://github.com/influxdata/chronograf/pull/2094): Always save template variables on first edit
1. [#3101](https://github.com/influxdata/chronograf/pull/3101): Fix template variables not loading
## v1.4.3.0 [2018-3-28]

52
ui/src/dashboards/reducers/ui.js
View File

@ -278,27 +278,37 @@ export default function ui(state = initialState, action) {
case 'EDIT_TEMPLATE_VARIABLE_VALUES': {
const {dashboardID, templateID, values} = action.payload
const dashboards = state.dashboards.map(
dashboard =>
dashboard.id === dashboardID
? {
...dashboard,
templates: dashboard.templates.map(
template =>
template.id === templateID && template.type !== 'csv'
? {
...template,
values: values.map(value => ({
selected: template.values[0].value === value,
value,
type: TEMPLATE_VARIABLE_TYPES[template.type],
})),
}
: template
),
}
: dashboard
)
const dashboards = state.dashboards.map(dashboard => {
if (dashboard.id !== dashboardID) {
return dashboard
}
const templates = dashboard.templates.map(template => {
if (template.id !== templateID && template.type !== 'csv') {
return template
}
const selectedValue = _.get(template, 'values', []).find(
v => v.selected
)
const v = values.map(value => ({
selected: _.get(selectedValue, 'value') === value,
value,
type: TEMPLATE_VARIABLE_TYPES[template.type],
}))
return {
...template,
values: v,
}
})
return {
...dashboard,
templates,
}
})
return {...state, dashboards}
}

111
ui/test/dashboards/reducers/ui.test.js
View File

@ -13,39 +13,42 @@ import {
templateVariableSelected,
templateVariablesSelectedByName,
cancelEditCell,
editTemplateVariableValues,
} from 'src/dashboards/actions'
let state
const templates = [
{
id: '1',
type: 'query',
label: 'test query',
tempVar: ':region:',
query: {
db: 'db1',
rp: 'rp1',
measurement: 'm1',
influxql: 'SHOW TAGS WHERE CHRONOGIRAFFE = "friend"',
},
values: [
{value: 'us-west', type: 'tagKey', selected: false},
{value: 'us-east', type: 'tagKey', selected: true},
{value: 'us-mount', type: 'tagKey', selected: false},
],
const t1 = {
id: '1',
type: 'tagKeys',
label: 'test query',
tempVar: ':region:',
query: {
db: 'db1',
rp: 'rp1',
measurement: 'm1',
influxql: 'SHOW TAGS WHERE CHRONOGIRAFFE = "friend"',
},
{
id: '2',
type: 'csv',
label: 'test csv',
tempVar: ':temperature:',
values: [
{value: '98.7', type: 'measurement', selected: false},
{value: '99.1', type: 'measurement', selected: false},
{value: '101.3', type: 'measurement', selected: true},
],
},
]
values: [
{value: 'us-west', type: 'tagKey', selected: false},
{value: 'us-east', type: 'tagKey', selected: true},
{value: 'us-mount', type: 'tagKey', selected: false},
],
}
const t2 = {
id: '2',
type: 'csv',
label: 'test csv',
tempVar: ':temperature:',
values: [
{value: '98.7', type: 'measurement', selected: false},
{value: '99.1', type: 'measurement', selected: false},
{value: '101.3', type: 'measurement', selected: true},
],
}
const templates = [t1, t2]
const d1 = {
id: 1,
@ -53,6 +56,7 @@ const d1 = {
name: 'd1',
templates,
}
const d2 = {id: 2, cells: [], name: 'd2', templates: []}
const dashboards = [d1, d2]
const c1 = {
@ -212,4 +216,53 @@ describe('DataExplorer.Reducers.UI', () => {
expect(actual.dashboards[0].cells[0].isEditing).toBe(false)
expect(actual.dashboards[0].cells[0].name).toBe(editingCell.name)
})
describe('EDIT_TEMPLATE_VARIABLE_VALUES', () => {
it('can edit the tempvar values', () => {
const actual = reducer(
{dashboards},
editTemplateVariableValues(d1.id, t1.id, ['v1', 'v2'])
)
const expected = [
{
selected: false,
value: 'v1',
type: 'tagKey',
},
{
selected: false,
value: 'v2',
type: 'tagKey',
},
]
expect(actual.dashboards[0].templates[0].values).toEqual(expected)
})
it('can handle an empty template.values', () => {
const ts = [{...t1, values: []}]
const ds = [{...d1, templates: ts}]
const actual = reducer(
{dashboards: ds},
editTemplateVariableValues(d1.id, t1.id, ['v1', 'v2'])
)
const expected = [
{
selected: false,
value: 'v1',
type: 'tagKey',
},
{
selected: false,
value: 'v2',
type: 'tagKey',
},
]
expect(actual.dashboards[0].templates[0].values).toEqual(expected)
})
})
})