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

Update packages (#5286)

Browse source 
* bumped versions to fix dependency vulnerabilities (#5256)

* Update patch version in GitHub workflows

The version number used in the branch checking step of the GitHub workflows has been updated. Instead of scanning for the branch containing the patch version 3.1.2, it now scans for the branch that contains version 3.1.3. This change is aligned with the updated product version.

* Update git branch grep pattern in workflow file

The git grep pattern has been corrected to properly identify tagged versions in the GitHub Actions workflow. The correction ensures that the workflow script fetches the right branches as per the release tag instead of patch.

* Update grep command in packages workflow

The grep command used in the 'packages.yml' GitHub workflow was previously looking for the exact 'refs/tags/3.1.3' string. This commit simplifies the command by making it only look for '3.1.3'. This adjustment will streamline the process and potentially prevent issues with branch recognition.

* Update package versions and refactor code for Elasticsearch and JavaScript modules

Updated versions of numerous packages in the Directory.Packages.props file to their latest stable releases. This includes updates to Elasticsearch, JavaScript, and MongoDB packages among others. Additionally, refactored parts of the code in the WorkflowInstanceConfiguration and JintJavaScriptEvaluator within the Elasticsearch and JavaScript modules, respectively, to improve index management and script preparation. The WorkflowInstanceStore also saw a minor adjustment.

---------

Co-authored-by: Steve Taylor <stevetayloruk@users.noreply.github.com>
This commit is contained in:
Sipke Schoorstra 2024-04-26 20:07:34 +02:00 committed by GitHub
parent 3c8a2ed1a9
commit e966f62f29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 108 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/packages.yml vendored
View file

@ -50,7 +50,7 @@ jobs:
run: |
if [[ "${{ github.ref }}" == refs/tags/* && "${{ github.event_name }}" == "release" && "${{ github.event.action }}" == "published" ]]; then
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
git branch --remote --contains | grep origin/patch/3.1.2
git branch --remote --contains | grep 3.1.3
else
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
git branch --remote --contains | grep origin/${BRANCH_NAME}

172
Directory.Packages.props
View file

@ -7,89 +7,89 @@
<PackageVersion Include="Antlr4.Runtime.Standard" Version="4.13.1" />
<PackageVersion Include="AutoMapper" Version="12.0.1" />
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageVersion Include="Azure.Identity" Version="1.10.4" />
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.17.0" />
<PackageVersion Include="Azure.ResourceManager" Version="1.9.0" />
<PackageVersion Include="Azure.ResourceManager.AppContainers" Version="1.1.0" />
<PackageVersion Include="Azure.ResourceManager.Resources" Version="1.7.0" />
<PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.0.0" />
<PackageVersion Include="Azure.Identity" Version="1.11.2" />
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.17.5" />
<PackageVersion Include="Azure.ResourceManager" Version="1.11.1" />
<PackageVersion Include="Azure.ResourceManager.AppContainers" Version="1.1.1" />
<PackageVersion Include="Azure.ResourceManager.Resources" Version="1.7.1" />
<PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.0.1" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
<PackageVersion Include="Bogus" Version="35.4.0" />
<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="Cronos" Version="0.7.1" />
<PackageVersion Include="Dapper" Version="2.1.24" />
<PackageVersion Include="DistributedLock.Core" Version="1.0.5" />
<PackageVersion Include="DistributedLock.FileSystem" Version="1.0.1" />
<PackageVersion Include="DistributedLock.Postgres" Version="1.0.5" />
<PackageVersion Include="DistributedLock.Redis" Version="1.0.2" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.11.0" />
<PackageVersion Include="Elsa.Studio" Version="3.2.0-preview.307" />
<PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="3.2.0-preview.307" />
<PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="3.2.0-preview.307" />
<PackageVersion Include="FastEndpoints" Version="5.21.2" />
<PackageVersion Include="FastEndpoints.Security" Version="5.21.2" />
<PackageVersion Include="FastEndpoints.Swagger" Version="5.21.2" />
<PackageVersion Include="FluentMigrator" Version="3.3.2" />
<PackageVersion Include="FluentMigrator.Runner" Version="3.3.2" />
<PackageVersion Include="FluentStorage" Version="5.4.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="Cronos" Version="0.8.4" />
<PackageVersion Include="Dapper" Version="2.1.35" />
<PackageVersion Include="DistributedLock.Core" Version="1.0.6" />
<PackageVersion Include="DistributedLock.FileSystem" Version="1.0.2" />
<PackageVersion Include="DistributedLock.Postgres" Version="1.1.0" />
<PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.13.10" />
<PackageVersion Include="Elsa.Studio" Version="3.2.0-preview.310" />
<PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="3.2.0-preview.310" />
<PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="3.2.0-preview.310" />
<PackageVersion Include="FastEndpoints" Version="5.24.0" />
<PackageVersion Include="FastEndpoints.Security" Version="5.24.0" />
<PackageVersion Include="FastEndpoints.Swagger" Version="5.24.0" />
<PackageVersion Include="FluentMigrator" Version="5.2.0" />
<PackageVersion Include="FluentMigrator.Runner" Version="5.2.0" />
<PackageVersion Include="FluentStorage" Version="5.4.2" />
<PackageVersion Include="FluentStorage.Azure.Blobs" Version="5.2.2" />
<PackageVersion Include="Fluid.Core" Version="2.5.0" />
<PackageVersion Include="Fluid.Core" Version="2.9.0" />
<PackageVersion Include="Fody" Version="6.8.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
<PackageVersion Include="Google.Protobuf" Version="3.25.1" />
<PackageVersion Include="Grpc.Tools" Version="2.59.0" />
<PackageVersion Include="Hangfire" Version="1.8.6" />
<PackageVersion Include="Google.Protobuf" Version="3.26.1" />
<PackageVersion Include="Grpc.Tools" Version="2.62.0" />
<PackageVersion Include="Hangfire" Version="1.8.12" />
<PackageVersion Include="Hangfire.MemoryStorage" Version="1.8.0" />
<PackageVersion Include="Hangfire.Storage.SQLite" Version="0.3.4" />
<PackageVersion Include="Hangfire.Storage.SQLite" Version="0.4.2" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="IronCompress" Version="1.5.1" />
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageVersion Include="Jint" Version="3.0.0" />
<PackageVersion Include="Jint" Version="3.1.0" />
<PackageVersion Include="LinqKit.Core" Version="1.2.5" />
<PackageVersion Include="MailKit" Version="4.3.0" />
<PackageVersion Include="MassTransit" Version="8.1.2" />
<PackageVersion Include="MassTransit.Azure.ServiceBus.Core" Version="8.1.2" />
<PackageVersion Include="MailKit" Version="4.5.0" />
<PackageVersion Include="MassTransit" Version="8.2.1" />
<PackageVersion Include="MassTransit.Azure.ServiceBus.Core" Version="8.2.1" />
<PackageVersion Include="MassTransit.Extensions.DependencyInjection" Version="7.3.1" />
<PackageVersion Include="MassTransit.RabbitMQ" Version="8.1.2" />
<PackageVersion Include="MassTransit.RabbitMQ" Version="8.2.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.9.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.22.0" />
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.3.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.25.0" />
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
<PackageVersion Include="MongoDB.Driver.Extensions" Version="2.0.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="NuGet.Packaging" Version="6.8.0" />
<PackageVersion Include="NuGet.Protocol" Version="6.8.0" />
<PackageVersion Include="NuGet.Packaging" Version="6.9.1" />
<PackageVersion Include="NuGet.Protocol" Version="6.9.1" />
<PackageVersion Include="Nuke.Components" Version="8.0.0" />
<PackageVersion Include="Open.Linq.AsyncExtensions" Version="1.2.0" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
<PackageVersion Include="PolySharp" Version="1.14.1" />
<PackageVersion Include="Proto.Actor" Version="1.5.0" />
<PackageVersion Include="Proto.Cluster" Version="1.5.0" />
<PackageVersion Include="Proto.Cluster.CodeGen" Version="1.5.0" />
<PackageVersion Include="Proto.Cluster.TestProvider" Version="1.5.0" />
<PackageVersion Include="Proto.Persistence" Version="1.5.0" />
<PackageVersion Include="Proto.Persistence.Sqlite" Version="1.5.0" />
<PackageVersion Include="Proto.Persistence.SqlServer" Version="1.5.0" />
<PackageVersion Include="Proto.Remote" Version="1.5.0" />
<PackageVersion Include="Proto.Actor" Version="1.6.0" />
<PackageVersion Include="Proto.Cluster" Version="1.6.0" />
<PackageVersion Include="Proto.Cluster.CodeGen" Version="1.6.0" />
<PackageVersion Include="Proto.Cluster.TestProvider" Version="1.6.0" />
<PackageVersion Include="Proto.Persistence" Version="1.6.0" />
<PackageVersion Include="Proto.Persistence.Sqlite" Version="1.6.0" />
<PackageVersion Include="Proto.Persistence.SqlServer" Version="1.6.0" />
<PackageVersion Include="Proto.Remote" Version="1.6.0" />
<PackageVersion Include="pythonnet" Version="3.0.3" />
<PackageVersion Include="Quartz" Version="3.8.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.8.0" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.0" />
<PackageVersion Include="Quartz.Serialization.Json" Version="3.8.0" />
<PackageVersion Include="Quartz" Version="3.8.1" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.8.1" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.1" />
<PackageVersion Include="Quartz.Serialization.Json" Version="3.8.1" />
<PackageVersion Include="Refit" Version="7.0.0" />
<PackageVersion Include="Refit.HttpClientFactory" Version="7.0.0" />
<PackageVersion Include="Scrutor" Version="4.2.2" />
<PackageVersion Include="ShortGuid" Version="2.0.1" />
<PackageVersion Include="StackExchange.Redis" Version="2.7.4" />
<PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.8" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.13" />
<PackageVersion Include="Testcontainers" Version="3.8.0" />
<PackageVersion Include="Testcontainers.Redis" Version="3.8.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="3.8.0" />
@ -107,17 +107,17 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
<PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="7.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="7.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.14" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.14" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="7.0.14" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.14" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.14" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="7.0.18" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.18" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.18" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.18" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.18" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="7.0.18" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="7.0.18" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.18" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.18" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.18" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.18" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
@ -125,9 +125,9 @@
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.18" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageVersion Include="Npgsql" Version="7.0.6" />
@ -137,33 +137,33 @@
<PackageVersion Include="System.Text.Json" Version="7.0.4" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.0" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.4" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.4" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageVersion Include="Npgsql" Version="8.0.0" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageVersion Include="Polly" Version="8.2.0" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
<PackageVersion Include="Npgsql" Version="8.0.2" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
<PackageVersion Include="Polly" Version="8.3.1" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
</ItemGroup>
</Project>

2
samples/aspnet/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

5
src/common/Elsa.Api.Common/Abstractions/Endpoints.cs
View file

@ -1,11 +1,12 @@
using FastEndpoints;
using JetBrains.Annotations;
namespace Elsa.Abstractions;
/// <summary>
/// An endpoint that maps a request to a response.
/// </summary>
public abstract class ElsaEndpointWithMapper<TRequest, TMapper> : EndpointWithMapper<TRequest, TMapper> where TMapper : notnull, IRequestMapper where TRequest : notnull
public abstract class ElsaEndpointWithMapper<TRequest, TMapper> : EndpointWithMapper<TRequest, TMapper> where TMapper : class, IRequestMapper where TRequest : notnull
{
protected void ConfigurePermissions(params string[] permissions)
{
@ -49,7 +50,7 @@ public class ElsaEndpoint<TRequest, TResponse> : Endpoint<TRequest, TResponse> w
}
}
public class ElsaEndpoint<TRequest, TResponse, TMapper> : Endpoint<TRequest, TResponse, TMapper> where TRequest : notnull, new() where TResponse : notnull where TMapper : IMapper, new()
public class ElsaEndpoint<TRequest, TResponse, TMapper> : Endpoint<TRequest, TResponse, TMapper> where TRequest : notnull, new() where TResponse : notnull where TMapper : class, IMapper, new()
{
protected void ConfigurePermissions(params string[] permissions)
{

11
src/modules/Elsa.Elasticsearch/Modules/Management/WorkflowInstanceConfiguration.cs
View file

@ -1,4 +1,5 @@
using Elastic.Clients.Elasticsearch;
using Elastic.Clients.Elasticsearch.IndexManagement;
using Elsa.Elasticsearch.Common;
using Elsa.Elasticsearch.Options;
using Elsa.Workflows.Management.Entities;
@ -30,10 +31,10 @@ public class WorkflowInstanceConfiguration : IndexConfiguration<WorkflowInstance
/// <inheritdoc />
public override async ValueTask ConfigureClientAsync(ElasticsearchClient client, CancellationToken cancellationToken)
{
await client.Indices.CreateAsync<WorkflowInstance>(
descriptor => descriptor.Mappings(m => m
.Properties(p => p
.Flattened(d => d.WorkflowState.Properties))),
cancellationToken);
var alias = _options.GetIndexNameFor<WorkflowInstance>();
var indexName = IndexNamingStrategy.GenerateName(alias);
var descriptor = new CreateIndexRequestDescriptor<WorkflowInstance>(indexName);
descriptor.Mappings(m => m.Properties(p => p.Flattened(d => d.WorkflowState.Properties)));
await client.Indices.CreateAsync(descriptor, cancellationToken);
}
}

2
src/modules/Elsa.Elasticsearch/Modules/Management/WorkflowInstanceStore.cs
View file

@ -157,7 +157,7 @@ public class ElasticWorkflowInstanceStore : IWorkflowInstanceStore
if (filter.WorkflowSubStatus != null) descriptor = descriptor.Match(m => m.Field(f => f.SubStatus).Query(filter.WorkflowSubStatus.ToString()!));
if (string.IsNullOrWhiteSpace(filter.SearchTerm))
return descriptor.MatchAll();
return descriptor.MatchAll(new MatchAllQuery());
return descriptor
.QueryString(c => c

11
src/modules/Elsa.JavaScript/Services/JintJavaScriptEvaluator.cs
View file

@ -189,9 +189,14 @@ public class JintJavaScriptEvaluator : IJavaScriptEvaluator
if (_jintOptions.ScriptCacheTimeout.HasValue)
entry.SetAbsoluteExpiration(_jintOptions.ScriptCacheTimeout.Value);
var parser = new JavaScriptParser(new ParserOptions { AllowReturnOutsideFunction = true });
var script = parser.ParseScript(expression);
return script;
var prepareOptions = new ScriptPreparationOptions
{
ParsingOptions = new ScriptParsingOptions
{
AllowReturnOutsideFunction = true
}
};
return Engine.PrepareScript(expression, options: prepareOptions);
})!;
var result = engine.Evaluate(parsedScript);

4
src/modules/Elsa.Quartz/Elsa.Quartz.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<Description>
Provides integration with the Quartz.NET library and provide am implementation of Elsa's IJobScheduler using Quartz.NET.
</Description>
@ -15,7 +15,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Elsa.Scheduling\Elsa.Scheduling.csproj" />
<ProjectReference Include="..\Elsa.Scheduling\Elsa.Scheduling.csproj" />
</ItemGroup>
</Project>