Rename destination activity to target activity
This commit is contained in:
parent
1338dc0a95
commit
f938c32a8f
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ namespace Elsa.Extensions
|
|||
{
|
||||
public static IEnumerable<IActivity> 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();
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ namespace Elsa.Extensions
|
|||
{
|
||||
public static IEnumerable<ActivityDefinition> 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<ConnectionDefinition> GetOutboundConnections(
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
}
|
||||
}
|
||||
|
|
@ -98,7 +98,7 @@ namespace Elsa.Services
|
|||
private Connection CreateConnection(ConnectionDefinition connectionDefinition, IDictionary<string, IActivity> activityDictionary)
|
||||
{
|
||||
var source = activityDictionary[connectionDefinition.SourceActivityId];
|
||||
var target = activityDictionary[connectionDefinition.DestinationActivityId];
|
||||
var target = activityDictionary[connectionDefinition.TargetActivityId];
|
||||
return new Connection(source, target, connectionDefinition.Outcome);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ namespace Elsa.WorkflowBuilders
|
|||
private Connection CreateConnection(ConnectionDefinition connectionDefinition, IDictionary<string, IActivity> activityDictionary)
|
||||
{
|
||||
var source = activityDictionary[connectionDefinition.SourceActivityId];
|
||||
var target = activityDictionary[connectionDefinition.DestinationActivityId];
|
||||
var target = activityDictionary[connectionDefinition.TargetActivityId];
|
||||
return new Connection(source, target, connectionDefinition.Outcome);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ namespace Elsa.WorkflowDesigner.Models
|
|||
|
||||
public ConnectionModel(ConnectionDefinition connectionDefinition) : this(
|
||||
connectionDefinition.SourceActivityId,
|
||||
connectionDefinition.DestinationActivityId,
|
||||
connectionDefinition.TargetActivityId,
|
||||
connectionDefinition.Outcome)
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@ namespace Elsa.Persistence.YesSql.Indexes
|
|||
|
||||
private static IEnumerable<ActivityDefinition> 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;
|
||||
|
|
|
|||
|
|
@ -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.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -18,22 +18,22 @@ namespace Elsa.AutoMapper.Extensions.NodaTime
|
|||
CreateMap<DateTime?, Instant?>().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?);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue