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

Fix workflow resumption when activity ids are not explicitly specified

Browse source
This commit is contained in:
Sipke Schoorstra 2020-10-16 13:20:26 +02:00
parent 95775643b1
commit dd823398f5
2 changed files with 15 additions and 4 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

@ -32,6 +32,7 @@ namespace Elsa.Services.Models
public IServiceProvider ServiceProvider { get; }
public bool HasScheduledActivities => scheduledActivities.Any();
public bool HasScheduledHaltingActivities => scheduledHaltingActivities.Any();
public IEnumerable<IActivity> ScheduledActivities => scheduledActivities;
public bool IsFirstPass { get; set; }
public LogEntry CurrentLogEntry => Workflow.ExecutionLog.LastOrDefault();
public WorkflowExecutionScope CurrentScope => Workflow.Scopes.Peek();

18
src/core/Elsa.Core/Services/WorkflowInvoker.cs
View file

@ -94,8 +94,7 @@ namespace Elsa.Services
CancellationToken cancellationToken = default) where T : IWorkflow, new()
{
var workflow = workflowFactory.CreateWorkflow<T>(input, workflowInstance);
var startActivities = workflow.Activities.Find(startActivityIds);
return ExecuteAsync(workflow, true, startActivities, cancellationToken);
return ResumeAsync(workflow, startActivityIds, cancellationToken);
}
public async Task<WorkflowExecutionContext> ResumeAsync(
@ -108,8 +107,19 @@ namespace Elsa.Services
workflowInstance.DefinitionId,
VersionOptions.SpecificVersion(workflowInstance.Version),
cancellationToken);
var workflow = workflowFactory.CreateWorkflow(definition, input, workflowInstance);
return await ExecuteAsync(workflow, true, startActivityIds, cancellationToken);
return await ResumeAsync(workflow, startActivityIds, cancellationToken);
}
public Task<WorkflowExecutionContext> ResumeAsync(
Workflow workflow,
IEnumerable<string> startActivityIds = default,
CancellationToken cancellationToken = default)
{
startActivityIds ??= workflow.BlockingActivities.Select(x => x.Id);
var startActivities = workflow.Activities.Find(startActivityIds);
return ExecuteAsync(workflow, true, startActivities, cancellationToken);
}
public async Task<IEnumerable<WorkflowExecutionContext>> TriggerAsync(
@ -419,7 +429,7 @@ namespace Elsa.Services
if (workflowExecutionContext.HasScheduledActivities)
{
workflow.BlockingActivities.RemoveWhere(startActivityList.Contains);
workflow.BlockingActivities.RemoveWhere(workflowExecutionContext.ScheduledActivities.Contains);
if (workflowExecutionContext.Workflow.Status == WorkflowStatus.Idle)
workflowExecutionContext.Start();