yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-24 13:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete dynamic zone components bookshelf

Browse Source
This commit is contained in:
Alexandre Bodin 2019-10-24 17:03:53 +02:00
parent fbecade1c9
commit 6339a92016
3 changed files with 92 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/getstarted/components/closingperiod.json
View File

@ -16,6 +16,10 @@
"end_date": {
"type": "date",
"required": true
},
"dish": {
"component": "dish",
"type": "component"
}
}
}

1
packages/strapi-connector-bookshelf/lib/mount-models.js
View File

@ -641,7 +641,6 @@ module.exports = ({ models, target, plugin = false }, ctx) => {
const populateComponent = key => {
const attr = definition.attributes[key];
// TODO: maybe find a better approach
if (attr.type === 'dynamiczone') return [`${key}.component`];
let paths = [];

116
packages/strapi-connector-bookshelf/lib/queries.js
View File

@ -293,7 +293,12 @@ module.exports = function createQueryBuilder({ model, modelKey, strapi }) {
validateNonRepeatableInput(componentValue, { key, ...attr });
if (componentValue === null) continue;
await createComponentAndLink({ value: componentValue, order: 1 });
await createComponentAndLink({
componentModel,
key,
value: componentValue,
order: 1,
});
}
break;
}
@ -558,7 +563,7 @@ module.exports = function createQueryBuilder({ model, modelKey, strapi }) {
})
.destroy({ transacting });
for (let idToDelete of idsToDelete) {
for (const idToDelete of idsToDelete) {
const { id, component } = idToDelete;
const model = strapi.query(component.uid);
await model.delete({ [model.primaryKey]: id }, { transacting });
@ -624,36 +629,91 @@ module.exports = function createQueryBuilder({ model, modelKey, strapi }) {
for (let key of componentKeys) {
const attr = model.attributes[key];
const { component } = attr;
const { type } = attr;
const componentModel = strapi.components[component];
switch (type) {
case 'component': {
const { component } = attr;
const ids = await joinModel
.forge()
.query({
where: {
[foreignKey]: entry.id,
component_type: componentModel.collectionName,
field: key,
},
})
.fetchAll({ transacting })
.map(el => el.get('component_id'));
const componentModel = strapi.components[component];
await strapi
.query(componentModel.uid)
.delete({ [`${componentModel.primaryKey}_in`]: ids }, { transacting });
const ids = await joinModel
.forge()
.query({
where: {
[foreignKey]: entry.id,
field: key,
},
})
.fetchAll({ transacting })
.map(el => el.get('component_id'));
await joinModel
.forge()
.query({
where: {
[foreignKey]: entry.id,
component_type: componentModel.collectionName,
field: key,
},
})
.destroy({ transacting, require: false });
await strapi
.query(componentModel.uid)
.delete(
{ [`${componentModel.primaryKey}_in`]: ids },
{ transacting }
);
await joinModel
.forge()
.query({
where: {
[foreignKey]: entry.id,
field: key,
},
})
.destroy({ transacting, require: false });
break;
}
case 'dynamiczone': {
const { components } = attr;
const componentJoins = await joinModel
.forge()
.query({
where: {
[foreignKey]: entry.id,
field: key,
},
})
.fetchAll({ transacting })
.map(el => ({
id: el.get('component_id'),
componentType: el.get('component_type'),
}));
for (const compo of components) {
const { uid, collectionName } = strapi.components[compo];
const model = strapi.query(uid);
const toDelete = componentJoins.filter(
el => el.componentType === collectionName
);
if (toDelete.length > 0) {
await model.delete(
{
[`${model.primaryKey}_in`]: toDelete.map(el => el.id),
},
{ transacting }
);
}
}
await joinModel
.forge()
.query({
where: {
[foreignKey]: entry.id,
field: key,
},
})
.destroy({ transacting, require: false });
break;
}
}
}
}