yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensured removal of any auto-relations from custom relation types used in nested property values, to ensure there will be no duplicate error when the relations are saved. (#15447)

Browse Source
This commit is contained in:
Andy Butland
2024-01-03 10:50:58 +01:00
committed by GitHub
parent 3538737681
commit 99119a506f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
View File

@@ -1087,10 +1087,20 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
var trackedRelations = new List<UmbracoEntityReference>();
trackedRelations.AddRange(_dataValueReferenceFactories.GetAllReferences(entity.Properties, PropertyEditors));
var relationTypeAliases = GetAutomaticRelationTypesAliases(entity.Properties, PropertyEditors).ToArray();
var relationTypeAliases = GetAutomaticRelationTypesAliases(entity.Properties, PropertyEditors).ToList();
// At this point we potentially have a problem (see for example: https://github.com/umbraco/Umbraco.Forms.Issues/issues/1129).
// If we have a custom relation type (i.e. not document or media) and use of this within a block grid/list property editor,
// we'll get an error when saving the relations.
// It happens because the block grid doesn't expose the automatic relation type aliases for all of it's nested properties, and
// as such relationTypeAliases does not contain the custom relation type alias.
// Auto-relations of that type are then then not deleted, and we get duplicate error on insert.
// To resolve we can look at the relations we are going to be saving, and if they include any relation type aliases we haven't
// already identified, we'll add them in, so they will also be removed along with the other auto-relations.
relationTypeAliases.AddRange(trackedRelations.Select(x => x.RelationTypeAlias).Distinct().Except(relationTypeAliases));
// First delete all auto-relations for this entity
RelationRepository.DeleteByParent(entity.Id, relationTypeAliases);
RelationRepository.DeleteByParent(entity.Id, relationTypeAliases.ToArray());
if (trackedRelations.Count == 0)
{