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

Merge pull request #1842 from influxdata/dataLoaders/multiple-value-config 

Fix(ui/dataLoaders): Update config field modifiers
pull/10616/head
Iris Scholten 2018-12-11 13:06:10 -08:00 committed by GitHub
parent d1ef428c9e 97d397900e
commit 551a2fc3ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 161 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/mocks/dummyData.ts
View File

@ -12,7 +12,7 @@ import {Links} from 'src/types/v2/links'
import {Task, TaskStatus} from 'src/types/v2/tasks'
import {OnboardingStepProps} from 'src/onboarding/containers/OnboardingWizard'
import {ConfigurationState} from 'src/types/v2/dataLoaders'
import {TelegrafPluginInputCpu} from 'src/api'
import {TelegrafPluginInputCpu, TelegrafPluginInputRedis} from 'src/api'
export const links: Links = {
authorizations: '/api/v2/authorizations',
@ -292,6 +292,15 @@ export const telegrafPlugin = {
active: true,
}
export const redisPlugin = {
name: TelegrafPluginInputRedis.NameEnum.Redis,
type: TelegrafPluginInputRedis.TypeEnum.Input,
config: {
servers: [],
password: '',
},
}
export const influxDB2Plugin = {
name: 'influxdb_v2',
type: 'output',

124
ui/src/onboarding/reducers/dataLoaders.test.ts
View File

@ -8,14 +8,26 @@ import dataLoadersReducer, {
import {
setDataLoadersType,
addTelegrafPlugin,
addConfigValue,
removeConfigValue,
removeTelegrafPlugin,
setActiveTelegrafPlugin,
setTelegrafConfigID,
updateTelegrafPluginConfig,
} from 'src/onboarding/actions/dataLoaders'
// Types
import {TelegrafPluginInputCpu, TelegrafPluginInputDisk} from 'src/api'
import {DataLoaderType, ConfigurationState} from 'src/types/v2/dataLoaders'
import {
TelegrafPluginInputCpu,
TelegrafPluginInputDisk,
TelegrafPluginInputRedis,
} from 'src/api'
import {
DataLoaderType,
ConfigurationState,
TelegrafPlugin,
} from 'src/types/v2/dataLoaders'
import {redisPlugin} from 'mocks/dummyData'
describe('dataLoader reducer', () => {
it('can set a type', () => {
@ -129,4 +141,112 @@ describe('dataLoader reducer', () => {
expect(actual).toEqual(expected)
})
it('can update a plugin config field', () => {
const plugin = {
...redisPlugin,
config: {servers: [], password: ''},
}
const tp: TelegrafPlugin = {
name: TelegrafPluginInputRedis.NameEnum.Redis,
configured: ConfigurationState.Unconfigured,
active: true,
plugin,
}
const actual = dataLoadersReducer(
{...INITIAL_STATE, telegrafPlugins: [tp]},
updateTelegrafPluginConfig(
TelegrafPluginInputRedis.NameEnum.Redis,
'password',
'pa$$w0rd'
)
)
const expected = {
...INITIAL_STATE,
telegrafPlugins: [
{
...tp,
plugin: {
...plugin,
config: {servers: [], password: 'pa$$w0rd'},
},
},
],
}
expect(actual).toEqual(expected)
})
it('can add a plugin config value', () => {
const plugin = {
...redisPlugin,
config: {servers: ['first'], password: ''},
}
const tp: TelegrafPlugin = {
name: TelegrafPluginInputRedis.NameEnum.Redis,
configured: ConfigurationState.Unconfigured,
active: true,
plugin,
}
const actual = dataLoadersReducer(
{...INITIAL_STATE, telegrafPlugins: [tp]},
addConfigValue(
TelegrafPluginInputRedis.NameEnum.Redis,
'servers',
'second'
)
)
const expected = {
...INITIAL_STATE,
telegrafPlugins: [
{
...tp,
plugin: {
...plugin,
config: {servers: ['first', 'second'], password: ''},
},
},
],
}
expect(actual).toEqual(expected)
})
it('can remove a plugin config value', () => {
const plugin = {
...redisPlugin,
config: {servers: ['first', 'second'], password: ''},
}
const tp: TelegrafPlugin = {
name: TelegrafPluginInputRedis.NameEnum.Redis,
configured: ConfigurationState.Unconfigured,
active: true,
plugin,
}
const actual = dataLoadersReducer(
{...INITIAL_STATE, telegrafPlugins: [tp]},
removeConfigValue(
TelegrafPluginInputRedis.NameEnum.Redis,
'servers',
'first'
)
)
const expected = {
...INITIAL_STATE,
telegrafPlugins: [
{
...tp,
plugin: {
...plugin,
config: {servers: ['second'], password: ''},
},
},
],
}
expect(actual).toEqual(expected)
})
})

32
ui/src/onboarding/reducers/dataLoaders.ts
View File

@ -2,7 +2,10 @@
import _ from 'lodash'
// Utils
import {createNewPlugin} from 'src/onboarding/utils/pluginConfigs'
import {
createNewPlugin,
updateConfigFields,
} from 'src/onboarding/utils/pluginConfigs'
// Types
import {Action} from 'src/onboarding/actions/dataLoaders'
@ -67,10 +70,11 @@ export default (state = INITIAL_STATE, action: Action): DataLoadersState => {
return {
...tp,
plugin: {
...plugin,
[action.payload.field]: action.payload.value,
},
plugin: updateConfigFields(
plugin,
action.payload.field,
action.payload.value
),
}
}
return tp
@ -90,10 +94,11 @@ export default (state = INITIAL_STATE, action: Action): DataLoadersState => {
return {
...tp,
plugin: {
...plugin,
[action.payload.fieldName]: updatedConfigFieldValue,
},
plugin: updateConfigFields(
plugin,
action.payload.fieldName,
updatedConfigFieldValue
),
}
}
return tp
@ -117,10 +122,11 @@ export default (state = INITIAL_STATE, action: Action): DataLoadersState => {
return {
...tp,
plugin: {
...plugin,
[action.payload.fieldName]: filteredConfigFieldValue,
},
plugin: updateConfigFields(
plugin,
action.payload.fieldName,
filteredConfigFieldValue
),
}
}
return tp

10
ui/src/onboarding/utils/pluginConfigs.ts
View File

@ -14,6 +14,16 @@ export const getConfigFields = (
return telegrafPluginsInfo[pluginName].fields
}
export const updateConfigFields = <T extends Plugin>(
plugin: T,
fieldName: string,
value: string[] | string
): T => {
return Object.assign({}, plugin, {
config: Object.assign({}, plugin.config, {[fieldName]: value}),
})
}
export const createNewPlugin = (name: TelegrafPluginName): Plugin => {
return telegrafPluginsInfo[name].defaults
}