diff --git a/src/activities/Elsa.Activities.Temporal.Quartz/Startup.cs b/src/activities/Elsa.Activities.Temporal.Quartz/Startup.cs index 705bf3df1..fa2d8be6f 100644 --- a/src/activities/Elsa.Activities.Temporal.Quartz/Startup.cs +++ b/src/activities/Elsa.Activities.Temporal.Quartz/Startup.cs @@ -4,12 +4,12 @@ using Microsoft.Extensions.Configuration; namespace Elsa.Activities.Temporal.Quartz { - [Feature("Temporal:Quartz")] + [Feature("TemporalQuartz")] public class Startup : StartupBase { public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) { - elsa.AddQuartzTemporalActivities(options => configuration.GetSection("Elsa:Temporal:Quartz").Bind(options)); + elsa.AddQuartzTemporalActivities(options => configuration.GetSection("Elsa:TemporalQuartz").Bind(options)); } } } diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/EntityFrameworkWebhookStartupBase.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/EntityFrameworkWebhookStartupBase.cs index d5aa71dd8..0edc56e5c 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/EntityFrameworkWebhookStartupBase.cs +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/EntityFrameworkWebhookStartupBase.cs @@ -16,7 +16,7 @@ namespace Elsa.Webhooks.Persistence.EntityFramework.Core public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) { var services = elsa.Services; - var section = configuration.GetSection($"Elsa:Features:Webhooks:Persistence:EntityFrameworkCore:{ProviderName}"); + var section = configuration.GetSection($"Elsa:Features:WebhooksPersistenceEntityFrameworkCore{ProviderName}"); var connectionStringName = section.GetValue("ConnectionStringName"); var connectionString = section.GetValue("ConnectionString"); diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Startup.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Startup.cs index 90496e3c0..c30ea6c88 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Startup.cs +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Webhooks.Persistence.EntityFramework.MySql { - [Feature("Webhooks:Persistence:EntityFrameworkCore:MySql")] + [Feature("WebhooksPersistenceEntityFrameworkCoreMySql")] public class Startup : EntityFrameworkWebhookStartupBase { protected override string ProviderName => "MySql"; diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Startup.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Startup.cs index c141f08c6..62079ecce 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Startup.cs +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Webhooks.Persistence.EntityFramework.PostgreSql { - [Feature("Webhooks:Persistence:EntityFrameworkCore:PostgreSql")] + [Feature("WebhooksPersistenceEntityFrameworkCorePostgreSql")] public class Startup : EntityFrameworkWebhookStartupBase { protected override string ProviderName => "PostgreSql"; diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Startup.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Startup.cs index 6557a7350..58034b97c 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Startup.cs +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Webhooks.Persistence.EntityFramework.SqlServer { - [Feature("Webhooks:Persistence:EntityFrameworkCore:SqlServer")] + [Feature("WebhooksPersistenceEntityFrameworkCoreSqlServer")] public class Startup : EntityFrameworkWebhookStartupBase { protected override string ProviderName => "SqlServer"; diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Startup.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Startup.cs index 07b50dcc6..f2e28ec36 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Startup.cs +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Webhooks.Persistence.EntityFramework.Sqlite { - [Feature("Webhooks:Persistence:EntityFrameworkCore:Sqlite")] + [Feature("WebhooksPersistenceEntityFrameworkCoreSqlite")] public class Startup : EntityFrameworkWebhookStartupBase { protected override string ProviderName => "Sqlite"; diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Startup.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Startup.cs index 98a249f44..5fae7725f 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Startup.cs +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Startup.cs @@ -8,13 +8,13 @@ using Microsoft.Extensions.DependencyInjection; namespace Elsa.Webhooks.Persistence.MongoDb { - [Feature("Webhooks:Persistence:MongoDb")] + [Feature("WebhooksPersistenceMongoDb")] public class Startup : StartupBase { public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) { var services = elsa.Services; - var section = configuration.GetSection($"Elsa:Features:Webhooks:Persistence:MongoDb"); + var section = configuration.GetSection($"Elsa:Features:WebhooksPersistenceMongoDb"); var connectionStringName = section.GetValue("ConnectionStringName"); var connectionString = section.GetValue("ConnectionString"); diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Startups.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Startups.cs index b605ee7bb..52a47fe7a 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Startups.cs +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Startups.cs @@ -13,7 +13,7 @@ using YesSql.Provider.SqlServer; namespace Elsa.Webhooks.Persistence.YesSql { - [Feature("Webhooks:Persistence:YesSql:Sqlite")] + [Feature("WebhooksPersistenceYesSqlSqlite")] public class SqliteStartup : YesSqlStartupBase { protected override string ProviderName => "Sqlite"; @@ -21,21 +21,21 @@ namespace Elsa.Webhooks.Persistence.YesSql protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqLite(connectionString); } - [Feature("Webhooks:Persistence:YesSql:SqlServer")] + [Feature("WebhooksPersistenceYesSqlSqlServer")] public class SqlServerStartup : YesSqlStartupBase { protected override string ProviderName => "SqlServer"; protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqlServer(connectionString); } - [Feature("Webhooks:Persistence:YesSql:MySql")] + [Feature("WebhooksPersistenceYesSqlMySql")] public class MySqlStartup : YesSqlStartupBase { protected override string ProviderName => "MySql"; protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseMySql(connectionString); } - [Feature("Webhooks:Persistence:YesSql:PostgreSql")] + [Feature("WebhooksPersistenceYesSqlPostgreSql")] public class PostgreSqlStartup : YesSqlStartupBase { protected override string ProviderName => "PostgreSql"; @@ -49,7 +49,7 @@ namespace Elsa.Webhooks.Persistence.YesSql public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) { var services = elsa.Services; - var section = configuration.GetSection($"Elsa:Features:Webhooks:Persistence:YesSql:{ProviderName}"); + var section = configuration.GetSection($"Elsa:Features:WebhooksPersistenceYesSql{ProviderName}"); var connectionStringName = section.GetValue("ConnectionStringName"); var connectionString = section.GetValue("ConnectionString"); diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/EntityFrameworkCoreStartupBase.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/EntityFrameworkCoreStartupBase.cs index 6cf381516..f04a62421 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/EntityFrameworkCoreStartupBase.cs +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/EntityFrameworkCoreStartupBase.cs @@ -12,7 +12,7 @@ namespace Elsa.Persistence.EntityFramework.Core public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) { - var section = configuration.GetSection($"Elsa:Features:Persistence:EntityFrameworkCore:{ProviderName}"); + var section = configuration.GetSection($"Elsa:Features:PersistenceEntityFrameworkCore{ProviderName}"); var connectionStringName = section.GetValue("ConnectionStringName"); var connectionString = section.GetValue("ConnectionString"); diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Startup.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Startup.cs index 00d649a6d..de3266838 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Startup.cs +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Persistence.EntityFramework.MySql { - [Feature("Persistence:EntityFrameworkCore:MySql")] + [Feature("PersistenceEntityFrameworkCoreMySql")] public class Startup : EntityFrameworkCoreStartupBase { protected override string ProviderName => "MySql"; diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Startup.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Startup.cs index 5fc35f65d..738895ce3 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Startup.cs +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Persistence.EntityFramework.PostgreSql { - [Feature("Persistence:EntityFrameworkCore:PostgreSql")] + [Feature("PersistenceEntityFrameworkCorePostgreSql")] public class Startup : EntityFrameworkCoreStartupBase { protected override string ProviderName => "PostgreSql"; diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Startup.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Startup.cs index cf83d940a..e59049f12 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Startup.cs +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Persistence.EntityFramework.SqlServer { - [Feature("Persistence:EntityFrameworkCore:SqlServer")] + [Feature("PersistenceEntityFrameworkCoreSqlServer")] public class Startup : EntityFrameworkCoreStartupBase { protected override string ProviderName => "SqlServer"; diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Startup.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Startup.cs index 68a11b2d1..67f34d1ce 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Startup.cs +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Elsa.Persistence.EntityFramework.Sqlite { - [Feature("Persistence:EntityFrameworkCore:Sqlite")] + [Feature("PersistenceEntityFrameworkCoreSqlite")] public class Startup : EntityFrameworkCoreStartupBase { protected override string ProviderName => "Sqlite"; diff --git a/src/persistence/Elsa.Persistence.MongoDb/Startup.cs b/src/persistence/Elsa.Persistence.MongoDb/Startup.cs index 38eaf73ca..ee07c205d 100644 --- a/src/persistence/Elsa.Persistence.MongoDb/Startup.cs +++ b/src/persistence/Elsa.Persistence.MongoDb/Startup.cs @@ -4,12 +4,12 @@ using Microsoft.Extensions.Configuration; namespace Elsa.Persistence.MongoDb { - [Feature("Persistence:MongoDb")] + [Feature("PersistenceMongoDb")] public class Startup : StartupBase { public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) { - var section = configuration.GetSection($"Elsa:Features:Persistence:MongoDb"); + var section = configuration.GetSection($"Elsa:Features:PersistenceMongoDb"); var connectionStringName = section.GetValue("ConnectionStringName"); var connectionString = section.GetValue("ConnectionString"); diff --git a/src/persistence/Elsa.Persistence.YesSql/Startups.cs b/src/persistence/Elsa.Persistence.YesSql/Startups.cs index ffcce94d6..ab63c8e00 100644 --- a/src/persistence/Elsa.Persistence.YesSql/Startups.cs +++ b/src/persistence/Elsa.Persistence.YesSql/Startups.cs @@ -9,7 +9,7 @@ using YesSql.Provider.SqlServer; namespace Elsa.Persistence.YesSql { - [Feature("Persistence:YesSql:Sqlite")] + [Feature("PersistenceYesSqlSqlite")] public class SqliteStartup : YesSqlStartupBase { protected override string ProviderName => "Sqlite"; @@ -17,21 +17,21 @@ namespace Elsa.Persistence.YesSql protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqLite(connectionString); } - [Feature("Persistence:YesSql:SqlServer")] + [Feature("PersistenceYesSqlSqlServer")] public class SqlServerStartup : YesSqlStartupBase { protected override string ProviderName => "SqlServer"; protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqlServer(connectionString); } - [Feature("Persistence:YesSql:MySql")] + [Feature("PersistenceYesSqlMySql")] public class MySqlStartup : YesSqlStartupBase { protected override string ProviderName => "MySql"; protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseMySql(connectionString); } - [Feature("Persistence:YesSql:PostgreSql")] + [Feature("PersistenceYesSqlPostgreSql")] public class PostgreSqlStartup : YesSqlStartupBase { protected override string ProviderName => "PostgreSql"; @@ -44,7 +44,7 @@ namespace Elsa.Persistence.YesSql public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) { - var section = configuration.GetSection($"Elsa:Features:Persistence:YesSql:{ProviderName}"); + var section = configuration.GetSection($"Elsa:Features:PersistenceYesSql{ProviderName}"); var connectionStringName = section.GetValue("ConnectionStringName"); var connectionString = section.GetValue("ConnectionString"); diff --git a/src/samples/server/Elsa.Samples.Server.Host/README.md b/src/samples/server/Elsa.Samples.Server.Host/README.md index 07879a189..f4bcacab5 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/README.md +++ b/src/samples/server/Elsa.Samples.Server.Host/README.md @@ -1,12 +1,12 @@ ### Configure persistence for Elsa Core in the appsettings.json -It is required to specify the persistence, it's enabled status and connection string name in Features +In order to specify the persistence it's required to set enabled status and connection string name in Features node EF Sqlite ``` "Elsa": { "Features": { - "Persistence:EntityFrameworkCore:Sqlite": { + "PersistenceEntityFrameworkCoreSqlite": { "Enabled": true, "ConnectionStringName": "Sqlite" }, @@ -17,7 +17,7 @@ EF MySQL ``` "Elsa": { "Features": { - "Persistence:EntityFrameworkCore:MySql": { + "PersistenceEntityFrameworkCoreMySql": { "Enabled": true, "ConnectionStringName": "MySql" }, @@ -28,7 +28,7 @@ EF SQL Server ``` "Elsa": { "Features": { - "Persistence:EntityFrameworkCore:SqlServer": { + "PersistenceEntityFrameworkCoreSqlServer": { "Enabled": true, "ConnectionStringName": "SqlServer" }, @@ -39,7 +39,7 @@ EF Postgre ``` "Elsa": { "Features": { - "Persistence:EntityFrameworkCore:PostgreSql": { + "PersistenceEntityFrameworkCorePostgreSql": { "Enabled": "true", "ConnectionStringName": "PostgreSql" }, @@ -50,7 +50,7 @@ EF MongoDB ``` "Elsa": { "Features": { - "Persistence:MongoDb": { + "PersistenceMongoDb": { "Enabled": true, "ConnectionStringName": "MongoDb" }, @@ -61,7 +61,7 @@ YesSql Sqlite ``` "Elsa": { "Features": { - "Persistence:YesSql:Sqlite": { + "PersistenceYesSqlSqlite": { "Enabled": true, "ConnectionStringName": "Sqlite" }, @@ -72,7 +72,7 @@ YesSql MySQL ``` "Elsa": { "Features": { - "Persistence:YesSql:MySql": { + "PersistenceYesSqlMySql": { "Enabled": true, "ConnectionStringName": "MySql" }, @@ -83,7 +83,7 @@ YesSql SQL Server ``` "Elsa": { "Features": { - "Persistence:YesSql:SqlServer": { + "PersistenceYesSqlSqlServer": { "Enabled": true, "ConnectionStringName": "SqlServer" }, @@ -94,7 +94,7 @@ YesSql Postgre ``` "Elsa": { "Features": { - "Persistence:YesSql:PostgreSql": { + "PersistenceYesSqlPostgreSql": { "Enabled": true, "ConnectionStringName": "PostgreSql" }, @@ -103,20 +103,19 @@ YesSql Postgre ### Configure modular activity providers such as Webhooks It is required to add modular activity provider and additional persistence feature for your modular activity provider. -The persistence providers should match for Elsa Core and modular activity providers. Two examples below are given to set up Elsa Core and Webhooks persistence as follow. EF Sqlite ``` "Elsa": { "Features": { - "Persistence:EntityFrameworkCore:Sqlite": { + "PersistenceEntityFrameworkCoreSqlite": { "Enabled": true, "ConnectionStringName": "Sqlite" }, "Webhooks": true }, - "Webhooks:Persistence:EntityFrameworkCore:Sqlite": { + "WebhooksPersistenceEntityFrameworkCoreSqlite": { "Enabled": true, "ConnectionStringName": "Sqlite" } @@ -127,13 +126,13 @@ EF MongoDB ``` "Elsa": { "Features": { - "Persistence:MongoDb": { + "PersistenceMongoDb": { "Enabled": true, "ConnectionStringName": "MongoDb" }, "Webhooks": true }, - "Webhooks:Persistence:MongoDb": { + "WebhooksPersistenceMongoDb": { "Enabled": true, "ConnectionStringName": "MongoDb" } diff --git a/src/samples/server/Elsa.Samples.Server.Host/appsettings.json b/src/samples/server/Elsa.Samples.Server.Host/appsettings.json index 0b93db473..df5d8659a 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/appsettings.json +++ b/src/samples/server/Elsa.Samples.Server.Host/appsettings.json @@ -19,21 +19,21 @@ }, "Elsa": { "Features": { - "Persistence:EntityFrameworkCore:Sqlite": { + "PersistenceEntityFrameworkCoreSqlite": { "Enabled": true, "ConnectionStringName": "Sqlite" }, - "Dispatcher:Hangfire": true, + "DispatcherHangfire": true, "Console": true, "Http": true, "Email": true, - "Temporal:Quartz": true, - "JavaScript:Activities": true, + "TemporalQuartz": true, + "JavaScriptActivities": true, "UserTask": true, "Conductor": true, "Telnyx": true, "Webhooks": true, - "Webhooks:Persistence:EntityFrameworkCore:Sqlite": { + "WebhooksPersistenceEntityFrameworkCoreSqlite": { "Enabled": true, "ConnectionStringName": "Sqlite" } diff --git a/src/scripting/Elsa.Scripting.JavaScript/Startup.cs b/src/scripting/Elsa.Scripting.JavaScript/Startup.cs index 335729cb0..9a8ab7858 100644 --- a/src/scripting/Elsa.Scripting.JavaScript/Startup.cs +++ b/src/scripting/Elsa.Scripting.JavaScript/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; namespace Elsa.Scripting.JavaScript { - [Feature("JavaScript:Activities")] + [Feature("JavaScriptActivities")] public class Startup : StartupBase { public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration) diff --git a/src/server/Elsa.Server.Hangfire/Startup.cs b/src/server/Elsa.Server.Hangfire/Startup.cs index 1b3b812a1..5b0eef1ae 100644 --- a/src/server/Elsa.Server.Hangfire/Startup.cs +++ b/src/server/Elsa.Server.Hangfire/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Configuration; namespace Elsa.Server.Hangfire { - [Feature("Dispatcher:Hangfire")] + [Feature("DispatcherHangfire")] public class Startup : StartupBase { public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)