From cbfb21c4c91e3efcd4e7b83a8cd9f569f6a9e9d8 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Mon, 12 Jul 2021 19:37:01 +0200 Subject: [PATCH] Remove redundant Trigger parameter from workflow selection --- .../Services/WorkerBase.cs | 3 +- .../Endpoints/Conductor/Events/Dispatch.cs | 3 +- .../Endpoints/Conductor/Events/Execute.cs | 3 +- .../Endpoints/Conductor/Tasks/Dispatch.cs | 3 +- .../Endpoints/Conductor/Tasks/Execute.cs | 3 +- .../Bookmarks/EntityChangedBookmark.cs | 11 +++----- .../Extensions/WorkflowRunnerExtensions.cs | 14 ++-------- .../Middleware/HttpEndpointMiddleware.cs | 3 +- .../Bookmarks/MessageReceivedBookmark.cs | 4 +-- .../Consumers/WorkflowConsumer.cs | 6 ---- .../Bookmarks/MessageReceivedBookmark.cs | 4 +-- .../Consumers/MessageConsumer.cs | 1 - .../Handlers/ResumeWebhookDrivenActivity.cs | 3 +- .../Handlers/TriggerWebhookActivities.cs | 3 +- .../Services/Dispatch/Models.cs | 2 +- .../Services/Workflows/IWorkflowLaunchpad.cs | 2 +- .../Activities/Signaling/Services/Signaler.cs | 28 ++++++++++--------- .../TriggerWorkflowsRequestConsumer.cs | 3 +- .../Services/Workflows/WorkflowLaunchpad.cs | 2 +- .../Endpoints/Workflows/Models.cs | 2 +- .../Endpoints/Workflows/Trigger.cs | 2 +- .../Jobs/CorrelatedWorkflowDefinitionJob.cs | 1 - .../CorrelatedWorkflowDefinitionGrain.cs | 1 - .../Elsa.ComponentTests.csproj | 1 + 24 files changed, 39 insertions(+), 69 deletions(-) diff --git a/src/activities/Elsa.Activities.AzureServiceBus/Services/WorkerBase.cs b/src/activities/Elsa.Activities.AzureServiceBus/Services/WorkerBase.cs index 7815aab75..b4782759b 100644 --- a/src/activities/Elsa.Activities.AzureServiceBus/Services/WorkerBase.cs +++ b/src/activities/Elsa.Activities.AzureServiceBus/Services/WorkerBase.cs @@ -72,8 +72,7 @@ namespace Elsa.Activities.AzureServiceBus.Services }; var bookmark = CreateBookmark(message); - var trigger = CreateTrigger(message); - var launchContext = new CollectWorkflowsContext(ActivityType, bookmark, trigger, correlationId); + var launchContext = new CollectWorkflowsContext(ActivityType, bookmark, correlationId); await _workflowLaunchpad.UseServiceAsync(service => service.CollectAndDispatchWorkflowsAsync(launchContext, model, cancellationToken)); } diff --git a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Dispatch.cs b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Dispatch.cs index fd8d85336..a9d2c4f15 100644 --- a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Dispatch.cs +++ b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Dispatch.cs @@ -18,8 +18,7 @@ namespace Elsa.Activities.Conductor.Endpoints.Conductor.Events public async Task Handle(string eventName, EventModel model) { var bookmark = new EventBookmark(eventName.ToLowerInvariant()); - var trigger = new EventBookmark(eventName.ToLowerInvariant()); - var context = new CollectWorkflowsContext(nameof(EventReceived), bookmark, trigger, model.CorrelationId, model.WorkflowInstanceId); + var context = new CollectWorkflowsContext(nameof(EventReceived), bookmark, model.CorrelationId, model.WorkflowInstanceId); var pendingWorkflows = await _workflowLaunchpad.CollectAndDispatchWorkflowsAsync(context, model); return Accepted(pendingWorkflows); diff --git a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Execute.cs b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Execute.cs index 1acd5bf7a..2cdccc811 100644 --- a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Execute.cs +++ b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Events/Execute.cs @@ -18,8 +18,7 @@ namespace Elsa.Activities.Conductor.Endpoints.Conductor.Events public async Task Handle(string eventName, EventModel model) { var bookmark = new EventBookmark(eventName); - var trigger = new EventBookmark(eventName); - var context = new CollectWorkflowsContext(nameof(EventReceived), bookmark, trigger, model.CorrelationId, model.WorkflowInstanceId); + var context = new CollectWorkflowsContext(nameof(EventReceived), bookmark, model.CorrelationId, model.WorkflowInstanceId); var pendingWorkflows = await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(context, model); return Accepted(pendingWorkflows); diff --git a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Dispatch.cs b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Dispatch.cs index 11eff0846..d4e92808a 100644 --- a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Dispatch.cs +++ b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Dispatch.cs @@ -18,8 +18,7 @@ namespace Elsa.Activities.Conductor.Endpoints.Conductor.Tasks public async Task Handle(string taskName, TaskResultModel model) { var bookmark = new TaskBookmark(taskName.ToLowerInvariant()); - var trigger = new TaskBookmark(taskName.ToLowerInvariant()); - var context = new CollectWorkflowsContext(nameof(RunTask), bookmark, trigger, model.CorrelationId, model.WorkflowInstanceId); + var context = new CollectWorkflowsContext(nameof(RunTask), bookmark, model.CorrelationId, model.WorkflowInstanceId); var pendingWorkflows = await _workflowLaunchpad.CollectAndDispatchWorkflowsAsync(context, model); return Accepted(pendingWorkflows); diff --git a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Execute.cs b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Execute.cs index c1e1a560e..3704bcd31 100644 --- a/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Execute.cs +++ b/src/activities/Elsa.Activities.Conductor/Endpoints/Conductor/Tasks/Execute.cs @@ -18,8 +18,7 @@ namespace Elsa.Activities.Conductor.Endpoints.Conductor.Tasks public async Task Handle(string taskName, TaskResultModel model) { var bookmark = new TaskBookmark(taskName.ToLowerInvariant()); - var trigger = new TaskBookmark(taskName.ToLowerInvariant()); - var context = new CollectWorkflowsContext(nameof(RunTask), bookmark, trigger, model.CorrelationId, model.WorkflowInstanceId); + var context = new CollectWorkflowsContext(nameof(RunTask), bookmark, model.CorrelationId, model.WorkflowInstanceId); var pendingWorkflows = await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(context, model); return Accepted(pendingWorkflows); diff --git a/src/activities/Elsa.Activities.Entity/Bookmarks/EntityChangedBookmark.cs b/src/activities/Elsa.Activities.Entity/Bookmarks/EntityChangedBookmark.cs index 6f209e60d..ed9cdeed9 100644 --- a/src/activities/Elsa.Activities.Entity/Bookmarks/EntityChangedBookmark.cs +++ b/src/activities/Elsa.Activities.Entity/Bookmarks/EntityChangedBookmark.cs @@ -7,18 +7,16 @@ namespace Elsa.Activities.Entity.Bookmarks { public class EntityChangedBookmark : IBookmark { - public EntityChangedBookmark(string? entityName, EntityChangedAction? action, string? contextId, string? correlationId) + public EntityChangedBookmark(string? entityName, EntityChangedAction? action, string? contextId) { EntityName = entityName; Action = action; ContextId = contextId; - CorrelationId = correlationId; } public string? EntityName { get; } public EntityChangedAction? Action { get; } public string? ContextId { get; } - public string? CorrelationId { get; } } public class EntityChangedWorkflowTriggerProvider : BookmarkProvider @@ -27,10 +25,9 @@ namespace Elsa.Activities.Entity.Bookmarks new[] { Result(new EntityChangedBookmark( - entityName: await context.ReadActivityPropertyAsync(x => x.EntityName, cancellationToken), - action: await context.ReadActivityPropertyAsync(x => x.Action, cancellationToken), - contextId: context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.ContextId, - correlationId: context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.CorrelationId + await context.ReadActivityPropertyAsync(x => x.EntityName, cancellationToken), + await context.ReadActivityPropertyAsync(x => x.Action, cancellationToken), + context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.ContextId )) }; } diff --git a/src/activities/Elsa.Activities.Entity/Extensions/WorkflowRunnerExtensions.cs b/src/activities/Elsa.Activities.Entity/Extensions/WorkflowRunnerExtensions.cs index 88293475a..ea4e417e4 100644 --- a/src/activities/Elsa.Activities.Entity/Extensions/WorkflowRunnerExtensions.cs +++ b/src/activities/Elsa.Activities.Entity/Extensions/WorkflowRunnerExtensions.cs @@ -8,7 +8,7 @@ namespace Elsa.Activities.Entity.Extensions { public static class WorkflowRunnerExtensions { - // TODO: Design multi-tenancy + // TODO: Design multi-tenancy. private const string? TenantId = default; public static async Task TriggerEntityChangedWorkflowsAsync( @@ -23,21 +23,13 @@ namespace Elsa.Activities.Entity.Extensions const string activityType = nameof(EntityChanged); var input = new EntityChangedContext(entityId, entityName, changedAction); - var trigger = new EntityChangedBookmark( - entityName, - changedAction, - contextId, - null - ); - var bookmark = new EntityChangedBookmark( entityName, changedAction, - contextId, - correlationId + contextId ); - await workflowDispatcher.DispatchAsync(new TriggerWorkflowsRequest(activityType, bookmark, trigger, input, correlationId, default, contextId, TenantId), cancellationToken); + await workflowDispatcher.DispatchAsync(new TriggerWorkflowsRequest(activityType, bookmark, input, correlationId, default, contextId, TenantId), cancellationToken); } } } \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Http/Middleware/HttpEndpointMiddleware.cs b/src/activities/Elsa.Activities.Http/Middleware/HttpEndpointMiddleware.cs index 816dfe6db..a31cc5fd4 100644 --- a/src/activities/Elsa.Activities.Http/Middleware/HttpEndpointMiddleware.cs +++ b/src/activities/Elsa.Activities.Http/Middleware/HttpEndpointMiddleware.cs @@ -41,9 +41,8 @@ namespace Elsa.Activities.Http.Middleware request.TryGetCorrelationId(out var correlationId); const string activityType = nameof(HttpEndpoint); - var trigger = new HttpEndpointBookmark(path, method); var bookmark = new HttpEndpointBookmark(path, method); - var collectWorkflowsContext = new CollectWorkflowsContext(activityType, bookmark, trigger, correlationId, default, default, TenantId); + var collectWorkflowsContext = new CollectWorkflowsContext(activityType, bookmark, correlationId, default, default, TenantId); var pendingWorkflows = await workflowLaunchpad.CollectWorkflowsAsync(collectWorkflowsContext, cancellationToken).ToList(); if (!pendingWorkflows.Any()) diff --git a/src/activities/Elsa.Activities.MassTransit/Bookmarks/MessageReceivedBookmark.cs b/src/activities/Elsa.Activities.MassTransit/Bookmarks/MessageReceivedBookmark.cs index a6398bb09..81e75fa2d 100644 --- a/src/activities/Elsa.Activities.MassTransit/Bookmarks/MessageReceivedBookmark.cs +++ b/src/activities/Elsa.Activities.MassTransit/Bookmarks/MessageReceivedBookmark.cs @@ -8,7 +8,6 @@ namespace Elsa.Activities.MassTransit.Bookmarks public class MessageReceivedBookmark : IBookmark { public string MessageType { get; set; } = default!; - public string? CorrelationId { get; set; } } public class MessageReceivedTriggerProvider : BookmarkProvider @@ -18,8 +17,7 @@ namespace Elsa.Activities.MassTransit.Bookmarks { Result(new MessageReceivedBookmark { - MessageType = (await context.ReadActivityPropertyAsync(x => x.MessageType, cancellationToken))!.Name, - CorrelationId = context.ActivityExecutionContext.WorkflowExecutionContext.CorrelationId + MessageType = (await context.ReadActivityPropertyAsync(x => x.MessageType, cancellationToken))!.Name }) }; } diff --git a/src/activities/Elsa.Activities.MassTransit/Consumers/WorkflowConsumer.cs b/src/activities/Elsa.Activities.MassTransit/Consumers/WorkflowConsumer.cs index 5bea60f09..2d9f56b87 100644 --- a/src/activities/Elsa.Activities.MassTransit/Consumers/WorkflowConsumer.cs +++ b/src/activities/Elsa.Activities.MassTransit/Consumers/WorkflowConsumer.cs @@ -39,11 +39,6 @@ namespace Elsa.Activities.MassTransit.Consumers break; var bookmark = new MessageReceivedBookmark - { - MessageType = message.GetType().Name, - CorrelationId = correlationId.ToString() - }; - var trigger = new MessageReceivedBookmark { MessageType = message.GetType().Name }; @@ -51,7 +46,6 @@ namespace Elsa.Activities.MassTransit.Consumers await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(new CollectWorkflowsContext( nameof(ReceiveMassTransitMessage), bookmark, - trigger, correlationId.ToString() )); } diff --git a/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs b/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs index 479352caa..c81aa3d27 100644 --- a/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs +++ b/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs @@ -8,7 +8,6 @@ namespace Elsa.Activities.Rebus.Bookmarks public class MessageReceivedBookmark : IBookmark { public string MessageType { get; set; } = default!; - public string? CorrelationId { get; set; } } public class MessageReceivedTriggerProvider : BookmarkProvider @@ -18,8 +17,7 @@ namespace Elsa.Activities.Rebus.Bookmarks { Result(new MessageReceivedBookmark { - MessageType = (await context.ReadActivityPropertyAsync(x => x.MessageType, cancellationToken))!.Name, - CorrelationId = context.ActivityExecutionContext.WorkflowExecutionContext.CorrelationId + MessageType = (await context.ReadActivityPropertyAsync(x => x.MessageType, cancellationToken))!.Name }) }; } diff --git a/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs b/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs index dad7ed4b9..abfb4cf02 100644 --- a/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs +++ b/src/activities/Elsa.Activities.Rebus/Consumers/MessageConsumer.cs @@ -25,7 +25,6 @@ namespace Elsa.Activities.Rebus.Consumers var correlationId = MessageContext.Current.TransportMessage.Headers.GetValueOrNull(Headers.CorrelationId); await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(new CollectWorkflowsContext( nameof(RebusMessageReceived), - new MessageReceivedBookmark { MessageType = message.GetType().Name, CorrelationId = correlationId }, new MessageReceivedBookmark { MessageType = message.GetType().Name }, correlationId, default, diff --git a/src/activities/Elsa.Activities.Telnyx/Handlers/ResumeWebhookDrivenActivity.cs b/src/activities/Elsa.Activities.Telnyx/Handlers/ResumeWebhookDrivenActivity.cs index 390bc9051..cbecadadb 100644 --- a/src/activities/Elsa.Activities.Telnyx/Handlers/ResumeWebhookDrivenActivity.cs +++ b/src/activities/Elsa.Activities.Telnyx/Handlers/ResumeWebhookDrivenActivity.cs @@ -39,9 +39,8 @@ namespace Elsa.Activities.Telnyx.Handlers return; var correlationId = GetCorrelationId(receivedPayload); - var trigger = CreateBookmark(); var bookmark = CreateBookmark(); - var context = new CollectWorkflowsContext(ActivityTypeName, bookmark, trigger, correlationId); + var context = new CollectWorkflowsContext(ActivityTypeName, bookmark, correlationId); await _workflowLaunchpad.CollectAndDispatchWorkflowsAsync(context, receivedPayload, cancellationToken); } diff --git a/src/activities/Elsa.Activities.Telnyx/Webhooks/Handlers/TriggerWebhookActivities.cs b/src/activities/Elsa.Activities.Telnyx/Webhooks/Handlers/TriggerWebhookActivities.cs index 0b477bd9d..fd8f238ba 100644 --- a/src/activities/Elsa.Activities.Telnyx/Webhooks/Handlers/TriggerWebhookActivities.cs +++ b/src/activities/Elsa.Activities.Telnyx/Webhooks/Handlers/TriggerWebhookActivities.cs @@ -41,8 +41,7 @@ namespace Elsa.Activities.Telnyx.Webhooks.Handlers var correlationId = GetCorrelationId(payload); var bookmark = new NotificationBookmark(eventType); - var trigger = new NotificationBookmark(eventType); - var context = new CollectWorkflowsContext(activityType, bookmark, trigger, correlationId); + var context = new CollectWorkflowsContext(activityType, bookmark, correlationId); await _workflowLaunchpad.CollectAndDispatchWorkflowsAsync(context, webhook, cancellationToken); } diff --git a/src/core/Elsa.Abstractions/Services/Dispatch/Models.cs b/src/core/Elsa.Abstractions/Services/Dispatch/Models.cs index 18d0174ef..417b6a5ef 100644 --- a/src/core/Elsa.Abstractions/Services/Dispatch/Models.cs +++ b/src/core/Elsa.Abstractions/Services/Dispatch/Models.cs @@ -2,7 +2,7 @@ namespace Elsa.Services { - public record TriggerWorkflowsRequest(string ActivityType, IBookmark Bookmark, IBookmark Trigger, object? Input = default, string? CorrelationId = default, string? WorkflowInstanceId = default, string? ContextId = default, string? TenantId = default); + public record TriggerWorkflowsRequest(string ActivityType, IBookmark Bookmark, object? Input = default, string? CorrelationId = default, string? WorkflowInstanceId = default, string? ContextId = default, string? TenantId = default); public record ExecuteWorkflowDefinitionRequest(string WorkflowDefinitionId, string? ActivityId = default, object? Input = default, string? CorrelationId = default, string? ContextId = default, string? TenantId = default); diff --git a/src/core/Elsa.Abstractions/Services/Workflows/IWorkflowLaunchpad.cs b/src/core/Elsa.Abstractions/Services/Workflows/IWorkflowLaunchpad.cs index 2e184ae90..85917435d 100644 --- a/src/core/Elsa.Abstractions/Services/Workflows/IWorkflowLaunchpad.cs +++ b/src/core/Elsa.Abstractions/Services/Workflows/IWorkflowLaunchpad.cs @@ -95,7 +95,7 @@ namespace Elsa.Services Task> CollectAndDispatchWorkflowsAsync(CollectWorkflowsContext context, object? input = default, CancellationToken cancellationToken = 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 CollectWorkflowsContext(string ActivityType, IBookmark? Bookmark, 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); } \ No newline at end of file diff --git a/src/core/Elsa.Core/Activities/Signaling/Services/Signaler.cs b/src/core/Elsa.Core/Activities/Signaling/Services/Signaler.cs index 5df7482b2..27ac82750 100644 --- a/src/core/Elsa.Core/Activities/Signaling/Services/Signaler.cs +++ b/src/core/Elsa.Core/Activities/Signaling/Services/Signaler.cs @@ -37,7 +37,6 @@ namespace Elsa.Activities.Signaling.Services return await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(new CollectWorkflowsContext( nameof(SignalReceived), new SignalReceivedBookmark { Signal = normalizedSignal }, - new SignalReceivedBookmark { Signal = normalizedSignal }, correlationId, workflowInstanceId, default, @@ -53,17 +52,20 @@ namespace Elsa.Activities.Signaling.Services return await DispatchSignalAsync(signal.Name, input, signal.WorkflowInstanceId, cancellationToken: cancellationToken); } - public async Task> DispatchSignalAsync(string signal, object? input = default, string? workflowInstanceId = default, string? correlationId = default, CancellationToken cancellationToken = default) => - await _workflowLaunchpad.CollectAndDispatchWorkflowsAsync(new CollectWorkflowsContext( - nameof(SignalReceived), - new SignalReceivedBookmark { Signal = signal }, - new SignalReceivedBookmark { Signal = signal }, - correlationId, - workflowInstanceId, - default, - TenantId - ), - new Signal(signal, input), - cancellationToken); + public async Task> DispatchSignalAsync(string signal, object? input = default, string? workflowInstanceId = default, string? correlationId = default, CancellationToken cancellationToken = default) + { + var normalizedSignal = signal.ToLowerInvariant(); + + return await _workflowLaunchpad.CollectAndDispatchWorkflowsAsync(new CollectWorkflowsContext( + nameof(SignalReceived), + new SignalReceivedBookmark { Signal = normalizedSignal }, + correlationId, + workflowInstanceId, + default, + TenantId + ), + new Signal(normalizedSignal, input), + cancellationToken); + } } } \ No newline at end of file diff --git a/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs b/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs index bb9b50bab..e4d840874 100644 --- a/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs +++ b/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs @@ -16,8 +16,7 @@ namespace Elsa.Services.Dispatch.Consumers { var pendingWorkflows = await _workflowLaunchpad.CollectWorkflowsAsync(new CollectWorkflowsContext( message.ActivityType, - message.Bookmark, - message.Trigger, + message.Bookmark, message.CorrelationId, message.WorkflowInstanceId, message.ContextId, diff --git a/src/core/Elsa.Core/Services/Workflows/WorkflowLaunchpad.cs b/src/core/Elsa.Core/Services/Workflows/WorkflowLaunchpad.cs index 17fad5586..290b159f3 100644 --- a/src/core/Elsa.Core/Services/Workflows/WorkflowLaunchpad.cs +++ b/src/core/Elsa.Core/Services/Workflows/WorkflowLaunchpad.cs @@ -199,7 +199,7 @@ namespace Elsa.Services.Workflows { _logger.LogDebug("Triggering workflows using {ActivityType}", context.ActivityType); - var filter = context.Trigger ?? context.Bookmark; + var filter = context.Bookmark; var triggers = filter != null ? (await _triggerFinder.FindTriggersAsync(context.ActivityType, filter, context.TenantId, cancellationToken)).ToList() : new List(); var startableWorkflows = new List(); diff --git a/src/server/Elsa.Server.Api/Endpoints/Workflows/Models.cs b/src/server/Elsa.Server.Api/Endpoints/Workflows/Models.cs index 07a04f5c0..e8b0ec0d8 100644 --- a/src/server/Elsa.Server.Api/Endpoints/Workflows/Models.cs +++ b/src/server/Elsa.Server.Api/Endpoints/Workflows/Models.cs @@ -18,7 +18,7 @@ namespace Elsa.Server.Api.Endpoints.Workflows public record DispatchTriggerWorkflowsRequestModel(string ActivityType, IBookmark? Bookmark, IBookmark? Trigger, string? CorrelationId, string? WorkflowInstanceId, string? ContextId, object? Input); public record DispatchTriggerWorkflowsResponseModel(ICollection PendingWorkflows); - public record TriggerWorkflowsRequestModel(string ActivityType, IBookmark? Bookmark, IBookmark? Trigger, string? CorrelationId, string? WorkflowInstanceId, string? ContextId, object? Input, bool Dispatch); + public record TriggerWorkflowsRequestModel(string ActivityType, IBookmark? Bookmark, string? CorrelationId, string? WorkflowInstanceId, string? ContextId, object? Input, bool Dispatch); public record TriggerWorkflowsResponseModel(ICollection TriggeredWorkflows); } \ No newline at end of file diff --git a/src/server/Elsa.Server.Api/Endpoints/Workflows/Trigger.cs b/src/server/Elsa.Server.Api/Endpoints/Workflows/Trigger.cs index c83e26b98..a34aa802c 100644 --- a/src/server/Elsa.Server.Api/Endpoints/Workflows/Trigger.cs +++ b/src/server/Elsa.Server.Api/Endpoints/Workflows/Trigger.cs @@ -38,7 +38,7 @@ namespace Elsa.Server.Api.Endpoints.Workflows public async Task Handle(TriggerWorkflowsRequestModel request, CancellationToken cancellationToken = default) { var tenantId = await _tenantAccessor.GetTenantIdAsync(cancellationToken); - var context = new CollectWorkflowsContext(request.ActivityType, request.Bookmark, request.Trigger, request.CorrelationId, request.WorkflowInstanceId, request.ContextId, tenantId); + var context = new CollectWorkflowsContext(request.ActivityType, request.Bookmark, request.CorrelationId, request.WorkflowInstanceId, request.ContextId, tenantId); ICollection triggeredWorkflows; if (request.Dispatch) diff --git a/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs b/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs index c4daa52a1..c5667faba 100644 --- a/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs +++ b/src/server/Elsa.Server.Hangfire/Jobs/CorrelatedWorkflowDefinitionJob.cs @@ -12,7 +12,6 @@ namespace Elsa.Server.Hangfire.Jobs public async Task ExecuteAsync(TriggerWorkflowsRequest request, CancellationToken cancellationToken = default) => await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(new CollectWorkflowsContext( request.ActivityType, request.Bookmark, - request.Trigger, request.CorrelationId, request.WorkflowInstanceId, request.ContextId, diff --git a/src/server/Elsa.Server.Orleans/Grains/CorrelatedWorkflowDefinitionGrain.cs b/src/server/Elsa.Server.Orleans/Grains/CorrelatedWorkflowDefinitionGrain.cs index 113220c46..0f22f355c 100644 --- a/src/server/Elsa.Server.Orleans/Grains/CorrelatedWorkflowDefinitionGrain.cs +++ b/src/server/Elsa.Server.Orleans/Grains/CorrelatedWorkflowDefinitionGrain.cs @@ -16,7 +16,6 @@ namespace Elsa.Server.Orleans.Grains public async Task ExecutedCorrelatedWorkflowAsync(TriggerWorkflowsRequest request, CancellationToken cancellationToken = default) => await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(new CollectWorkflowsContext( request.ActivityType, request.Bookmark, - request.Trigger, request.CorrelationId, request.WorkflowInstanceId, request.ContextId, diff --git a/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj b/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj index 45e574a3a..b71f6a721 100644 --- a/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj +++ b/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj @@ -10,6 +10,7 @@ +