SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Update getInput JS function to also consider parent workflow input

Browse source
This commit is contained in:
Sipke Schoorstra 2023-10-22 22:03:48 +02:00
parent b60e55f91b
commit 2f2fb467a0
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/modules/Elsa.JavaScript/Services/JintJavaScriptEvaluator.cs
View file

@ -67,7 +67,7 @@ public class JintJavaScriptEvaluator : IJavaScriptEvaluator
engine.SetValue("getCorrelationId", (Func<string?>)(() => context.GetActivityExecutionContext().WorkflowExecutionContext.CorrelationId));
engine.SetValue("setVariable", (Action<string, object>)((name, value) => SetVariableInScope(context, name, value)));
engine.SetValue("getVariable", (Func<string, object?>)(name => GetVariableInScope(context, name)));
engine.SetValue("getInput", (Func<string, object?>)(name => context.GetWorkflowExecutionContext().Input.GetValue(name)));
engine.SetValue("getInput", (Func<string, object?>)(name => GetInput(context, name)));
engine.SetValue("getOutputFrom", (Func<string, string?, object?>)((activityIdName, outputName) => GetOutput(context, activityIdName, outputName)));
engine.SetValue("getLastResult", (Func<object?>)(() => GetLastResult(context)));
@ -128,6 +128,20 @@ public class JintJavaScriptEvaluator : IJavaScriptEvaluator
return workflowExecutionContext.GetLastActivityResult();
}
private object? GetInput(ExpressionExecutionContext expressionExecutionContext, string name)
{
// If there's a variable in the current scope with the specified name, return that.
var variable = expressionExecutionContext.GetVariable(name);
if (variable != null)
return variable.Get(expressionExecutionContext);
// Otherwise, return the input.
var workflowExecutionContext = expressionExecutionContext.GetWorkflowExecutionContext();
var input = workflowExecutionContext.Input;
return input.TryGetValue(name, out var value) ? value : default;
}
private static object? GetOutput(ExpressionExecutionContext context, string activityIdOrName, string? outputName)
{
var workflowExecutionContext = context.GetWorkflowExecutionContext();