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

Ensure parent of composite activities is set

Browse source
This commit is contained in:
Sipke Schoorstra 2021-06-21 15:53:55 +02:00
parent 8784c618bd
commit 7a76323c81
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/Elsa.Core/Services/Workflows/WorkflowBlueprintMaterializer.cs
View file

@ -43,7 +43,7 @@ namespace Elsa.Services.Workflows
connections.AddRange(workflowDefinition.Connections.Select(x => ResolveConnection(x, activityBlueprints)).Where(x => x != null).Select(x => x!));
propertyProviders.AddRange(await CreatePropertyProviders(workflowDefinition, cancellationToken));
return new WorkflowBlueprint(
var workflowBlueprint = new WorkflowBlueprint(
workflowDefinition.DefinitionId,
workflowDefinition.Version,
workflowDefinition.TenantId,
@ -63,6 +63,11 @@ namespace Elsa.Services.Workflows
connections,
new ActivityPropertyProviders(propertyProviders.ToDictionary(x => x.Key, x => x.Value))
);
foreach (var compositeActivityBlueprint in compositeActivityBlueprints)
((CompositeActivityBlueprint) compositeActivityBlueprint).Parent = workflowBlueprint;
return workflowBlueprint;
}
private async Task<ActivityPropertyProviders> CreatePropertyProviders(ICompositeActivityDefinition compositeActivityDefinition, CancellationToken cancellationToken)
@ -79,7 +84,7 @@ namespace Elsa.Services.Workflows
foreach (var property in activityDefinition.Properties)
{
var propertyDescriptor = propertyDescriptors.FirstOrDefault(x => x.Name == property.Name);
if (propertyDescriptor == null)
{
_logger.LogWarning("Could not find the specified property '{PropertyName}' for activity type {ActivityTypeName}", property.Name, activityType.TypeName);
@ -116,7 +121,7 @@ namespace Elsa.Services.Workflows
{
var list = new List<IActivityBlueprint>();
var activityType = await _activityTypeService.GetActivityTypeAsync(activityDefinition.Type, cancellationToken);
if (activityDefinition is CompositeActivityDefinition compositeActivityDefinition)
{
var manyActivityBlueprints = await Task.WhenAll(compositeActivityDefinition.Activities.Select(async x => await CreateBlueprintsAsync(x, cancellationToken)));
@ -160,14 +165,14 @@ namespace Elsa.Services.Workflows
SaveWorkflowContextEnabled = activityDefinition.SaveWorkflowContext,
PropertyStorageProviders = activityDefinition.PropertyStorageProviders
};
compositeActivity.Build(compositeActivityBuilder);
var compositeActivityBlueprint = compositeActivityBuilder.Build($"{activityDefinition.ActivityId}:activity");
list.Add(compositeActivityBlueprint);
list.AddRange(compositeActivityBlueprint.Activities);
// Connect the composite activity to its starting activities.
var startActivities = _startingActivitiesProvider.GetStartActivities(compositeActivityBlueprint).ToList();
compositeActivityBlueprint.Connections.AddRange(startActivities.Select(x => new Connection(compositeActivityBlueprint, x, CompositeActivity.Enter)));