From 9751311fe6d8139a23c4f464415b8bc73cc49510 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 23 May 2018 21:26:19 +0200 Subject: [PATCH] Improved required handling in json schema. --- .../GenerateJsonSchema/JsonSchemaExtensions.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs index 74f1d00fb..a11185325 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs @@ -36,6 +36,8 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema var partitionItemProperty = field.Accept(jsonTypeVisitor); partitionItemProperty.Description = partitionItem.Name; + partitionItemProperty.IsRequired = field.RawProperties.IsRequired && !partitionItem.IsOptional; + partitionObject.Properties.Add(partitionItem.Key, partitionItemProperty); } @@ -53,18 +55,13 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema if (!string.IsNullOrWhiteSpace(field.RawProperties.Hints)) { - jsonProperty.Description = field.RawProperties.Hints; + jsonProperty.Description = $"{field.Name} ({field.RawProperties.Hints})"; } else { jsonProperty.Description = field.Name; } - if (!string.IsNullOrWhiteSpace(field.RawProperties.Hints)) - { - jsonProperty.Description += $" ({field.RawProperties.Hints})."; - } - return jsonProperty; } }