Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decouple Expression Types #4622

Merged
merged 8 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Elsa.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http:https://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http:https://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=initializable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=materializers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Populator/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Postgre/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=startable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,9 @@
<PackageReference Include="Proto.Persistence.Sqlite" Version="1.4.0"/>
<PackageReference Include="Proto.Persistence.SqlServer" Version="1.4.0"/>
</ItemGroup>

<ItemGroup>
<Folder Include="App_Data\" />
</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions src/bundles/Elsa.WorkflowServer.Web/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Text.Encodings.Web;
using Elastic.Clients.Elasticsearch.IndexManagement;
using Elsa.Alterations.Extensions;
using Elsa.Alterations.MassTransit.Extensions;
using Elsa.Dapper.Extensions;
Expand All @@ -18,7 +17,6 @@
using Elsa.MongoDb.Modules.Management;
using Elsa.MongoDb.Modules.Runtime;
using Elsa.WorkflowServer.Web.WorkflowContexts;
using FluentStorage;
using Microsoft.Data.Sqlite;
using Microsoft.Extensions.Options;
using Proto.Persistence.Sqlite;
Expand Down
8 changes: 0 additions & 8 deletions src/clients/Elsa.Api.Client/Contracts/IExpression.cs

This file was deleted.

71 changes: 0 additions & 71 deletions src/clients/Elsa.Api.Client/Converters/ExpressionJsonConverter.cs

This file was deleted.

This file was deleted.

37 changes: 0 additions & 37 deletions src/clients/Elsa.Api.Client/Expressions/CSharpExpression.cs

This file was deleted.

37 changes: 0 additions & 37 deletions src/clients/Elsa.Api.Client/Expressions/JavaScriptExpression.cs

This file was deleted.

36 changes: 0 additions & 36 deletions src/clients/Elsa.Api.Client/Expressions/LiquidExpression.cs

This file was deleted.

36 changes: 0 additions & 36 deletions src/clients/Elsa.Api.Client/Expressions/LiteralExpression.cs

This file was deleted.

36 changes: 0 additions & 36 deletions src/clients/Elsa.Api.Client/Expressions/ObjectExpression.cs

This file was deleted.

37 changes: 0 additions & 37 deletions src/clients/Elsa.Api.Client/Expressions/PythonExpression.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public static IServiceCollection AddElsaClient(this IServiceCollection services,
services.AddApi<ILoginApi>(builderOptions);
services.AddApi<IFeaturesApi>(builderOptions);
services.AddApi<IJavaScriptApi>(builderOptions);
services.AddApi<IExpressionDescriptorsApi>(builderOptions);
services.AddApi<IWorkflowContextProviderDescriptorsApi>(builderOptions);
return services;
}
Expand Down Expand Up @@ -106,7 +107,6 @@ private static RefitSettings CreateRefitSettings(IServiceProvider serviceProvide

serializerOptions.Converters.Add(new JsonStringEnumConverter());
serializerOptions.Converters.Add(new VersionOptionsJsonConverter());
serializerOptions.Converters.Add(new ExpressionJsonConverterFactory());

var settings = new RefitSettings
{
Expand Down
9 changes: 4 additions & 5 deletions src/clients/Elsa.Api.Client/IsExternalInit.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System.ComponentModel;

// ReSharper disable once CheckNamespace
namespace System.Runtime.CompilerServices
{
[EditorBrowsable(EditorBrowsableState.Never)]
internal class IsExternalInit{}
}
namespace System.Runtime.CompilerServices;

[EditorBrowsable(EditorBrowsableState.Never)]
internal class IsExternalInit{}
Loading
Loading