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

fix: custom info request batching

Browse source 
fix: issue from rebase
This commit is contained in:
Sérgio Salgado 2022-01-17 23:59:43 +00:00
parent 807c5bfc85
commit c241c458d3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/routes/pollingRoutes.js
View file

@ -41,8 +41,8 @@ const createTerms = terms => (terms.active && terms.text) ? ({
const buildTriggers = (allTriggers) => { const buildTriggers = (allTriggers) => {
const normalTriggers = [] const normalTriggers = []
const customTriggers = _.filter(o => { const customTriggers = _.filter(o => {
if (o.customInfoRequestId === '' || _.isNil(o.customInfoRequestId)) normalTriggers.push(o) if (_.isEmpty(o.customInfoRequestId) || _.isNil(o.customInfoRequestId)) normalTriggers.push(o)
return !_.isNil(o.customInfoRequestId) return !_.isNil(o.customInfoRequestId) && !_.isEmpty(o.customInfoRequestId)
}, allTriggers) }, allTriggers)
return _.flow([_.map(_.get('customInfoRequestId')), customRequestQueries.batchGetCustomInfoRequest])(customTriggers) return _.flow([_.map(_.get('customInfoRequestId')), customRequestQueries.batchGetCustomInfoRequest])(customTriggers)

4
new-lamassu-admin/src/pages/Triggers/Wizard.js
View file

@ -232,12 +232,12 @@ const Wizard = ({ onClose, save, error, currency, customInfoRequests }) => {
const isSuspend = values?.requirement?.requirement === 'suspend' const isSuspend = values?.requirement?.requirement === 'suspend'
const isCustom = values?.requirement?.requirement === 'custom' const isCustom = values?.requirement?.requirement === 'custom'
const hasRequirementError = requirements.hasRequirementError( const hasRequirementError = requirements().hasRequirementError(
errors, errors,
touched, touched,
values values
) )
const hasCustomRequirementError = requirements.hasCustomRequirementError( const hasCustomRequirementError = requirements().hasCustomRequirementError(
errors, errors,
touched, touched,
values values