Skip to content

Commit f532e8a

Browse files
cdavernascdavernas
authored
Merge pull request #468 from serverlessworkflow/fix-refactor-conditional-nodes
Properly handled `if` clauses the Dashboard's graph builder
2 parents ef95e92 + 539cf57 commit f532e8a

File tree

10 files changed

+261
-239
lines changed

10 files changed

+261
-239
lines changed

‎src/api/Synapse.Api.Http/Synapse.Api.Http.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.0" />
47-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.0" />
46+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.1" />
47+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.1" />
4848
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.1.0" />
4949
</ItemGroup>
5050

‎src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
<ItemGroup>
4646
<PackageReference Include="IdentityModel" Version="7.0.0" />
4747
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
48-
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.18.0" />
49-
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.18.0" />
50-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.18.0" />
51-
<PackageReference Include="Neuroglia.Mediation" Version="4.18.0" />
52-
<PackageReference Include="Neuroglia.Plugins" Version="4.18.0" />
53-
<PackageReference Include="Neuroglia.Serialization.Xml" Version="4.18.0" />
48+
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.18.1" />
49+
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.18.1" />
50+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.18.1" />
51+
<PackageReference Include="Neuroglia.Mediation" Version="4.18.1" />
52+
<PackageReference Include="Neuroglia.Plugins" Version="4.18.1" />
53+
<PackageReference Include="Neuroglia.Serialization.Xml" Version="4.18.1" />
5454
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha5.2" />
5555
</ItemGroup>
5656

‎src/core/Synapse.Core/Synapse.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<PackageReference Include="Apache.Avro" Version="1.12.0" />
6868
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
6969
<PackageReference Include="KubernetesClient" Version="15.0.1" />
70-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.18.0" />
71-
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.18.0" />
70+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.18.1" />
71+
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.18.1" />
7272
<PackageReference Include="Semver" Version="3.0.0" />
7373
<PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0-alpha5.2" />
7474
</ItemGroup>

‎src/correlator/Synapse.Correlator/Synapse.Correlator.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="9.0.0" />
3737
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
3838
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
39-
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.18.0" />
40-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.18.0" />
41-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.18.0" />
42-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.0" />
43-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.18.0" />
44-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.0" />
39+
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.18.1" />
40+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.18.1" />
41+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.18.1" />
42+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.1" />
43+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.18.1" />
44+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.1" />
4545
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.1.0" />
46-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.1.0" />
46+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.0.0" />
4747
</ItemGroup>
4848

4949
<ItemGroup>

‎src/dashboard/Synapse.Dashboard/Components/WorkflowDiagram/StartNodeViewModel.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ namespace Synapse.Dashboard.Components;
1818
/// <summary>
1919
/// Represents the object that holds the data required to render the view of a workflow's start node
2020
/// </summary>
21-
public class StartNodeViewModel(bool hasSuccessor = false)
21+
public class StartNodeViewModel()
2222
: WorkflowNodeViewModel("start-node", new() { CssClass = "start-node", Shape = NodeShape.Circle, Width = WorkflowGraphBuilder.StartEndNodeRadius, Height = WorkflowGraphBuilder.StartEndNodeRadius })
2323
{
24-
25-
/// <summary>
26-
/// Gets a boolean indicating whether or not the node has a successor
27-
/// </summary>
28-
public bool HasSuccessor { get; } = hasSuccessor;
29-
3024
}

‎src/dashboard/Synapse.Dashboard/Pages/Workflows/Create/State.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// limitations under the License.
1313

1414
using ServerlessWorkflow.Sdk.Models;
15-
using Synapse.Resources;
1615

1716
namespace Synapse.Dashboard.Pages.Workflows.Create;
1817

0 commit comments

Comments
 (0)