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

fix: [workflows:editor] Fixed bug where param_id was missing thus preventing new param to be saved

pull/8530/head
Sami Mokaddem 2022-07-26 09:59:04 +02:00
parent 70aebb2f0b
commit 471b824366
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,7 +702,7 @@ function loadWorkflow(workflow) {
return '';
}
var module_data = Object.assign({}, all_blocks_by_id[block.data.id] || all_triggers_by_id[block.data.id])
module_data.params = mergeNodeAndModuleParams(block.data.params, module_data.params)
module_data.params = mergeNodeAndModuleParams(block, module_data.params)
module_data.saved_filters = block.data.saved_filters
block.data = module_data
var node_uid = uid() // only used for UI purposes
@ -903,17 +903,17 @@ function getCanvasCentroid() {
}
}
function mergeNodeAndModuleParams(nodeParams, moduleParams) {
function mergeNodeAndModuleParams(node, moduleParams) {
var moduleParamsByFormattedName = {}
var nodeParamsByFormattedName = {}
moduleParams.forEach(function (param) {
moduleParamsByFormattedName[param.label.toLowerCase().replace(' ', '-')] = param
})
nodeParams.forEach(function (param) {
node.data.params.forEach(function (param) {
nodeParamsByFormattedName[param.label.toLowerCase().replace(' ', '-')] = param
})
var finalParams = {}
var nodeAndModuleParams = nodeParams.concat(moduleParams)
var nodeAndModuleParams = node.data.params.concat(moduleParams)
nodeAndModuleParams.forEach(function (param) {
var formattedName = param.label.toLowerCase().replace(' ', '-')
if (finalParams[formattedName]) { // param has already been processed
@ -922,6 +922,9 @@ function mergeNodeAndModuleParams(nodeParams, moduleParams) {
if (moduleParamsByFormattedName[formattedName] === undefined) { // Param do not exist in the module (anymore or never did)
param.is_invalid = true
}
if (!param['param_id']) {
param['param_id'] = getIDForBlockParameter(node, param)
}
finalParam = Object.assign({}, nodeParamsByFormattedName[formattedName], moduleParamsByFormattedName[formattedName])
finalParams[formattedName] = finalParam
})