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

Make Trigger bookmark optional and default to Bookmark

Browse source
This commit is contained in:
Sipke Schoorstra 2021-06-29 21:04:28 +02:00
parent f17cb73590
commit afeda9dba0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Elsa.Abstractions/Services/Workflows/IWorkflowLaunchpad.cs
View file

@ -95,7 +95,7 @@ namespace Elsa.Services
Task<IEnumerable<PendingWorkflow>> CollectAndDispatchWorkflowsAsync(CollectWorkflowsContext context, object? input = default, CancellationToken cancellationToken = default);
}
public record CollectWorkflowsContext(string ActivityType, IBookmark? Bookmark, IBookmark? Trigger, string? CorrelationId = default, string? WorkflowInstanceId = default, string? ContextId = default, string? TenantId = default);
public record CollectWorkflowsContext(string ActivityType, IBookmark? Bookmark, IBookmark? Trigger = default, string? CorrelationId = default, string? WorkflowInstanceId = default, string? ContextId = default, string? TenantId = default);
public record CollectStartableWorkflowsContext(string WorkflowDefinitionId, string? ActivityId = default, string? CorrelationId = default, string? ContextId = default, string? TenantId = default);
}

2
src/core/Elsa.Core/Services/Workflows/WorkflowLaunchpad.cs
View file

@ -199,7 +199,7 @@ namespace Elsa.Services.Workflows
{
_logger.LogDebug("Triggering workflows using {ActivityType}", context.ActivityType);
var filter = context.Trigger;
var filter = context.Trigger ?? context.Bookmark;
var triggers = filter != null ? (await _triggerFinder.FindTriggersAsync(context.ActivityType, filter, context.TenantId, cancellationToken)).ToList() : new List<TriggerFinderResult>();
var startableWorkflows = new List<StartableWorkflow>();