Merge branch 'main' into mv/fix-16146

OrchardCMS · May 23, 2024 · e36390b · e36390b
2 parents e8b004a + 9a8aa1c
commit e36390b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
@@ -135,11 +135,11 @@ protected virtual async Task<IContent> GetContentAsync(WorkflowExecutionContext
  else
  {
  // If no expression was provided, see if the content item was provided as an input or as a property.
- content = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)
- ?? workflowContext.Properties.GetValue<IContent>(ContentEventConstants.ContentItemInputKey);
+ content = workflowContext.Input.GetValue<ContentItem>(ContentEventConstants.ContentItemInputKey)
+ ?? workflowContext.Properties.GetValue<ContentItem>(ContentEventConstants.ContentItemInputKey);
  }
 
- if (content != null && content.ContentItem.ContentItemId != null)
+ if (content?.ContentItem?.ContentItemId != null)
  {
  return content;
  }

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UpdateContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UpdateContentTask.cs
@@ -98,7 +98,7 @@ public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecuti
  }
  else
  {
- contentItem = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)?.ContentItem;
+ contentItem = workflowContext.Input.GetValue<ContentItem>(ContentEventConstants.ContentItemInputKey)?.ContentItem;
  }
 
  if (contentItem == null)
@@ -155,7 +155,7 @@ public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecuti
  {
  workflowContext.CorrelationId = contentItem.ContentItemId;
  }
- 
+
  workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
  workflowContext.LastResult = contentItem;
 

diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ServiceCollectionExtensions.cs
@@ -15,7 +15,7 @@ public static void AddInputObjectGraphType<TObject, TObjectType>(this IServiceCo
  where TObject : class
  where TObjectType : InputObjectGraphType<TObject>
  {
- services.AddScoped<TObjectType>();
+ services.AddTransient<TObjectType>();
  services.AddTransient<InputObjectGraphType<TObject>, TObjectType>(s => s.GetRequiredService<TObjectType>());
  services.AddTransient<IInputObjectGraphType, TObjectType>(s => s.GetRequiredService<TObjectType>());
  }
@@ -30,7 +30,7 @@ public static void AddObjectGraphType<TInput, TInputType>(this IServiceCollectio
  where TInput : class
  where TInputType : ObjectGraphType<TInput>
  {
- services.AddScoped<TInputType>();
+ services.AddTransient<TInputType>();
  services.AddTransient<ObjectGraphType<TInput>, TInputType>(s => s.GetRequiredService<TInputType>());
  services.AddTransient<IObjectGraphType, TInputType>(s => s.GetRequiredService<TInputType>());
  }

diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DictionaryExtensions.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DictionaryExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Text.Json;
 
 namespace OrchardCore.Workflows.Helpers
 {
@@ -19,12 +20,19 @@ public static TValue GetValue<TValue>(this IDictionary<string, object> dictionar
  {
  var value = dictionary.GetValue(key);
 
- if (value != null)
+ if (value == null)
  {
- return (TValue)value;
+ return default;
  }
 
- return default;
+ if (value is not TValue castedValue)
+ {
+ var json = JConvert.SerializeObject(value);
+
+ return JConvert.DeserializeObject<TValue>(json);
+ }
+
+ return castedValue;
  }
 
  /// <summary>