Merge pull request #468 from serverlessworkflow/fix-refactor-conditio…

…nal-nodes Properly handled `if` clauses the Dashboard's graph builder
serverlessworkflow · Dec 12, 2024 · f532e8a · f532e8a
2 parents ef95e92 + 539cf57
commit f532e8a
Show file tree

Hide file tree

Showing 10 changed files with 261 additions and 239 deletions.
diff --git a/src/api/Synapse.Api.Http/Synapse.Api.Http.csproj b/src/api/Synapse.Api.Http/Synapse.Api.Http.csproj
@@ -43,8 +43,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.0" />
-    <PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.0" />
+    <PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.1" />
+    <PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.1" />
 	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.1.0" />
   </ItemGroup>
 

diff --git a/src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj b/src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj
@@ -45,12 +45,12 @@
   <ItemGroup>
 	<PackageReference Include="IdentityModel" Version="7.0.0" />
 	<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
-	<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Mediation" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Plugins" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Serialization.Xml" Version="4.18.0" />
+	<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Mediation" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Plugins" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Serialization.Xml" Version="4.18.1" />
 	<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha5.2" />
   </ItemGroup>
 

diff --git a/src/core/Synapse.Core/Synapse.Core.csproj b/src/core/Synapse.Core/Synapse.Core.csproj
@@ -67,8 +67,8 @@
 	<PackageReference Include="Apache.Avro" Version="1.12.0" />
 	<PackageReference Include="Docker.DotNet" Version="3.125.15" />
 	<PackageReference Include="KubernetesClient" Version="15.0.1" />
-	<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.18.0" />
+	<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.18.1" />
     <PackageReference Include="Semver" Version="3.0.0" />
     <PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0-alpha5.2" />
   </ItemGroup>

diff --git a/src/correlator/Synapse.Correlator/Synapse.Correlator.csproj b/src/correlator/Synapse.Correlator/Synapse.Correlator.csproj
@@ -36,14 +36,14 @@
 	<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-	<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.18.0" />
-    <PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.18.0" />
-	<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.0" />
+	<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.18.1" />
+    <PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.18.1" />
+	<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.1" />
 	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.1.0" />
-	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.1.0" />
+	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/dashboard/Synapse.Dashboard/Components/WorkflowDiagram/StartNodeViewModel.cs b/src/dashboard/Synapse.Dashboard/Components/WorkflowDiagram/StartNodeViewModel.cs
@@ -18,13 +18,7 @@ namespace Synapse.Dashboard.Components;
 /// <summary>
 /// Represents the object that holds the data required to render the view of a workflow's start node 
 /// </summary>
-public class StartNodeViewModel(bool hasSuccessor = false)
+public class StartNodeViewModel()
     : WorkflowNodeViewModel("start-node", new() { CssClass = "start-node", Shape = NodeShape.Circle, Width = WorkflowGraphBuilder.StartEndNodeRadius, Height = WorkflowGraphBuilder.StartEndNodeRadius })
 {
-
-    /// <summary>
-    /// Gets a boolean indicating whether or not the node has a successor
-    /// </summary>
-    public bool HasSuccessor { get; } = hasSuccessor;
-
 }
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Workflows/Create/State.cs b/src/dashboard/Synapse.Dashboard/Pages/Workflows/Create/State.cs
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 using ServerlessWorkflow.Sdk.Models;
-using Synapse.Resources;
 
 namespace Synapse.Dashboard.Pages.Workflows.Create;