yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-07 15:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhancement: fix type generation for Attribute.Relation by removing uid

Browse Source
This commit is contained in:
Convly 2024-01-25 17:30:21 +01:00
parent 758843ffd1
commit 16ac13f00a
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/utils/typescript/lib/generators/common/models/mappers.js
View File

@ -69,7 +69,7 @@ module.exports = {
params.push(...targetFieldParams); params.push(...targetFieldParams);
// If the options property is defined, transform it to // If the options property is defined, transform it to
// a type literral node and add it to the params list // a type literal node and add it to the params list
if (_.isObject(options)) { if (_.isObject(options)) {
params.push(toTypeLiteral(options)); params.push(toTypeLiteral(options));
} }
@ -93,25 +93,18 @@ module.exports = {
media() { media() {
return [withAttributeNamespace('Media')]; return [withAttributeNamespace('Media')];
}, },
relation({ uid, attribute }) { relation({ attribute }) {
const { relation, target } = attribute; const { relation, target } = attribute;
const isMorphRelation = relation.toLowerCase().includes('morph'); const isMorphRelation = relation.toLowerCase().includes('morph');
if (isMorphRelation) { if (isMorphRelation) {
return [ return [withAttributeNamespace('Relation'), [factory.createStringLiteral(relation, true)]];
withAttributeNamespace('Relation'),
[factory.createStringLiteral(uid, true), factory.createStringLiteral(relation, true)],
];
} }
return [ return [
withAttributeNamespace('Relation'), withAttributeNamespace('Relation'),
[ [factory.createStringLiteral(relation, true), factory.createStringLiteral(target, true)],
factory.createStringLiteral(uid, true),
factory.createStringLiteral(relation, true),
factory.createStringLiteral(target, true),
],
]; ];
}, },
component({ attribute }) { component({ attribute }) {