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

Remove relationship where a file is removed

Browse Source
This commit is contained in:
Aurelsicoko 2018-02-27 18:57:28 +01:00
parent 03668670dc
commit cfef18ea6b
2 changed files with 65 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-plugin-content-manager/config/queries/mongoose.js
View File

@ -187,6 +187,12 @@ module.exports = {
acc[current] = params.values[current]; acc[current] = params.values[current];
} }
break;
case 'manyMorphToMany':
case 'manyMorphToOne':
case 'oneMorphToOne':
case 'oneMorphToMany':
acc[current] = params.values[current];
break; break;
default: default:
} }

101
packages/strapi-plugin-content-manager/services/ContentManager.js
View File

@ -84,56 +84,73 @@ module.exports = {
id: params.id id: params.id
}); });
await Promise.all( const model = source && source !== 'content-manager' ?
Object.keys(values.files) strapi.plugins[source].models[params.model]:
.map(async attribute => { strapi.models[params.model];
// Bufferize files per attribute.
const buffers = await strapi.plugins.upload.services.upload.bufferize(values.files[attribute]);
const files = buffers.map(file => {
// Add related information to be able to make
// the relationships later.
file.related = [{
refId: params.id,
ref: params.model,
source,
field: attribute,
}];
return file; const arrayOfPromises = [];
model.associations
.filter(association => association.via === 'related')
.forEach(association => {
// Remove deleted files.
if (parsedFields[association.alias]) {
const transformToArrayID = (array) => {
return _.isArray(array) ? array.map(value => {
if (_.isPlainObject(value)) {
return value[primaryKey];
}
return value;
}) : array;
};
// Compare array of ID to find deleted files.
const currentValue = transformToArrayID(parsedFields[association.alias]).map(id => id.toString());
const storedValue = transformToArrayID(entry[association.alias]).map(id => id.toString());
const removeRelations = _.difference(storedValue, currentValue);
// console.log("Current", currentValue);
// console.log("Stored", storedValue);
// console.log("removeRelations", removeRelations);
removeRelations.forEach(id => {
arrayOfPromises.push(strapi.plugins.upload.services.upload.edit({
id
}, {
related: []
}))
}); });
const arrayOfPromises = [strapi.plugins.upload.services.upload.upload(files, config)]; // TODO:
// - Remove relationships in files.
}
});
// Remove deleted files.
if (parsedFields[attribute]) {
const transformToArrayID = (array) => {
return _.isArray(array) ? array.map(value => {
if (_.isPlainObject(value)) {
return value[primaryKey];
}
return value; Object.keys(values.files)
}) : array; .map(async attribute => {
}; // Bufferize files per attribute.
const buffers = await strapi.plugins.upload.services.upload.bufferize(values.files[attribute]);
const files = buffers.map(file => {
// Add related information to be able to make
// the relationships later.
file.related = [{
refId: params.id,
ref: params.model,
source,
field: attribute,
}];
// Compare array of ID to find deleted files. return file;
const currentValue = transformToArrayID(parsedFields[attribute]); });
const storedValue = transformToArrayID(entry[attribute]);
const removeRelations = _.difference(storedValue, currentValue); // Make upload async.
arrayOfPromises.push(strapi.plugins.upload.services.upload.upload(files, config))
});
console.log("Current", currentValue); await Promise.all(arrayOfPromises);
console.log("Stored", storedValue);
console.log("removeRelations", removeRelations);
// TODO:
// - Remove relationships in files.
}
// Make upload async.
return await Promise.all(arrayOfPromises);
})
);
} }
return fields; return fields;