diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs index a34d4e377c..3ec37df7f2 100644 --- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs +++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs @@ -90,9 +90,9 @@ public static partial class UmbracoBuilderExtensions builder.DynamicRootSteps() .Append() - .Append() + .Append() .Append() - .Append(); + .Append(); builder.Components(); // register core CMS dashboards and 3rd party types - will be ordered by weight attribute & merged with package.manifest dashboards diff --git a/src/Umbraco.Core/DynamicRoot/QuerySteps/FarthestAncestorOrSelfDynamicRootQueryStep.cs b/src/Umbraco.Core/DynamicRoot/QuerySteps/FurthestAncestorOrSelfDynamicRootQueryStep.cs similarity index 83% rename from src/Umbraco.Core/DynamicRoot/QuerySteps/FarthestAncestorOrSelfDynamicRootQueryStep.cs rename to src/Umbraco.Core/DynamicRoot/QuerySteps/FurthestAncestorOrSelfDynamicRootQueryStep.cs index 11303cf3d9..c7da470baf 100644 --- a/src/Umbraco.Core/DynamicRoot/QuerySteps/FarthestAncestorOrSelfDynamicRootQueryStep.cs +++ b/src/Umbraco.Core/DynamicRoot/QuerySteps/FurthestAncestorOrSelfDynamicRootQueryStep.cs @@ -4,18 +4,18 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Core.DynamicRoot.QuerySteps; -public class FarthestAncestorOrSelfDynamicRootQueryStep : IDynamicRootQueryStep +public class FurthestAncestorOrSelfDynamicRootQueryStep : IDynamicRootQueryStep { private readonly ICoreScopeProvider _scopeProvider; private readonly IDynamicRootRepository _nodeFilterRepository; - public FarthestAncestorOrSelfDynamicRootQueryStep(ICoreScopeProvider scopeProvider, IDynamicRootRepository nodeFilterRepository) + public FurthestAncestorOrSelfDynamicRootQueryStep(ICoreScopeProvider scopeProvider, IDynamicRootRepository nodeFilterRepository) { _scopeProvider = scopeProvider; _nodeFilterRepository = nodeFilterRepository; } - protected virtual string SupportedDirectionAlias { get; set; } = "FarthestAncestorOrSelf"; + protected virtual string SupportedDirectionAlias { get; set; } = "FurthestAncestorOrSelf"; public async Task>> ExecuteAsync(ICollection origins, DynamicRootQueryStep filter) { @@ -30,7 +30,7 @@ public class FarthestAncestorOrSelfDynamicRootQueryStep : IDynamicRootQueryStep } using ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true); - var result = (await _nodeFilterRepository.FarthestAncestorOrSelfAsync(origins, filter))?.ToSingleItemCollection() ?? Array.Empty(); + var result = (await _nodeFilterRepository.FurthestAncestorOrSelfAsync(origins, filter))?.ToSingleItemCollection() ?? Array.Empty(); return Attempt>.Succeed(result); } diff --git a/src/Umbraco.Core/DynamicRoot/QuerySteps/FarthestDescendantOrSelfDynamicRootQueryStep.cs b/src/Umbraco.Core/DynamicRoot/QuerySteps/FurthestDescendantOrSelfDynamicRootQueryStep.cs similarity index 82% rename from src/Umbraco.Core/DynamicRoot/QuerySteps/FarthestDescendantOrSelfDynamicRootQueryStep.cs rename to src/Umbraco.Core/DynamicRoot/QuerySteps/FurthestDescendantOrSelfDynamicRootQueryStep.cs index a67d1bdf73..ceb2e4bac3 100644 --- a/src/Umbraco.Core/DynamicRoot/QuerySteps/FarthestDescendantOrSelfDynamicRootQueryStep.cs +++ b/src/Umbraco.Core/DynamicRoot/QuerySteps/FurthestDescendantOrSelfDynamicRootQueryStep.cs @@ -2,18 +2,18 @@ using Umbraco.Cms.Core.Scoping; namespace Umbraco.Cms.Core.DynamicRoot.QuerySteps; -public class FarthestDescendantOrSelfDynamicRootQueryStep : IDynamicRootQueryStep +public class FurthestDescendantOrSelfDynamicRootQueryStep : IDynamicRootQueryStep { private readonly ICoreScopeProvider _scopeProvider; private readonly IDynamicRootRepository _nodeFilterRepository; - public FarthestDescendantOrSelfDynamicRootQueryStep(ICoreScopeProvider scopeProvider, IDynamicRootRepository nodeFilterRepository) + public FurthestDescendantOrSelfDynamicRootQueryStep(ICoreScopeProvider scopeProvider, IDynamicRootRepository nodeFilterRepository) { _scopeProvider = scopeProvider; _nodeFilterRepository = nodeFilterRepository; } - protected virtual string SupportedDirectionAlias { get; set; } = "FarthestDescendantOrSelf"; + protected virtual string SupportedDirectionAlias { get; set; } = "FurthestDescendantOrSelf"; public async Task>> ExecuteAsync(ICollection origins, DynamicRootQueryStep filter) { @@ -28,7 +28,7 @@ public class FarthestDescendantOrSelfDynamicRootQueryStep : IDynamicRootQuerySte } using ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true); - var result = await _nodeFilterRepository.FarthestDescendantOrSelfAsync(origins, filter); + var result = await _nodeFilterRepository.FurthestDescendantOrSelfAsync(origins, filter); return Attempt>.Succeed(result); } diff --git a/src/Umbraco.Core/DynamicRoot/QuerySteps/IDynamicRootRepository.cs b/src/Umbraco.Core/DynamicRoot/QuerySteps/IDynamicRootRepository.cs index 10a35557a4..fb385324ed 100644 --- a/src/Umbraco.Core/DynamicRoot/QuerySteps/IDynamicRootRepository.cs +++ b/src/Umbraco.Core/DynamicRoot/QuerySteps/IDynamicRootRepository.cs @@ -4,9 +4,9 @@ public interface IDynamicRootRepository { Task NearestAncestorOrSelfAsync(IEnumerable origins, DynamicRootQueryStep queryStep); - Task FarthestAncestorOrSelfAsync(IEnumerable origins, DynamicRootQueryStep queryStep); + Task FurthestAncestorOrSelfAsync(IEnumerable origins, DynamicRootQueryStep queryStep); Task> NearestDescendantOrSelfAsync(ICollection origins, DynamicRootQueryStep queryStep); - Task> FarthestDescendantOrSelfAsync(ICollection origins, DynamicRootQueryStep queryStep); + Task> FurthestDescendantOrSelfAsync(ICollection origins, DynamicRootQueryStep queryStep); } diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DynamicRootRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DynamicRootRepository.cs index b634f45125..0d2b90aa0e 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DynamicRootRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DynamicRootRepository.cs @@ -35,7 +35,7 @@ public class DynamicRootRepository: IDynamicRootRepository return await Database.SingleOrDefaultAsync(query); } - public async Task FarthestAncestorOrSelfAsync(IEnumerable origins, DynamicRootQueryStep filter) { + public async Task FurthestAncestorOrSelfAsync(IEnumerable origins, DynamicRootQueryStep filter) { Sql query = Database.SqlContext.SqlSyntax.SelectTop( GetAncestorOrSelfBaseQuery(origins, filter) .Append($"ORDER BY n.level ASC"), @@ -83,7 +83,7 @@ public class DynamicRootRepository: IDynamicRootRepository return await Database.FetchAsync(query); } - public async Task> FarthestDescendantOrSelfAsync(ICollection origins, DynamicRootQueryStep filter) + public async Task> FurthestDescendantOrSelfAsync(ICollection origins, DynamicRootQueryStep filter) { var level = Database.Single(Database.SqlContext.Sql() .Select("COALESCE(MAX(n.level), 0)") diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DynamicRootServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DynamicRootServiceTests.cs index e9d277b325..5ff5f3aa0f 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DynamicRootServiceTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/DynamicRootServiceTests.cs @@ -34,7 +34,7 @@ public class DynamicRootServiceTests : UmbracoIntegrationTest { NearestAncestorOrSelf, NearestDescendantOrSelf, - FarthestDescendantOrSelf, + FurthestDescendantOrSelf, } protected IContentTypeService ContentTypeService => GetRequiredService(); @@ -240,7 +240,7 @@ public class DynamicRootServiceTests : UmbracoIntegrationTest [Test] [TestCase(DynamicRootStepAlias.NearestDescendantOrSelf)] - [TestCase(DynamicRootStepAlias.FarthestDescendantOrSelf)] + [TestCase(DynamicRootStepAlias.FurthestDescendantOrSelf)] public async Task GetDynamicRoots__DescendantOrSelf_must_handle_when_there_is_not_found_any_and_level_becomes_impossible_to_get( DynamicRootStepAlias dynamicRootAlias) @@ -323,7 +323,7 @@ public class DynamicRootServiceTests : UmbracoIntegrationTest } [Test] - public async Task GetDynamicRoots__FarthestDescendantOrSelf__has_to_find_only_the_farthest() + public async Task GetDynamicRoots__FurthestDescendantOrSelf__has_to_find_only_the_furthest() { // Arrange @@ -351,7 +351,7 @@ public class DynamicRootServiceTests : UmbracoIntegrationTest { new DynamicRootQueryStep() { - Alias = DynamicRootStepAlias.FarthestDescendantOrSelf.ToString(), + Alias = DynamicRootStepAlias.FurthestDescendantOrSelf.ToString(), AnyOfDocTypeKeys = new[] { ContentTypeActs.Key }, }, },