yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-30 17:18:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken populate traversal with no fragment

Browse Source
This commit is contained in:
Convly 2023-03-16 14:30:07 +01:00
parent a9d1afd76d
commit ae5481026b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/utils/lib/traverse/query-populate.js
View File

@ -160,6 +160,8 @@ const populate = traverseFactory()
const { components } = attribute;
const { on, ...properties } = value;
const newValue = {};
// Handle legacy DZ params
let newProperties = properties;
@ -168,11 +170,15 @@ const populate = traverseFactory()
newProperties = await recurse(visitor, { schema: componentSchema, path }, newProperties);
}
// Handle new morph fragment syntax
const newOn = await recurse(visitor, { schema, path }, { on });
Object.assign(newValue, newProperties);
// Recompose both syntaxes
const newValue = { ...newOn, ...newProperties };
// Handle new morph fragment syntax
if (on) {
const newOn = await recurse(visitor, { schema, path }, { on });
// Recompose both syntaxes
Object.assign(newValue, newOn);
}
set(key, newValue);
} else {