Add QueryJsonConverter

Fix #16372

src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Deployment;
 using OrchardCore.DisplayManagement.Handlers;
+using OrchardCore.Json;
 using OrchardCore.Liquid;
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
@@ -44,6 +45,11 @@ public override void ConfigureServices(IServiceCollection services)
                 });
             })
             .AddLiquidFilter<QueryFilter>("query");
+
+            services.Configure<DocumentJsonSerializerOptions>(options =>
+            {
+                options.SerializerOptions.Converters.Add(QueryJsonConverter.Instance);
+            });
         }
     }
 

src/OrchardCore/OrchardCore.Queries.Abstractions/Query.cs

@@ -14,6 +14,13 @@ protected Query(string source)
             Source = source;
         }
 
+        internal Query(string source, string name, string schema)
+            : this(source)
+        {
+            Name = name;
+            Schema = schema;
+        }
+
         /// <summary>
         /// Gets or sets the technical name of the query.
         /// </summary>

src/OrchardCore/OrchardCore.Queries.Abstractions/QueryJsonConverter.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OrchardCore.Queries;
+
+public sealed class QueryJsonConverter : JsonConverter<Query>
+{
+    public static readonly QueryJsonConverter Instance = new();
+
+    public override Query Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        string source = null;
+        string name = null;
+        string schema = null;
+
+        while (reader.Read())
+        {
+            if (reader.TokenType == JsonTokenType.EndObject)
+            {
+                break;
+            }
+
+            if (reader.TokenType == JsonTokenType.PropertyName)
+            {
+                var propertyName = reader.GetString();
+                reader.Read();
+
+                switch (propertyName)
+                {
+                    case nameof(Query.Source):
+                        source = reader.GetString();
+                        break;
+                    case nameof(Query.Name):
+                        name = reader.GetString();
+                        break;
+                    case nameof(Query.Schema):
+                        schema = reader.GetString();
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        return new Query(source, name, schema);
+    }
+
+    public override void Write(Utf8JsonWriter writer, Query value, JsonSerializerOptions options)
+    {
+        writer.WriteStartObject();
+        writer.WriteString(nameof(Query.Source), value.Source);
+        writer.WriteString(nameof(Query.Name), value.Name);
+        writer.WriteString(nameof(Query.Schema), value.Schema);
+        writer.WriteEndObject();
+    }
+}