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

Take latest version of no version specified (#3914)

Browse source
This commit is contained in:
Sipke Schoorstra 2023-04-17 11:25:12 +02:00 committed by GitHub
parent c3ed7e7865
commit 998fafa75c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivity.cs
View file

@ -23,7 +23,7 @@ public class WorkflowDefinitionActivity : Composite, IInitializable
public string WorkflowDefinitionId { get; set; } = default!;
/// <summary>
/// the latest published version number set by the provider. This is used by tooling to let the user know that a newer version is available.
/// The latest published version number set by the provider. This is used by tooling to let the user know that a newer version is available.
/// </summary>
public int LatestAvailablePublishedVersion { get; set; }

17
src/modules/Elsa.Workflows.Management/Serialization/Converters/ActivityJsonConverter.cs
View file

@ -44,6 +44,7 @@ public class ActivityJsonConverter : JsonConverter<IActivity>
var activityTypeName = GetActivityDetails(activityRoot, out var activityTypeVersion, out var activityDescriptor);
var notFoundActivityTypeName = ActivityTypeNameHelper.GenerateTypeName<NotFoundActivity>();
// If the activity type is a NotFoundActivity, try to extract the original activity type name and version.
if(activityTypeName.Equals(notFoundActivityTypeName) && activityRoot.TryGetProperty("originalActivityJson", out var originalActivityJson))
{
activityRoot = JsonDocument.Parse(originalActivityJson.GetString()!).RootElement;
@ -54,6 +55,7 @@ public class ActivityJsonConverter : JsonConverter<IActivity>
newOptions.Converters.Add(new InputJsonConverterFactory(_serviceProvider));
newOptions.Converters.Add(new OutputJsonConverterFactory(_serviceProvider));
// If the activity type is not found, create a NotFoundActivity instead.
if (activityDescriptor == null)
{
var notFoundContext = new ActivityConstructorContext(activityRoot, newOptions);
@ -221,10 +223,17 @@ public class ActivityJsonConverter : JsonConverter<IActivity>
throw new JsonException("Failed to extract activity type property");
var activityTypeName = activityTypeNameElement.GetString()!;
activityTypeVersion = activityRoot.TryGetProperty("version", out var activityVersionElement) ? activityVersionElement.GetInt32() : 1;
activityDescriptor = _activityRegistry.Find(activityTypeName, activityTypeVersion);
activityDescriptor ??= _activityRegistry.Find(activityTypeName);
if (activityRoot.TryGetProperty("version", out var activityVersionElement))
{
activityTypeVersion = activityVersionElement.GetInt32();
activityDescriptor = _activityRegistry.Find(activityTypeName, activityTypeVersion);
}
else
{
activityDescriptor = _activityRegistry.Find(activityTypeName);
activityTypeVersion = activityDescriptor?.Version ?? 0;
}
return activityTypeName;
}

7
src/modules/Elsa.Workflows.Management/Serialization/SerializationOptionsConfigurator.cs
View file

@ -5,15 +5,22 @@ using Microsoft.Extensions.DependencyInjection;
namespace Elsa.Workflows.Management.Serialization;
/// <summary>
/// Configures the JSON serialization options with support for serializing and deserializing activities and expressions.
/// </summary>
public class SerializationOptionsConfigurator : ISerializationOptionsConfigurator
{
private readonly IServiceProvider _serviceProvider;
/// <summary>
/// Initializes a new instance of the <see cref="SerializationOptionsConfigurator"/> class.
/// </summary>
public SerializationOptionsConfigurator(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
}
/// <inheritdoc />
public void Configure(JsonSerializerOptions options)
{
options.Converters.Add(Create<ActivityJsonConverterFactory>());