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

Always refresh workflow context when context ID has changed using SetContextId activity

Browse source
This commit is contained in:
Sipke Schoorstra 2020-12-03 20:01:23 +01:00
parent 43cfe431f1
commit a3eb17b0ac
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs
View file

@ -36,6 +36,7 @@ namespace Elsa.Services.Models
public bool HasPostScheduledActivities => WorkflowInstance.PostScheduledActivities.Any();
public IWorkflowFault? WorkflowFault { get; private set; }
public bool IsFirstPass { get; private set; }
public bool ContextHasChanged { get; set; }
public void ScheduleActivities(IEnumerable<string> activityIds, object? input = default)
{

2
src/core/Elsa.Core/Activities/Primitives/SetContextId/SetContextId.cs
View file

@ -19,7 +19,9 @@ namespace Elsa.Activities.Primitives
protected override IActivityExecutionResult OnExecute(ActivityExecutionContext context)
{
var originalContextId = context.WorkflowExecutionContext.WorkflowInstance.ContextId;
context.WorkflowExecutionContext.WorkflowInstance.ContextId = ContextId;
context.WorkflowExecutionContext.ContextHasChanged = ContextId != originalContextId;
return Done();
}
}

5
src/core/Elsa.Core/Services/WorkflowRunner.cs
View file

@ -271,8 +271,11 @@ namespace Elsa.Services
var currentActivityId = scheduledActivity.ActivityId;
var activityBlueprint = workflowBlueprint.GetActivity(currentActivityId)!;
if (workflowBlueprint.ContextOptions?.ContextFidelity == WorkflowContextFidelity.Activity || activityBlueprint.LoadWorkflowContext)
if (workflowBlueprint.ContextOptions?.ContextFidelity == WorkflowContextFidelity.Activity || activityBlueprint.LoadWorkflowContext || workflowExecutionContext.ContextHasChanged)
{
workflowExecutionContext.WorkflowContext = await LoadWorkflowContextAsync(workflowExecutionContext, WorkflowContextFidelity.Activity, activityBlueprint.LoadWorkflowContext, cancellationToken);
workflowExecutionContext.ContextHasChanged = false;
}
var activityExecutionContext = new ActivityExecutionContext(scope, workflowExecutionContext, activityBlueprint, scheduledActivity.Input, cancellationToken);
var activity = await activityExecutionContext.ActivateActivityAsync(cancellationToken);