Fixes routing issues based on findings #17572 (comment)

umbraco · Nov 20, 2024 · ba7fb5c · ba7fb5c
1 parent 5ba2103
commit ba7fb5c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/Umbraco.Core/Services/DocumentUrlService.cs b/src/Umbraco.Core/Services/DocumentUrlService.cs
@@ -669,7 +669,8 @@ private string GetFullUrl(bool isRootFirstItem, List<string> segments, Domain? f
             return foundDomain.Name.EnsureEndsWith("/") + string.Join('/', urlSegments);
         }
 
-        var hideTopLevel = _globalSettings.HideTopLevelNodeFromPath && isRootFirstItem;
+        // We always hide the top level of the first root item and decesendants
+        var hideTopLevel = _globalSettings.HideTopLevelNodeFromPath || isRootFirstItem;
         if (leftToRight)
         {
             return '/' + string.Join('/', urlSegments.Skip(hideTopLevel ? 1 : 0));
@@ -735,12 +736,33 @@ private IEnumerable<Guid> GetKeysInRoot(bool considerFirstLevelAsRoot, bool isDr
         }
         else
         {
+            Guid? firstRoot = null;
             foreach (Guid rootKey in rootKeys)
             {
+                if (isDraft is false && IsContentPublished(rootKey, culture) is false)
+                {
+                    continue;
+                }
+
+                if (firstRoot is null)
+                {
+                    firstRoot = rootKey;
+                }
+
                 yield return rootKey;
             }
-        }
 
+            //Always consider the child of first root item as roots
+            if (firstRoot.HasValue)
+            {
+                IEnumerable<Guid> childKeys = GetChildKeys(firstRoot.Value);
+
+                foreach (Guid childKey in childKeys)
+                {
+                    yield return childKey;
+                }
+            }
+        }
     }
 
     private Guid? GetChildWithUrlSegment(IEnumerable<Guid> childKeys, string urlSegment, string culture, bool isDraft)

diff --git a/src/Umbraco.Core/Services/IDocumentUrlService.cs b/src/Umbraco.Core/Services/IDocumentUrlService.cs
@@ -1,4 +1,3 @@
-using Umbraco.Cms.Core.Media.EmbedProviders;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;