diff --git a/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceived.cs b/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceived.cs index 405a496f4..c88a5a6d9 100644 --- a/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceived.cs +++ b/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceived.cs @@ -23,9 +23,6 @@ namespace Elsa.Activities.Signaling [ActivityInput(Hint = "The name of the signal to wait for.", SupportedSyntaxes = new[] { SyntaxNames.JavaScript, SyntaxNames.Liquid })] public string Signal { get; set; } = default!; - [ActivityInput(Hint = "The scope of the signal to wait for.", SupportedSyntaxes = new[] { SyntaxNames.JavaScript, SyntaxNames.Liquid }, DefaultValue = SignalScope.Instance, Category = PropertyCategories.Advanced)] - public SignalScope Scope { get; set; } = SignalScope.Instance; - [ActivityOutput(Hint = "The input that was received with the signal.")] public object? SignalInput { get; set; } diff --git a/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceivedBookmarkProvider.cs b/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceivedBookmarkProvider.cs index e36c11440..a01bcb6c2 100644 --- a/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceivedBookmarkProvider.cs +++ b/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalReceivedBookmarkProvider.cs @@ -11,7 +11,6 @@ namespace Elsa.Activities.Signaling public class SignalReceivedBookmark : IBookmark { public string Signal { get; set; } = default!; - public string? WorkflowInstanceId { get; set; } } public class SignalReceivedBookmarkProvider : BookmarkProvider @@ -21,25 +20,11 @@ namespace Elsa.Activities.Signaling private async IAsyncEnumerable GetBookmarksInternalAsync(BookmarkProviderContext context, [EnumeratorCancellation] CancellationToken cancellationToken) { var signalName = (await context.ReadActivityPropertyAsync(x => x.Signal, cancellationToken))!.ToLowerInvariant(); - var signalScope = (await context.ReadActivityPropertyAsync(x => x.Scope, cancellationToken))!; - - if (context.Mode == BookmarkIndexingMode.WorkflowBlueprint || signalScope == SignalScope.Global) + + yield return Result(new SignalReceivedBookmark { - yield return Result(new SignalReceivedBookmark - { - Signal = signalName - }); - yield break; - } - - if (signalScope == SignalScope.Instance) - { - yield return Result(new SignalReceivedBookmark - { - Signal = signalName, - WorkflowInstanceId = context.ActivityExecutionContext.WorkflowInstance.Id - }); - } + Signal = signalName + }); } } } \ No newline at end of file diff --git a/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalScope.cs b/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalScope.cs deleted file mode 100644 index 304d23eba..000000000 --- a/src/core/Elsa.Core/Activities/Signaling/Activities/SignalReceived/SignalScope.cs +++ /dev/null @@ -1,16 +0,0 @@ -// ReSharper disable once CheckNamespace -namespace Elsa.Activities.Signaling -{ - public enum SignalScope - { - /// - /// Only signals targeting a specific workflow instance will be handled. - /// - Instance, - - /// - /// All signals with a specified name will be handled. - /// - Global - } -} \ 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 899a5506d..5df7482b2 100644 --- a/src/core/Elsa.Core/Activities/Signaling/Services/Signaler.cs +++ b/src/core/Elsa.Core/Activities/Signaling/Services/Signaler.cs @@ -36,7 +36,7 @@ namespace Elsa.Activities.Signaling.Services return await _workflowLaunchpad.CollectAndExecuteWorkflowsAsync(new CollectWorkflowsContext( nameof(SignalReceived), - new SignalReceivedBookmark { Signal = normalizedSignal, WorkflowInstanceId = workflowInstanceId }, + new SignalReceivedBookmark { Signal = normalizedSignal }, new SignalReceivedBookmark { Signal = normalizedSignal }, correlationId, workflowInstanceId, @@ -56,7 +56,7 @@ namespace Elsa.Activities.Signaling.Services 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, WorkflowInstanceId = workflowInstanceId }, + new SignalReceivedBookmark { Signal = signal }, new SignalReceivedBookmark { Signal = signal }, correlationId, workflowInstanceId, diff --git a/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj b/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj index fd10e0063..a27e602dc 100644 --- a/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj +++ b/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj @@ -7,12 +7,12 @@ - - + + - +