Bugfixes.

src/Squidex/Areas/Api/Controllers/JsonInheritanceConverter.cs

@@ -17,11 +17,11 @@ using NJsonSchema.Annotations;
 
 namespace Squidex.Areas.Api.Controllers
 {
-    public sealed class JsonInheritanceConverter : JsonConverter
+    public class JsonInheritanceConverter : JsonConverter
     {
         private readonly string discriminator;
-        private readonly Dictionary<string, Type> mapNameToType = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
-        private readonly Dictionary<Type, string> mapTypeToName = new Dictionary<Type, string>();
+        private readonly Dictionary<string, Type> mapTypeToName = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<Type, string> mapNameToType = new Dictionary<Type, string>();
 
         [ThreadStatic]
         private static bool IsReading;
@@ -61,16 +61,31 @@ namespace Squidex.Areas.Api.Controllers
         }
 
         public JsonInheritanceConverter(string discriminator, Type baseType)
+            : this(discriminator, baseType, null)
+        {
+        }
+
+        protected JsonInheritanceConverter(string discriminator, Type baseType,  IReadOnlyDictionary<string, Type> subTypes = null)
         {
             this.discriminator = discriminator;
 
-            foreach (var type in baseType.Assembly.GetTypes().Where(x => x != baseType && baseType.IsAssignableFrom(x)))
+            if (subTypes != null)
             {
-                var name = type.GetTypeInfo().GetCustomAttribute<JsonSchemaAttribute>()?.Name ?? type.Name;
-
-                mapTypeToName[type] = name;
+                foreach (var subType in subTypes)
+                {
+                    mapNameToType[subType.Value] = subType.Key;
+                    mapTypeToName[subType.Key] = subType.Value;
+                }
+            }
+            else
+            {
+                foreach (var type in baseType.Assembly.GetTypes().Where(x => x != baseType && baseType.IsAssignableFrom(x)))
+                {
+                    var name = type.GetTypeInfo().GetCustomAttribute<JsonSchemaAttribute>()?.Name ?? type.Name;
 
-                mapNameToType[name] = type;
+                    mapNameToType[type] = name;
+                    mapTypeToName[name] = type;
+                }
             }
         }
 
@@ -86,7 +101,7 @@ namespace Squidex.Areas.Api.Controllers
             {
                 var jsonObject = JObject.FromObject(value, serializer);
 
-                jsonObject.AddFirst(new JProperty(discriminator, mapTypeToName[value.GetType()]));
+                jsonObject.AddFirst(new JProperty(discriminator, mapNameToType[value.GetType()]));
 
                 writer.WriteToken(jsonObject.CreateReader());
             }
@@ -110,7 +125,7 @@ namespace Squidex.Areas.Api.Controllers
                     return null;
                 }
 
-                if (subName == null || !mapNameToType.TryGetValue(subName, out var subType))
+                if (subName == null || !mapTypeToName.TryGetValue(subName, out var subType))
                 {
                     throw new InvalidOperationException($"Could not find subtype of '{objectType.Name}' with discriminator '{subName}'.");
                 }

src/Squidex/Areas/Api/Controllers/Rules/Models/CreateRuleDto.cs

@@ -24,7 +24,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models
         /// The action properties.
         /// </summary>
         [Required]
-        [JsonConverter(typeof(JsonInheritanceConverter), "actionType", typeof(RuleAction))]
+        [JsonConverter(typeof(RuleActionSerializer))]
         public RuleAction Action { get; set; }
 
         public CreateRule ToCommand()

src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionSerializer.cs

@@ -0,0 +1,20 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Squidex.Domain.Apps.Core.Rules;
+using Squidex.Domain.Apps.Rules.Actions;
+
+namespace Squidex.Areas.Api.Controllers.Rules.Models
+{
+    public sealed class RuleActionSerializer : JsonInheritanceConverter
+    {
+        public RuleActionSerializer()
+            : base("actionType", typeof(RuleAction), RuleActionRegistry.Actions)
+        {
+        }
+    }
+}

src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs

@@ -66,7 +66,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models
         /// The action properties.
         /// </summary>
         [Required]
-        [JsonConverter(typeof(JsonInheritanceConverter), "actionType", typeof(RuleAction))]
+        [JsonConverter(typeof(RuleActionSerializer))]
         public RuleAction Action { get; set; }
 
         public static RuleDto FromRule(IRuleEntity rule)

src/Squidex/Areas/Api/Controllers/Rules/Models/UpdateRuleDto.cs

@@ -22,7 +22,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models
         /// <summary>
         /// The action properties.
         /// </summary>
-        [JsonConverter(typeof(JsonInheritanceConverter), "actionType", typeof(RuleAction))]
+        [JsonConverter(typeof(RuleActionSerializer))]
         public RuleAction Action { get; set; }
 
         public UpdateRule ToCommand(Guid id)