From 75e6b63e781af1719b50790679e93acfd84e358a Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Tue, 6 Jul 2021 19:55:21 +0200
Subject: [PATCH] Fix nested components.

---
 .../AppProviderExtensions.cs                      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/backend/src/Squidex.Domain.Apps.Entities/AppProviderExtensions.cs b/backend/src/Squidex.Domain.Apps.Entities/AppProviderExtensions.cs
index 5562b58e4..2b7096d25 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/AppProviderExtensions.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/AppProviderExtensions.cs
@@ -34,6 +34,8 @@ namespace Squidex.Domain.Apps.Entities
 
                             if (resolvedEntity != null)
                             {
+                                await ResolveSchemaAsync(resolvedEntity);
+
                                 result ??= new Dictionary<DomainId, Schema>();
                                 result[schemaId] = resolvedEntity.SchemaDef;
                             }
@@ -46,11 +48,11 @@ namespace Squidex.Domain.Apps.Entities
             {
                 foreach (var nestedField in arrayField.Fields)
                 {
-                    await ResolveAsync(nestedField);
+                    await ResolveFieldAsync(nestedField);
                 }
             }
 
-            async Task ResolveAsync(IField field)
+            async Task ResolveFieldAsync(IField field)
             {
                 switch (field)
                 {
@@ -68,11 +70,16 @@ namespace Squidex.Domain.Apps.Entities
                 }
             }
 
-            foreach (var field in schema.SchemaDef.Fields)
+            async Task ResolveSchemaAsync(ISchemaEntity schema)
             {
-                await ResolveAsync(field);
+                foreach (var field in schema.SchemaDef.Fields)
+                {
+                    await ResolveFieldAsync(field);
+                }
             }
 
+            await ResolveSchemaAsync(schema);
+
             if (result == null)
             {
                 return ResolvedComponents.Empty;