Skip to content

Fix/15770 dynamic roots issues #16770

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

Closed
bielu wants to merge 2 commits into from
Closed

Fix/15770 dynamic roots issues #16770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dd8a3c
fix: ensured that Root, Site return correct values if on new node.
bielu Jul 9, 2024
fd1af90
Feat: added new Origin finder which look also for current node if Par…
bielu Jul 9, 2024
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
1 change: 1 addition & 0 deletions src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ internal static void AddAllCoreCollectionBuilders(this IUmbracoBuilder builder)
builder.DynamicRootOriginFinders()
.Append<ByKeyDynamicRootOriginFinder>()
.Append<ParentDynamicRootOriginFinder>()
.Append<ParentOrSelfDynamicRootOriginFinder>()
.Append<CurrentDynamicRootOriginFinder>()
.Append<SiteDynamicRootOriginFinder>()
.Append<RootDynamicRootOriginFinder>();
Expand Down
23 changes: 23 additions & 0 deletions src/Umbraco.Core/DynamicRoot/Origin/ParentOrSelfDynamicRootOriginFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Umbraco.Cms.Core.Services;

namespace Umbraco.Cms.Core.DynamicRoot.Origin;

public class ParentOrSelfDynamicRootOriginFinder : ParentDynamicRootOriginFinder
{
public ParentOrSelfDynamicRootOriginFinder(IEntityService entityService) : base(entityService)
{
}

protected override string SupportedOriginType { get; set; } = "ParentOrSelf";

public override Guid? FindOriginKey(DynamicRootNodeQuery query)
{
var baseResult = base.FindOriginKey(query);
if(baseResult is not null || query.Context.CurrentKey is null)
{
return baseResult;
}
query.OriginKey = query.Context.CurrentKey;
return base.FindOriginKey(query);
}
}
4 changes: 4 additions & 0 deletions src/Umbraco.Core/DynamicRoot/Origin/RootDynamicRootOriginFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ public RootDynamicRootOriginFinder(IEntityService entityService)
}

var entity = _entityService.Get(query.Context.ParentKey);
if (entity is null && query.Context.CurrentKey.HasValue)
{
entity = _entityService.Get(query.Context.CurrentKey.Value);
}

if (entity is null || _allowedObjectTypes.Contains(entity.NodeObjectType) is false)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Core/DynamicRoot/Origin/SiteDynamicRootOriginFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public SiteDynamicRootOriginFinder(IEntityService entityService, IDomainService

public override Guid? FindOriginKey(DynamicRootNodeQuery query)
{
if (query.OriginAlias != SupportedOriginType || query.Context.CurrentKey.HasValue is false)
if (query.OriginAlias != SupportedOriginType)
{
return null;
}

IEntitySlim? entity = _entityService.Get(query.Context.CurrentKey.Value);
IEntitySlim? entity = query.Context.CurrentKey.HasValue is false ? _entityService.Get(query.Context.ParentKey) : _entityService.Get(query.Context.CurrentKey.Value);
if (entity is null || entity.NodeObjectType != Constants.ObjectTypes.Document)
{
return null;
Expand Down