lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix recursive enabledIf

Browse source
This commit is contained in:
Josh Harvey 2017-05-22 16:11:17 +01:00
parent c78519072b
commit aed92f0dab
2 changed files with 256 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/admin/config.js
View file

@ -2,6 +2,7 @@ const pify = require('pify')
const fs = pify(require('fs'))
const path = require('path')
const R = require('ramda')
const _ = require('lodash/fp')
const currencies = require('../../currencies.json')
const languageRec = require('../../languages.json')
@ -71,6 +72,13 @@ function validateCurrentConfig () {
.then(configValidate.validateRequires)
}
function decorateEnabledIf (schemaFields, schemaField) {
const code = schemaField.fieldLocator.code
const field = _.find(f => f.code === code, schemaFields)
console.log('DEBUG200: %j', [schemaField, code, field, schemaFields])
return _.set('fieldEnabledIf', field.enabledIf || [], schemaField)
}
function fetchConfigGroup (code) {
const fieldLocatorCodeEq = R.pathEq(['fieldLocator', 'code'])
return Promise.all([fetchSchema(), fetchData(), fetchConfig(), fetchMachines()])
@ -90,8 +98,11 @@ function fetchConfigGroup (code) {
]
const configFields = R.uniq(R.flatten(candidateFields)).filter(R.identity)
const values = configFields
.reduce((acc, configField) => acc.concat(config.filter(fieldLocatorCodeEq(configField))), [])
const reducer = (acc, configField) => {
return acc.concat(config.filter(fieldLocatorCodeEq(configField)))
}
const values = _.map(f => decorateEnabledIf(schema.fields, f), configFields.reduce(reducer, []))
groupSchema.fields = undefined
groupSchema.entries = schemaFields