MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [workflows:editor] Correctly draw parameters in the specified order

pull/8530/head
Sami Mokaddem 2022-07-29 10:36:01 +02:00
parent 762f1a7c9a
commit 64f1949b82
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/webroot/js/workflows-editor/workflows-editor.js
View File

@ -969,14 +969,16 @@ function mergeNodeAndModuleParams(node, moduleParams) {
value: val
}
})
var finalParams = {}
var procesedParams = {}
var finalParams = []
var fakeNodeFullParams = Object.values(nodeParamsById)
var nodeAndModuleParams = fakeNodeFullParams.concat(moduleParams)
var nodeAndModuleParams = moduleParams.concat(fakeNodeFullParams)
nodeAndModuleParams.forEach(function (param) {
var finalParam
if (finalParams[param.id]) { // param has already been processed
if (procesedParams[param.id]) { // param has already been processed
return;
}
procesedParams[param.id] = true
if (moduleParamsById[param.id] === undefined) { // Param do not exist in the module (anymore or never did)
param.is_invalid = true
finalParam = Object.assign({}, nodeParamsById[param.id])
@ -987,9 +989,9 @@ function mergeNodeAndModuleParams(node, moduleParams) {
if (!finalParam['param_id']) {
finalParam['param_id'] = getIDForNodeParameter(node, finalParam)
}
finalParams[finalParam.id] = finalParam
finalParams.push(finalParam)
})
return Object.values(finalParams)
return finalParams
}
function getIndexedParams(node, moduleParams) {