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

Fix WorkfowSelector by retaining existing triggers when updating triggers for a single workflow instance

Browse source
This commit is contained in:
Sipke Schoorstra 2021-01-10 17:10:04 +01:00
parent e0cf95c556
commit 997fb53b08
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/Elsa.Core/Triggers/WorkflowSelector.cs
View file

@ -143,17 +143,28 @@ namespace Elsa.Triggers
private async Task<IEnumerable<TriggerDescriptor>> BuildDescriptorsForAsync(IWorkflowBlueprint workflowBlueprint, string? workflowInstanceId, CancellationToken cancellationToken)
{
var descriptors = new List<TriggerDescriptor>();
if (workflowInstanceId != null)
{
descriptors = _descriptors![workflowBlueprint.Id].ToList();
descriptors.RemoveAll(x => x.WorkflowInstanceId == workflowInstanceId);
var workflowInstance = await _workflowInstanceStore.FindByIdAsync(workflowInstanceId, cancellationToken);
var blockingActivities = workflowBlueprint.GetBlockingActivities(workflowInstance!);
var resumeTriggers = await BuildDescriptorsAsync(workflowBlueprint, blockingActivities, workflowInstance, cancellationToken);
descriptors.AddRange(resumeTriggers);
return descriptors;
}
// Build triggers for workflow blue prints.
var startTriggers = await BuildDescriptorsAsync(workflowBlueprint, cancellationToken).ToList();
descriptors.AddRange(startTriggers);
// Build triggers for workflow instances.
var specification = workflowInstanceId == null
? new WorkflowInstanceDefinitionIdSpecification(workflowBlueprint.Id)
var specification = new WorkflowInstanceDefinitionIdSpecification(workflowBlueprint.Id)
.WithTenant(workflowBlueprint.TenantId)
.WithStatus(WorkflowStatus.Suspended)
: new WorkflowInstanceIdSpecification(workflowInstanceId);
.WithStatus(WorkflowStatus.Suspended);
var workflowInstances = await _workflowInstanceStore
.FindManyAsync(specification, cancellationToken: cancellationToken)