Fixed content publish query

Author: usercode

src/DragonFly.API.Client/ClientAPI/ClientContentService.ContentItem.cs

@@ -3,7 +3,6 @@
 // MIT License
 
 using System.Net.Http.Json;
-using DragonFly.API;
 using DragonFly.Query;
 
 namespace DragonFly.API.Client;
@@ -80,19 +79,19 @@ public async Task<QueryResult<ContentItem>> QueryAsync(ContentQuery queryParamet
 
     public async Task<IBackgroundTaskInfo> PublishQueryAsync(ContentQuery query)
     {
-        var response = await Client.PostAsJsonAsync($"api/content/publish", query);
+        var response = await Client.PostAsJsonAsync($"api/content/publish", query, ApiJsonSerializerDefault.Options);
 
         response.EnsureSuccessStatusCode();
 
-        return await response.Content.ReadFromJsonAsync<BackgroundTaskInfo>();
+        return await response.Content.ReadFromJsonAsync(ApiJsonSerializerContext.Default.BackgroundTaskInfo) ?? throw new ArgumentNullException();
     }
 
     public async Task<IBackgroundTaskInfo> UnpublishQueryAsync(ContentQuery query)
     {
-        var response = await Client.PostAsJsonAsync($"api/content/unpublish", query);
+        var response = await Client.PostAsJsonAsync($"api/content/unpublish", query, ApiJsonSerializerDefault.Options);
 
         response.EnsureSuccessStatusCode();
 
-        return await response.Content.ReadFromJsonAsync<BackgroundTaskInfo>();
+        return await response.Content.ReadFromJsonAsync(ApiJsonSerializerContext.Default.BackgroundTaskInfo) ?? throw new ArgumentNullException();
     }
 }

src/DragonFly.API.Client/ClientAPI/ClientContentService.ContentSchema.cs

@@ -34,7 +34,7 @@ public async Task<ContentSchema> GetSchemaAsync(string name)
 
     public async Task CreateAsync(ContentSchema entity)
     {
-        var response = await Client.PostAsJsonAsync($"api/schema", entity.ToRest());
+        var response = await Client.PostAsJsonAsync($"api/schema", entity.ToRest(), ApiJsonSerializerContext.Default.RestContentSchema);
 
         var result = await response.Content.ReadFromJsonAsync(ApiJsonSerializerContext.Default.ResourceCreated);
 

src/DragonFly.API.Core/Json/ApiJsonSerializerContext.cs

@@ -27,6 +27,7 @@ namespace DragonFly.API;
 [JsonSerializable(typeof(StructureQuery))]
 [JsonSerializable(typeof(WebHookQuery))]
 [JsonSerializable(typeof(IBackgroundTaskInfo))]
+[JsonSerializable(typeof(BackgroundTaskInfo))]
 [JsonSerializable(typeof(IEnumerable<IBackgroundTaskInfo>))]
 
 //AssetMetadata

src/DragonFly.AspNetCore/Extensions/DragonFlyBuilderExtensions.cs

@@ -61,7 +61,7 @@ public static IDragonFlyBuilder AddDragonFly(this IServiceCollection services)
 
         //builder.Services.AddSingleton<IAuthorizationPolicyProvider, PermissionPolicyProvider>();
 
-        builder.Services.AddSignalR();        
+        builder.Services.AddSignalR();
 
         return builder;
     }

src/DragonFly.BlockField.Core/Json/BlockFieldSerializerContext.cs

@@ -13,6 +13,8 @@ namespace DragonFly.BlockField;
 [JsonSerializable(typeof(Document))]
 
 //Blocks
+[JsonSerializable(typeof(IEnumerable<Block>))]
+
 [JsonSerializable(typeof(AlertBlock))]
 [JsonSerializable(typeof(AssetBlock))]
 [JsonSerializable(typeof(CardsBlock))]

src/DragonFly.Core/Modules/ContentItems/Models/Queries/ContentQuery.cs

@@ -17,43 +17,35 @@ public ContentQuery(string schema)
 
     public ContentQuery()
     {
-        Schema = string.Empty;
-        Fields = new List<FieldQuery>();
-        OrderFields = new List<FieldOrder>();
-
-        Take = 25;
-        Published = true;
-
-        IncludeListFieldsOnly = false;
     }
 
     /// <summary>
     /// Schema
     /// </summary>
-    public string Schema { get; set; }
+    public string Schema { get; set; } = string.Empty;
 
     /// <summary>
     /// Fields
     /// </summary>
-    public IList<FieldQuery> Fields { get; set; }
+    public IList<FieldQuery> Fields { get; set; } = new List<FieldQuery>();
 
     /// <summary>
     /// OrderFields
     /// </summary>
-    public IList<FieldOrder> OrderFields { get; set; }
+    public IList<FieldOrder> OrderFields { get; set; } = new List<FieldOrder>();
 
     /// <summary>
     /// IncludeListFieldsOnly
     /// </summary>
-    public bool IncludeListFieldsOnly { get; set; }
+    public bool IncludeListFieldsOnly { get; set; } = false;
 
     /// <summary>
     /// UsedAsset
     /// </summary>
-    public Guid? UsedAsset { get; set; }
+    public Guid? UsedAsset { get; set; } = null;
 
     /// <summary>
     /// Published
     /// </summary>
-    public bool Published { get; set; }
+    public bool Published { get; set; } = true;
 }