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

Prevent custom composite activities from overriding values specified by the activity definition

Browse source 
This particularly fixes the issue where a composite activity can potentially specify its own activity ID, which would break the workflow since the activity definition ID (as generated by the designer) would be different.
This commit is contained in:
Sipke Schoorstra 2021-07-26 13:10:41 +02:00
parent 9b1e4616d0
commit 7479ff1210
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,19 +155,19 @@ namespace Elsa.Services.Workflows
else if (typeof(CompositeActivity).IsAssignableFrom(activityType.Type))
{
var compositeActivity = (CompositeActivity) ActivatorUtilities.CreateInstance(_serviceProvider, activityType.Type);
var compositeActivityBuilder = new CompositeActivityBuilder(_serviceProvider, _startingActivitiesProvider, activityType.Type, activityType.TypeName)
{
ActivityId = activityDefinition.ActivityId,
Name = activityDefinition.Name,
DisplayName = activityDefinition.DisplayName,
Description = activityDefinition.Description,
PersistWorkflowEnabled = activityDefinition.PersistWorkflow,
LoadWorkflowContextEnabled = activityDefinition.LoadWorkflowContext,
SaveWorkflowContextEnabled = activityDefinition.SaveWorkflowContext,
PropertyStorageProviders = activityDefinition.PropertyStorageProviders
};
var compositeActivityBuilder = new CompositeActivityBuilder(_serviceProvider, _startingActivitiesProvider, activityType.Type, activityType.TypeName);
compositeActivity.Build(compositeActivityBuilder);
// Ensure the composite activity is assigned the same properties as the activity definition referencing this activity.
compositeActivityBuilder.ActivityId = activityDefinition.ActivityId;
compositeActivityBuilder.Name = activityDefinition.Name;
compositeActivityBuilder.DisplayName = activityDefinition.DisplayName;
compositeActivityBuilder.Description = activityDefinition.Description;
compositeActivityBuilder.PersistWorkflowEnabled = activityDefinition.PersistWorkflow;
compositeActivityBuilder.LoadWorkflowContextEnabled = activityDefinition.LoadWorkflowContext;
compositeActivityBuilder.SaveWorkflowContextEnabled = activityDefinition.SaveWorkflowContext;
compositeActivityBuilder.PropertyStorageProviders = activityDefinition.PropertyStorageProviders;
var compositeActivityBlueprint = compositeActivityBuilder.Build($"{activityDefinition.ActivityId}:activity");