Skip to content

Commit ddda963

Browse files
sfmskywalkersfmskywalker
committed
Merge remote-tracking branch 'origin/develop/3.5.0'
2 parents 5d1b0f8 + e09f096 commit ddda963

File tree

86 files changed

+1094
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1094
-135
lines changed

‎Elsa.sln‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.Integration
133133
EndProject
134134
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.JavaScript.IntegrationTests", "test\integration\Elsa.JavaScript.IntegrationTests\Elsa.JavaScript.IntegrationTests.csproj", "{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}"
135135
EndProject
136+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Resilience.IntegrationTests", "test\integration\Elsa.Resilience.IntegrationTests\Elsa.Resilience.IntegrationTests.csproj", "{832675FA-C597-4554-AE6B-18F189198A1F}"
137+
EndProject
136138
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1}"
137-
ProjectSection(SolutionItems) = preProject
138-
src\apps\Directory.Build.props = src\apps\Directory.Build.props
139+
ProjectSection(SolutionItems) = preProject
140+
src\apps\Directory.Build.props = src\apps\Directory.Build.props
139141
EndProjectSection
140142
EndProject
141143
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Server.Web", "src\apps\Elsa.Server.Web\Elsa.Server.Web.csproj", "{5ADDDFB1-E59B-4097-97B7-8C24E2D60463}"
@@ -373,10 +375,14 @@ Global
373375
{99B171E6-0248-4402-836D-98947CD63772}.Release|Any CPU.ActiveCfg = Release|Any CPU
374376
{99B171E6-0248-4402-836D-98947CD63772}.Release|Any CPU.Build.0 = Release|Any CPU
375377
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
376-
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
377-
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
378-
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}.Release|Any CPU.Build.0 = Release|Any CPU
379-
{5ADDDFB1-E59B-4097-97B7-8C24E2D60463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
378+
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
379+
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
380+
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D}.Release|Any CPU.Build.0 = Release|Any CPU
381+
{832675FA-C597-4554-AE6B-18F189198A1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
382+
{832675FA-C597-4554-AE6B-18F189198A1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
383+
{832675FA-C597-4554-AE6B-18F189198A1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
384+
{832675FA-C597-4554-AE6B-18F189198A1F}.Release|Any CPU.Build.0 = Release|Any CPU
385+
{5ADDDFB1-E59B-4097-97B7-8C24E2D60463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
380386
{5ADDDFB1-E59B-4097-97B7-8C24E2D60463}.Debug|Any CPU.Build.0 = Debug|Any CPU
381387
{5ADDDFB1-E59B-4097-97B7-8C24E2D60463}.Release|Any CPU.ActiveCfg = Release|Any CPU
382388
{5ADDDFB1-E59B-4097-97B7-8C24E2D60463}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -497,9 +503,10 @@ Global
497503
{94A61AD7-2A2B-40DB-81F3-C59D596958A8} = {C6658DE0-2B2F-47F0-BB61-2CA66D435C09}
498504
{4B598AF7-BD7D-4544-A274-2CDDD98F4167} = {C6658DE0-2B2F-47F0-BB61-2CA66D435C09}
499505
{99B171E6-0248-4402-836D-98947CD63772} = {1B8D5897-902E-4632-8698-E89CAF3DDF54}
500-
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D} = {1B8D5897-902E-4632-8698-E89CAF3DDF54}
501-
{D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1} = {61017E64-6D00-49CB-9E81-5002DC8F7D5F}
502-
{5ADDDFB1-E59B-4097-97B7-8C24E2D60463} = {D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1}
506+
{4332A6BC-434A-4AF5-A075-F1BBCDD28F5D} = {1B8D5897-902E-4632-8698-E89CAF3DDF54}
507+
{832675FA-C597-4554-AE6B-18F189198A1F} = {1B8D5897-902E-4632-8698-E89CAF3DDF54}
508+
{D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1} = {61017E64-6D00-49CB-9E81-5002DC8F7D5F}
509+
{5ADDDFB1-E59B-4097-97B7-8C24E2D60463} = {D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1}
503510
{97C7E531-9D5F-43FD-AA19-BF24DA13B612} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
504511
{65F2AD97-3ECF-4BA6-8AAA-1E5882FDCE68} = {D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1}
505512
{690B0274-291F-4D9E-BA76-54EFF7D3E4BC} = {D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1}

‎src/apps/Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NoWarn>$(NoWarn);CS0162;CS1591</NoWarn>
88
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<ElsaStudioVersion>3.5.0-preview.1040</ElsaStudioVersion>
12+
</PropertyGroup>
913

1014
<ItemGroup>
1115
<PackageReference Include="ConfigureAwait.Fody" PrivateAssets="All"/>

‎src/apps/Elsa.Server.Web/Activities/CheckedActivity.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using Elsa.Extensions;
2+
using Elsa.Workflows;
3+
using Elsa.Workflows.Attributes;
4+
using Elsa.Workflows.Models;
5+
using Elsa.Workflows.UIHints;
6+
using Elsa.Workflows.UIHints.CheckList;
7+
8+
namespace Elsa.Server.Web.Activities;
9+
10+
public class CheckedActivity : CodeActivity<string[]>
11+
{
12+
[Input(UIHint = InputUIHints.CheckList, UIHandler = typeof(CustomCheckListOptionsProvider))]
13+
public Input<string[]> CheckedItems { get; set; }
14+
15+
protected override void Execute(ActivityExecutionContext context)
16+
{
17+
context.SetResult(CheckedItems.GetOrDefault(context));
18+
}
19+
}

‎src/apps/Elsa.Server.Web/Program.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
}
157157

158158
// Add Elsa services.
159+
services.AddScoped<IPropertyUIHandler, CustomCheckListOptionsProvider>();
159160
services
160161
.AddElsa(elsa =>
161162
{

‎src/apps/Elsa.Server.Web/StaticCheckListOptionsProvider.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System.Reflection;
2+
using Elsa.Workflows.UIHints.CheckList;
3+
4+
namespace Elsa.Server.Web;
5+
6+
/// <summary>
7+
/// Provides static drop-down options for a given property.
8+
/// </summary>
9+
public class CustomCheckListOptionsProvider : CheckListOptionsProviderBase
10+
{
11+
/// <inheritdoc />
12+
protected override ValueTask<ICollection<CheckListItem>> GetItemsAsync(PropertyInfo propertyInfo, object? context, CancellationToken cancellationToken)
13+
{
14+
var items = new[]
15+
{
16+
"Apple", "Banana", "Cherry"
17+
};
18+
var selectListItems = items.Select(x => new CheckListItem(x, x)).ToList();
19+
20+
return new(selectListItems);
21+
}
22+
}

‎src/apps/Elsa.Server.Web/appsettings.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Logging": {
33
"LogLevel": {
4-
"Default": "Warning",
4+
"Default": "Information",
55
"OpenTelemetry": "Debug",
66
"Microsoft.Hosting.Lifetime": "Information",
77
"Elsa": "Information",
@@ -277,16 +277,16 @@
277277
{
278278
"$type": "HttpResilienceStrategy",
279279
"Id": "1",
280-
"DisplayName": "Retry 3 times",
281-
"RetryCount": 3,
282-
"BackoffFactor": 2.0
280+
"DisplayName": "Retry 3 times, exponential",
281+
"MaxRetryAttempts": 3,
282+
"BackoffType": "Exponential"
283283
},
284284
{
285285
"$type": "HttpResilienceStrategy",
286286
"Id": "2",
287-
"DisplayName": "Retry 10 times",
288-
"RetryCount": 10,
289-
"BackoffFactor": 2.0
287+
"DisplayName": "Retry 10 times, linear",
288+
"MaxRetryAttempts": 10,
289+
"BackoffType": "Linear"
290290
}
291291
]
292292
}

‎src/apps/Elsa.ServerAndStudio.Web/Pages/_Host.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<link href="@baseUrl/_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet"/>
2929
<link href="@baseUrl/_content/Radzen.Blazor/css/material-base.css" rel="stylesheet">
3030
<link href="@baseUrl/_content/Elsa.Studio.Shell/css/shell.css" rel="stylesheet">
31+
<link href="@baseUrl/_content/Elsa.Studio.Workflows.Designer/designer.css" rel="stylesheet">
3132
<link href="ElsaStudioWebAssembly.styles.css" rel="stylesheet">
3233
</head>
3334

‎src/apps/Elsa.Studio.Web/Pages/_Host.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<link href="@basePath/_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet"/>
3434
<link href="@basePath/_content/Radzen.Blazor/css/material-base.css" rel="stylesheet">
3535
<link href="@basePath/_content/Elsa.Studio.Shell/css/shell.css" rel="stylesheet">
36+
<link href="@basePath/_content/Elsa.Studio.Workflows.Designer/designer.css" rel="stylesheet">
3637
<link href="ElsaStudioWebAssembly.styles.css" rel="stylesheet">
3738
</head>
3839

‎src/apps/ElsaStudioWebAssembly/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Elsa.Studio.Core.BlazorWasm.Extensions;
88
using Elsa.Studio.Extensions;
99
using Elsa.Studio.Login.BlazorWasm.Extensions;
10+
using Elsa.Studio.Login.Extensions;
1011
using Elsa.Studio.Login.HttpMessageHandlers;
1112
using Elsa.Studio.Models;
1213
using Elsa.Studio.Options;
@@ -35,6 +36,7 @@
3536
builder.Services.AddShell();
3637
builder.Services.AddRemoteBackend(backendApiConfig);
3738
builder.Services.AddLoginModule();
39+
builder.Services.UseElsaIdentity();
3840
builder.Services.AddDashboardModule();
3941
builder.Services.AddWorkflowsModule();
4042
builder.Services.AddAgentsModule(backendApiConfig);

‎src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,4 @@
1717
<PackageReference Include="Refit.HttpClientFactory" />
1818
</ItemGroup>
1919

20-
<ItemGroup>
21-
<ProjectReference Include="..\..\modules\Elsa.Expressions\Elsa.Expressions.csproj" />
22-
</ItemGroup>
23-
2420
</Project>

0 commit comments

Comments
 (0)