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

Fix output mapping

Browse source 
Fixes #4566
This commit is contained in:
Sipke Schoorstra 2023-11-19 22:04:18 +01:00
parent fbcb6ae493
commit 95bdcc64b6
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/Elsa.Workflows.Management/Activities/SetOutput/SetOutput.cs
View file

@ -59,7 +59,7 @@ public class SetOutput : CodeActivity
return;
var ancestorOutput = (Output)ancestorOutputDescriptor.ValueGetter(ancestorActivity)!;
ancestorContext.Set(ancestorOutput, outputValue);
ancestorContext.Set(ancestorOutput, outputValue, outputName);
// If the ancestor activity is the root workflow, we need to update the workflow execution context's output collection as well.
if (ancestorContext.ParentActivityExecutionContext == null)

23
src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivity.cs
View file

@ -67,21 +67,16 @@ public class WorkflowDefinitionActivity : Composite, IInitializable
foreach (var outputDescriptor in activityExecutionContext.ActivityDescriptor.Outputs)
{
var output = (Output?)outputDescriptor.ValueGetter(activityExecutionContext.Activity);
var value = activityExecutionContext.Get(output);
// If direct output mapping is used, we can read the output value directly from the memory.
var value = activityExecutionContext.Get(output) ?? activityExecutionContext.Get(outputDescriptor.Name);
if (value == null)
{
// If direct output mapping is used, we can read the output value directly from the memory.
value = activityExecutionContext.Get(outputDescriptor.Name);
// Make sure to select a parent scope to avoid naming collisions between outputs defined on the current scope and outputs defined on parent scopes.
var parentActivityExecutionContext = activityExecutionContext.ParentActivityExecutionContext ?? activityExecutionContext;
parentActivityExecutionContext.Set(output, value, outputDescriptor.Name);
}
else
{
activityExecutionContext.Set(output, value, outputDescriptor.Name);
}
// Make sure to select a parent scope to avoid naming collisions between outputs defined on the current scope and outputs defined on parent scopes.
var parentActivityExecutionContext = activityExecutionContext.ParentActivityExecutionContext?.GetAncestors()
.Any(x => x.ActivityDescriptor.Outputs.Any(y => y.Name == outputDescriptor.Name)) == true
? activityExecutionContext.ParentActivityExecutionContext ?? activityExecutionContext
: activityExecutionContext;
parentActivityExecutionContext.Set(output, value, outputDescriptor.Name);
}
// Complete this activity with the signal value.