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.

Sign up for GitHub

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

Jump to bottom

Elastic updates #3623

Merged
merged 11 commits into from
Jan 13, 2023
Merged

Elastic updates #3623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
46193b9
Incremental work
sfmskywalker Jan 12, 2023
8af365b
Incremental work
sfmskywalker Jan 12, 2023
28d561a
Incremental work
sfmskywalker Jan 12, 2023
70dae3d
Merge remote-tracking branch 'origin/v3' into v3-elasticsearch-updates
sfmskywalker Jan 12, 2023
a851b0e
Incremental work
sfmskywalker Jan 12, 2023
154ee9d
Incremental work
sfmskywalker Jan 12, 2023
dde0640
Fix listing with no query
sfmskywalker Jan 13, 2023
98ab512
Merge branch 'v3' into v3-elasticsearch-updates
sfmskywalker Jan 13, 2023
6b4a936
Restore missing class
sfmskywalker Jan 13, 2023
2af3d89
Remove rollover hosted service and expose index configurations
sfmskywalker Jan 13, 2023
977ee5b
Rename hosted service
sfmskywalker Jan 13, 2023
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
Prev Previous commit
Next Next commit
Incremental work
  • Loading branch information
@sfmskywalker
sfmskywalker committed Jan 12, 2023
commit 154ee9d6d1f6ecd99dfd38e7e0b68a7bc1df13c9
3 changes: 2 additions & 1 deletion src/modules/Elsa.Elasticsearch/Strategies/DefaultNaming.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Elsa.Elasticsearch.Services;
using Humanizer;

namespace Elsa.Elasticsearch.Strategies;

Expand All @@ -8,5 +9,5 @@ namespace Elsa.Elasticsearch.Strategies;
public class DefaultNaming : IIndexNamingStrategy
{
/// <inheritdoc />
public string GenerateName(string aliasName) => aliasName;
public string GenerateName(string aliasName) => aliasName.Kebaberize();
}
3 changes: 2 additions & 1 deletion src/modules/Elsa.Elasticsearch/Strategies/YearAndMonthNaming.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Elsa.Common.Services;
using Elsa.Elasticsearch.Services;
using Humanizer;
using JetBrains.Annotations;

namespace Elsa.Elasticsearch.Strategies;
Expand Down Expand Up @@ -27,6 +28,6 @@ public string GenerateName(string aliasName)
var month = now.ToString("MM");
var year = now.Year;

return aliasName + "-" + year + "-" + month;
return aliasName.Kebaberize() + "-" + year + "-" + month;
}
}
14 changes: 7 additions & 7 deletions src/modules/Elsa.Workflows.Designer/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/modules/Elsa.Workflows.Designer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"build:debug": "cross-env webpack --mode=development --env configuration=Debug"
},
"devDependencies": {
"@elsa-workflows/elsa-workflows-designer": "^3.0.2-preview.12",
"@elsa-workflows/elsa-workflows-designer": "^3.0.2-preview.26",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"monaco-editor": "^0.34.1",
Expand Down
3 changes: 1 addition & 2 deletions src/samples/aspnet/Elsa.Samples.AzureServiceBusActivities/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
// Configure management feature to use EF Core.
elsa.UseWorkflowManagement(management =>
{
management.UseDefaultManagement(dm => dm.UseEntityFrameworkCore(ef => ef.UseSqlite()));
management.UseWorkflowInstances(w => w.UseEntityFrameworkCore(ef => ef.UseSqlite()));
management.UseEntityFrameworkCore(ef => ef.UseSqlite());
});

// Configure runtime feature to use EF Core.
Expand Down
5 changes: 4 additions & 1 deletion src/samples/aspnet/Elsa.Samples.ElasticsearchStorage/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Elsa.Elasticsearch.Extensions;
using Elsa.Elasticsearch.Modules.Management;
using Elsa.Elasticsearch.Modules.Runtime;
using Elsa.EntityFrameworkCore.Extensions;
using Elsa.EntityFrameworkCore.Modules.Management;
using Elsa.EntityFrameworkCore.Modules.Runtime;
Expand All @@ -24,7 +25,9 @@
// Configure runtime feature to use EF Core.
elsa.UseWorkflowRuntime(runtime =>
{
runtime.UseDefaultRuntime(d => d.UseEntityFrameworkCore());
runtime.UseDefaultRuntime(d => d.UseEntityFrameworkCore(ef => ef.UseSqlite()));
runtime.UseExecutionLogRecords(log => log.UseElasticsearch());
runtime.UseAsyncWorkflowStateExporter();
});

// Expose API endpoints.
Expand Down