From cf905de6b35fe48a644366d37cf725f9c340fc74 Mon Sep 17 00:00:00 2001 From: Freyb Date: Tue, 25 Apr 2023 15:52:05 +0200 Subject: [PATCH 1/2] Fix conflicting keys on dynamic zone --- server/helpers/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/helpers/index.js b/server/helpers/index.js index fac6201..38eac56 100644 --- a/server/helpers/index.js +++ b/server/helpers/index.js @@ -30,9 +30,9 @@ const getFullPopulateObject = (modelUid, maxDepth = 20) => { } else if (value.type === "dynamiczone") { const dynamicPopulate = value.components.reduce((prev, cur) => { const curPopulate = getFullPopulateObject(cur, maxDepth - 1); - return curPopulate === true ? prev : merge(prev, curPopulate); + return curPopulate === true ? prev : merge(prev, {[cur]: curPopulate}); }, {}); - populate[key] = isEmpty(dynamicPopulate) ? true : dynamicPopulate; + populate[key] = isEmpty(dynamicPopulate) ? true : { on: dynamicPopulate }; } else if (value.type === "relation") { const relationPopulate = getFullPopulateObject( value.target, From 38b844a7e0d2bda747fba78dc783c0827ddbb94c Mon Sep 17 00:00:00 2001 From: Freyb Date: Wed, 26 Apr 2023 13:56:10 +0200 Subject: [PATCH 2/2] Fix issue of simple components not showing up --- server/helpers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/helpers/index.js b/server/helpers/index.js index 38eac56..c401c2b 100644 --- a/server/helpers/index.js +++ b/server/helpers/index.js @@ -30,7 +30,7 @@ const getFullPopulateObject = (modelUid, maxDepth = 20) => { } else if (value.type === "dynamiczone") { const dynamicPopulate = value.components.reduce((prev, cur) => { const curPopulate = getFullPopulateObject(cur, maxDepth - 1); - return curPopulate === true ? prev : merge(prev, {[cur]: curPopulate}); + return merge(prev, {[cur]: curPopulate}); }, {}); populate[key] = isEmpty(dynamicPopulate) ? true : { on: dynamicPopulate }; } else if (value.type === "relation") {