diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx index 3c54b6c0..4ad45128 100644 --- a/frontend/src/components/ParsedAction.jsx +++ b/frontend/src/components/ParsedAction.jsx @@ -1306,7 +1306,15 @@ const ParsedAction = (props) => { if (data.name.toLowerCase() === "headers") { console.log("Should show headers field instead with + and -!") - data.value = data.example + // Check if file ID exists + // + const fileFound = selectedActionParameters.find(param => param.name === "file_id") + if (fileFound === undefined || fileFound === null) { + data.value = data.example + } else { + // Purposely unset it if set by default when using files + data.value = "" + } } } @@ -3115,8 +3123,9 @@ const ParsedAction = (props) => { } } - console.log("DID REPLACE ACTUALLY WORK?? - Something is buggy."); + console.log("DID NAME REPLACE ACTUALLY WORK? - may be missing it in certain triggers"); setWorkflow(workflow); + setUpdate(Math.random()); baselabel = name }} /> diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index db072734..43849283 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -6284,9 +6284,13 @@ const AngularWorkflow = (defaultprops) => { const foundInfo = workflow.actions.find(ac => ac.id === selectedAction.id) } + // Setting an old reference just to use the same memory space elsewhere + // for selectedAction + const oldaction = JSON.parse(JSON.stringify(selectedAction)) + // Does this one find the wrong one? - //var newSelectedAction = selectedAction - var newSelectedAction = JSON.parse(JSON.stringify(selectedAction)) + //var newSelectedAction = JSON.parse(JSON.stringify(selectedAction)) + var newSelectedAction = selectedAction newSelectedAction.name = newaction.name; newSelectedAction.parameters = JSON.parse(JSON.stringify(newaction.parameters)) newSelectedAction.errors = []; @@ -6295,9 +6299,14 @@ const AngularWorkflow = (defaultprops) => { //console.log(newSelectedAction) // Simmple action swap autocompleter - if (selectedAction.parameters !== undefined && newSelectedAction.parameters !== undefined && selectedAction.id === newSelectedAction.id) { - for (var paramkey in selectedAction.parameters) { - const param = selectedAction.parameters[paramkey]; + if (oldaction.parameters !== undefined && newSelectedAction.parameters !== undefined && oldaction.id === newSelectedAction.id) { + var fileid_found = false + for (var paramkey in oldaction.parameters) { + const param = oldaction.parameters[paramkey]; + + if (param.name === "file_id") { + fileid_found = true + } if (param.value === null || param.value === undefined || param.value.length === 0) { continue @@ -6309,7 +6318,14 @@ const AngularWorkflow = (defaultprops) => { } if (param.name === "headers") { - console.log("Swap header? For now, yes") + console.log("Swap header? For now, yes. File found: ", fileid_found) + + if (fileid_found) { + newSelectedAction.parameters[paramkey].value = "" + newSelectedAction.parameters[paramkey].autocompleted = true + + continue + } //newSelectedAction.parameters[newParamIndex].value = param.value } @@ -6384,8 +6400,6 @@ const AngularWorkflow = (defaultprops) => { //setSelectedActionEnvironment(env) - console.log("NEW ACTION: ", newSelectedAction); - setSelectedAction(newSelectedAction); if (workflow.actions !== undefined && workflow.actions !== null && workflow.actions.length > 0) { const foundActionIndex = workflow.actions.findIndex(actiondata => actiondata.id === newSelectedAction.id) console.log("Found action on index ", foundActionIndex) @@ -6394,6 +6408,9 @@ const AngularWorkflow = (defaultprops) => { setWorkflow(workflow) } } + + console.log("NEW ACTION: ", newSelectedAction); + setSelectedAction(newSelectedAction); setUpdate(Math.random()); // FIXME - should change icon-node (descriptor) as well @@ -6401,7 +6418,7 @@ const AngularWorkflow = (defaultprops) => { for (var key in allNodes) { const currentNode = allNodes[key]; if ( - currentNode.data.attachedTo === selectedAction.id && + currentNode.data.attachedTo === oldaction.id && currentNode.data.isDescriptor ) { const foundnode = cy.getElementById(currentNode.data.id); @@ -11569,8 +11586,8 @@ const AngularWorkflow = (defaultprops) => {