From a0846effaec4656d7eb32d629cbd279de894eb94 Mon Sep 17 00:00:00 2001 From: Mohamed Ali Date: Tue, 16 Jul 2024 15:54:20 +0300 Subject: [PATCH] bugfixing issues related to new PropertyBag in workflow definition (#5778) --- .../Elsa.Api.Client/Extensions/PropertyBagExtensions.cs | 2 +- .../Endpoints/WorkflowDefinitions/Post/Endpoint.cs | 3 ++- .../Services/WorkflowDefinitionImporter.cs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/clients/Elsa.Api.Client/Extensions/PropertyBagExtensions.cs b/src/clients/Elsa.Api.Client/Extensions/PropertyBagExtensions.cs index c27200c88..a72b7b556 100644 --- a/src/clients/Elsa.Api.Client/Extensions/PropertyBagExtensions.cs +++ b/src/clients/Elsa.Api.Client/Extensions/PropertyBagExtensions.cs @@ -22,7 +22,7 @@ public static class PropertyBagExtensions if (!propertyBag.TryGetValue(key, out var value)) return defaultValue(); - var json = (string)value; + var json = value.ToString(); return JsonSerializer.Deserialize(json); } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Post/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Post/Endpoint.cs index df0e87a15..9c899e3a1 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Post/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Post/Endpoint.cs @@ -79,7 +79,8 @@ internal class Post( draft.Name = model.Name?.Trim(); draft.ToolVersion = model.ToolVersion; draft.Description = model.Description?.Trim(); - draft.CustomProperties = model.CustomProperties ?? new Dictionary(); + draft.CustomProperties = model.CustomProperties ?? new Dictionary(); + draft.PropertyBag = model.PropertyBag ?? new PropertyBag(); draft.Variables = variables; draft.Inputs = inputs; draft.Outputs = outputs; diff --git a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs index f09a4ef7b..47df45637 100644 --- a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs +++ b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs @@ -63,7 +63,8 @@ namespace Elsa.Workflows.Management.Services draft.MaterializerName = JsonWorkflowMaterializer.MaterializerName; draft.Name = model.Name?.Trim(); draft.Description = model.Description?.Trim(); - draft.CustomProperties = model.CustomProperties ?? new Dictionary(); + draft.CustomProperties = model.CustomProperties ?? new Dictionary(); + draft.PropertyBag = model.PropertyBag ?? new PropertyBag(); draft.Variables = variables; draft.Inputs = model.Inputs ?? new List(); draft.Outputs = model.Outputs ?? new List();