Skip to content

Delete references using custom relation types #13389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikolajlauridsen merged 3 commits into from
Nov 23, 2022
Merged

Delete references using custom relation types #13389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf68973
Delete references for custom relation types as well
bjarnef Nov 13, 2022
2e1b663
Remove use of constant
bjarnef Nov 13, 2022
664081d
Obsolete AutomaticRelationTypes
nikolajlauridsen Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Umbraco.Core/Constants-Conventions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,16 @@ public static class RelationTypes
public const string RelateParentMediaFolderOnDeleteAlias = "relateParentMediaFolderOnDelete";

/// <summary>
/// Returns the types of relations that are automatically tracked
/// Returns the types of relations that are automatically tracked.
/// </summary>
/// <remarks>
/// Developers should not manually use these relation types since they will all be cleared whenever an entity
/// (content, media or member) is saved since they are auto-populated based on property values.
/// </remarks>
[Obsolete("This is no longer used, and will be removed in v12")]
public static string[] AutomaticRelationTypes { get; } = { RelatedMediaAlias, RelatedDocumentAlias };

// TODO: return a list of built in types so we can use that to prevent deletion in the uI
// TODO: return a list of built in types so we can use that to prevent deletion in the UI
}

public static class Udi
Expand Down
12 changes: 10 additions & 2 deletions src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,8 +1042,13 @@ protected void PersistRelations(TEntity entity)
var trackedRelations = new List<UmbracoEntityReference>();
trackedRelations.AddRange(_dataValueReferenceFactories.GetAllReferences(entity.Properties, PropertyEditors));

var relationTypeAliases = trackedRelations
.Select(x => x.RelationTypeAlias)
.Distinct()
.ToArray();

// First delete all auto-relations for this entity
RelationRepository.DeleteByParent(entity.Id, Constants.Conventions.RelationTypes.AutomaticRelationTypes);
RelationRepository.DeleteByParent(entity.Id, relationTypeAliases);

if (trackedRelations.Count == 0)
{
Expand All @@ -1055,7 +1060,10 @@ protected void PersistRelations(TEntity entity)
.ToDictionary(x => (Udi)x!, x => x!.Guid);

// lookup in the DB all INT ids for the GUIDs and chuck into a dictionary
var keyToIds = Database.Fetch<NodeIdKey>(Sql().Select<NodeDto>(x => x.NodeId, x => x.UniqueId).From<NodeDto>().WhereIn<NodeDto>(x => x.UniqueId, udiToGuids.Values))
var keyToIds = Database.Fetch<NodeIdKey>(Sql()
.Select<NodeDto>(x => x.NodeId, x => x.UniqueId)
.From<NodeDto>()
.WhereIn<NodeDto>(x => x.UniqueId, udiToGuids.Values))
.ToDictionary(x => x.UniqueId, x => x.NodeId);

var allRelationTypes = RelationTypeRepository.GetMany(Array.Empty<int>())?
Expand Down