From f938c32a8f25aba5caee2c03a8d043ae8b76d5be Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sat, 28 Dec 2019 20:23:33 +0100 Subject: [PATCH] Rename destination activity to target activity --- README.md | 3 ++- .../Elsa.Activities.ControlFlow/Activities/Join.cs | 4 ++-- .../Extensions/WorkflowBlueprintExtensions.cs | 4 ++-- .../Extensions/WorkflowDefinitionExtensions.cs | 8 ++++---- src/core/Elsa.Abstractions/Models/ConnectionDefinition.cs | 6 +++--- src/core/Elsa.Core/Services/WorkflowFactory.cs | 2 +- src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs | 2 +- .../Elsa.WorkflowDesigner/Models/ConnectionModel.cs | 2 +- .../Indexes/WorkflowDefinitionIndex.cs | 4 ++-- .../Elsa.Server.GraphQL/Types/ConnectionDefinitionType.cs | 2 +- .../Types/Input/ConnectionDefinitionInputType.cs | 2 +- .../NodaTime/NodaTimeProfile.cs | 8 ++++---- 12 files changed, 24 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 9850b12cb..0e022432f 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Version 2.0 - [ ] Service Bus Messaging - [ ] Generic Command & Event Activities +- [ ] Workflow Host GraphQL API - [ ] Workflow Host REST API - [ ] Workflow Host gRPC API - [ ] Workflow Server @@ -48,11 +49,11 @@ Version 2.0 - [ ] More activities - [ ] Workflow Designer UI improvements - [ ] Activity Editor UI improvements +- [x] Container Activities Version 3.0 - [ ] State Machines -- [ ] Container Activities ## Workflow Designer diff --git a/src/activities/Elsa.Activities.ControlFlow/Activities/Join.cs b/src/activities/Elsa.Activities.ControlFlow/Activities/Join.cs index 2dc1d34f6..6555ad58c 100644 --- a/src/activities/Elsa.Activities.ControlFlow/Activities/Join.cs +++ b/src/activities/Elsa.Activities.ControlFlow/Activities/Join.cs @@ -95,8 +95,8 @@ namespace Elsa.Activities.ControlFlow.Activities // Get any connection that is pointing to this activity. var inboundTransitionsQuery = from connection in outboundConnections - let destinationActivity = connection.Target.Activity - where destinationActivity.Type == nameof(Join) + let targetActivity = connection.Target.Activity + where targetActivity.Type == nameof(Join) select connection; var inboundConnections = inboundTransitionsQuery.ToList(); diff --git a/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs b/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs index 835a4edf0..4f3a5635c 100644 --- a/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs +++ b/src/core/Elsa.Abstractions/Extensions/WorkflowBlueprintExtensions.cs @@ -8,12 +8,12 @@ namespace Elsa.Extensions { public static IEnumerable GetStartActivities(this WorkflowBlueprint workflow) { - var destinationActivityIds = + var targetActivityIds = workflow.Connections.Select(x => x.Target.Activity.Id).Distinct().ToLookup(x => x); var query = from activity in workflow.Activities - where !destinationActivityIds.Contains(activity.Id) + where !targetActivityIds.Contains(activity.Id) select activity; var activities = query.ToArray(); diff --git a/src/core/Elsa.Abstractions/Extensions/WorkflowDefinitionExtensions.cs b/src/core/Elsa.Abstractions/Extensions/WorkflowDefinitionExtensions.cs index 272dadc9c..99185dd51 100644 --- a/src/core/Elsa.Abstractions/Extensions/WorkflowDefinitionExtensions.cs +++ b/src/core/Elsa.Abstractions/Extensions/WorkflowDefinitionExtensions.cs @@ -8,12 +8,12 @@ namespace Elsa.Extensions { public static IEnumerable GetStartActivities(this WorkflowDefinitionVersion workflow) { - var destinationActivityIds = - workflow.Connections.Select(x => x.DestinationActivityId).Distinct().ToLookup(x => x); + var targetActivityIds = + workflow.Connections.Select(x => x.TargetActivityId).Distinct().ToLookup(x => x); var query = from activity in workflow.Activities - where !destinationActivityIds.Contains(activity.Id) + where !targetActivityIds.Contains(activity.Id) select activity; var activities = query.ToArray(); @@ -27,7 +27,7 @@ namespace Elsa.Extensions this WorkflowDefinitionVersion workflowDefinition, string activityId) { - return workflowDefinition.Connections.Where(x => x.DestinationActivityId == activityId).ToList(); + return workflowDefinition.Connections.Where(x => x.TargetActivityId == activityId).ToList(); } public static IEnumerable GetOutboundConnections( diff --git a/src/core/Elsa.Abstractions/Models/ConnectionDefinition.cs b/src/core/Elsa.Abstractions/Models/ConnectionDefinition.cs index db666e1f7..0471132d5 100644 --- a/src/core/Elsa.Abstractions/Models/ConnectionDefinition.cs +++ b/src/core/Elsa.Abstractions/Models/ConnectionDefinition.cs @@ -6,15 +6,15 @@ namespace Elsa.Models { } - public ConnectionDefinition(string sourceActivityId, string destinationActivityId, string outcome) + public ConnectionDefinition(string sourceActivityId, string targetActivityId, string outcome) { SourceActivityId = sourceActivityId; - DestinationActivityId = destinationActivityId; + TargetActivityId = targetActivityId; Outcome = outcome; } public string? SourceActivityId { get; set; } - public string? DestinationActivityId { get; set; } + public string? TargetActivityId { get; set; } public string? Outcome { get; set; } } } \ No newline at end of file diff --git a/src/core/Elsa.Core/Services/WorkflowFactory.cs b/src/core/Elsa.Core/Services/WorkflowFactory.cs index 265ed0cef..8ade4ac7a 100644 --- a/src/core/Elsa.Core/Services/WorkflowFactory.cs +++ b/src/core/Elsa.Core/Services/WorkflowFactory.cs @@ -98,7 +98,7 @@ namespace Elsa.Services private Connection CreateConnection(ConnectionDefinition connectionDefinition, IDictionary activityDictionary) { var source = activityDictionary[connectionDefinition.SourceActivityId]; - var target = activityDictionary[connectionDefinition.DestinationActivityId]; + var target = activityDictionary[connectionDefinition.TargetActivityId]; return new Connection(source, target, connectionDefinition.Outcome); } } diff --git a/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs b/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs index a2079fc5a..64b2338bb 100644 --- a/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs +++ b/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs @@ -147,7 +147,7 @@ namespace Elsa.WorkflowBuilders private Connection CreateConnection(ConnectionDefinition connectionDefinition, IDictionary activityDictionary) { var source = activityDictionary[connectionDefinition.SourceActivityId]; - var target = activityDictionary[connectionDefinition.DestinationActivityId]; + var target = activityDictionary[connectionDefinition.TargetActivityId]; return new Connection(source, target, connectionDefinition.Outcome); } } diff --git a/src/dashboard/Elsa.WorkflowDesigner/Models/ConnectionModel.cs b/src/dashboard/Elsa.WorkflowDesigner/Models/ConnectionModel.cs index 064485cef..85468413a 100644 --- a/src/dashboard/Elsa.WorkflowDesigner/Models/ConnectionModel.cs +++ b/src/dashboard/Elsa.WorkflowDesigner/Models/ConnectionModel.cs @@ -17,7 +17,7 @@ namespace Elsa.WorkflowDesigner.Models public ConnectionModel(ConnectionDefinition connectionDefinition) : this( connectionDefinition.SourceActivityId, - connectionDefinition.DestinationActivityId, + connectionDefinition.TargetActivityId, connectionDefinition.Outcome) { } diff --git a/src/persistence/Elsa.Persistence.YesSql/Indexes/WorkflowDefinitionIndex.cs b/src/persistence/Elsa.Persistence.YesSql/Indexes/WorkflowDefinitionIndex.cs index af8575822..4c348b3ea 100644 --- a/src/persistence/Elsa.Persistence.YesSql/Indexes/WorkflowDefinitionIndex.cs +++ b/src/persistence/Elsa.Persistence.YesSql/Indexes/WorkflowDefinitionIndex.cs @@ -56,11 +56,11 @@ namespace Elsa.Persistence.YesSql.Indexes private static IEnumerable GetStartActivities(WorkflowDefinitionVersionDocument workflow) { - var destinationActivityIds = workflow.Connections.Select(x => x.DestinationActivityId).Distinct().ToLookup(x => x); + var targetActivityIds = workflow.Connections.Select(x => x.TargetActivityId).Distinct().ToLookup(x => x); var query = from activity in workflow.Activities - where !destinationActivityIds.Contains(activity.Id) + where !targetActivityIds.Contains(activity.Id) select activity; return query; diff --git a/src/server/Elsa.Server.GraphQL/Types/ConnectionDefinitionType.cs b/src/server/Elsa.Server.GraphQL/Types/ConnectionDefinitionType.cs index 00f63f7a4..465ede099 100644 --- a/src/server/Elsa.Server.GraphQL/Types/ConnectionDefinitionType.cs +++ b/src/server/Elsa.Server.GraphQL/Types/ConnectionDefinitionType.cs @@ -11,7 +11,7 @@ namespace Elsa.Server.GraphQL.Types Field(x => x.SourceActivityId).Description("The source activity ID to connect from."); Field(x => x.Outcome).Description("The source activity outcome to connect from."); - Field(x => x.DestinationActivityId).Description("The destination activity ID to connect to."); + Field(x => x.TargetActivityId).Description("The destination activity ID to connect to."); } } } \ No newline at end of file diff --git a/src/server/Elsa.Server.GraphQL/Types/Input/ConnectionDefinitionInputType.cs b/src/server/Elsa.Server.GraphQL/Types/Input/ConnectionDefinitionInputType.cs index b45c49f33..7f1c6e5f2 100644 --- a/src/server/Elsa.Server.GraphQL/Types/Input/ConnectionDefinitionInputType.cs +++ b/src/server/Elsa.Server.GraphQL/Types/Input/ConnectionDefinitionInputType.cs @@ -11,7 +11,7 @@ namespace Elsa.Server.GraphQL.Types.Input Field(x => x.SourceActivityId).Description("The source activity ID to connect from."); Field(x => x.Outcome).Description("The source activity outcome to connect from."); - Field(x => x.DestinationActivityId).Description("The destination activity ID to connect to."); + Field(x => x.TargetActivityId).Description("The target activity ID to connect to."); } } } \ No newline at end of file diff --git a/src/utils/Elsa.AutoMapper.Extensions/NodaTime/NodaTimeProfile.cs b/src/utils/Elsa.AutoMapper.Extensions/NodaTime/NodaTimeProfile.cs index 478b79cd9..f99eb474b 100644 --- a/src/utils/Elsa.AutoMapper.Extensions/NodaTime/NodaTimeProfile.cs +++ b/src/utils/Elsa.AutoMapper.Extensions/NodaTime/NodaTimeProfile.cs @@ -18,22 +18,22 @@ namespace Elsa.AutoMapper.Extensions.NodaTime CreateMap().ConvertUsing(this); } - public DateTime Convert(Instant source, DateTime destination, ResolutionContext context) + public DateTime Convert(Instant source, DateTime target, ResolutionContext context) { return source.ToDateTimeUtc(); } - public DateTime? Convert(Instant? source, DateTime? destination, ResolutionContext context) + public DateTime? Convert(Instant? source, DateTime? target, ResolutionContext context) { return source?.ToDateTimeUtc(); } - public Instant Convert(DateTime source, Instant destination, ResolutionContext context) + public Instant Convert(DateTime source, Instant target, ResolutionContext context) { return Convert(source); } - public Instant? Convert(DateTime? source, Instant? destination, ResolutionContext context) + public Instant? Convert(DateTime? source, Instant? target, ResolutionContext context) { return source != null ? Convert(source.Value) : default(Instant?); }