Browse Source

Fix for rule action schema.

pull/405/head
Sebastian 6 years ago
parent
commit
7e638d5262
  1. 3
      src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasOpenApiGenerator.cs
  2. 3
      src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs

3
src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasOpenApiGenerator.cs

@ -10,6 +10,7 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
using Namotion.Reflection;
using NJsonSchema;
using NJsonSchema.Generation;
using NSwag;
@ -78,7 +79,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator
{
var statusDtoType = typeof(ChangeStatusDto);
return schemaGenerator.Generate(statusDtoType);
return schemaGenerator.GenerateWithReference<JsonSchema>(statusDtoType.ToContextualType(), schemaResolver);
}
private void GenerateSchemasOperations(IEnumerable<ISchemaEntity> schemas, IAppEntity app)

3
src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs

@ -7,6 +7,7 @@
using System.Collections.Generic;
using System.Linq;
using Namotion.Reflection;
using NJsonSchema;
using NSwag.Generation.Processors;
using NSwag.Generation.Processors.Contexts;
@ -47,7 +48,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models
foreach (var action in ruleRegistry.Actions)
{
var derivedSchema = context.SchemaGenerator.Generate(action.Value.Type);
var derivedSchema = context.SchemaGenerator.Generate<JsonSchema>(action.Value.Type.ToContextualType(), context.SchemaResolver);
var oldName = context.Document.Definitions.FirstOrDefault(x => x.Value == derivedSchema).Key;

Loading…
Cancel
Save