stage

Author: Mpdreamz

src/Elastic.Documentation.Navigation/Isolated/DocumentationSetNavigation.cs

@@ -399,35 +399,24 @@ int depth
 			context.ReadFileSystem.Path.Combine(context.DocumentationSourceDirectory.FullName, fullTocPath)
 		);
 
-		// TODO: Add validation for TOCs with children in parent YAML
-		// This is a known limitation - TOCs should not have children defined in parent YAML
-
-		// According to url-building.md line 19-21: "We are not actually changing the PathPrefix,
-		// we create the scope to be able to rehome during Assembler builds."
-		// So TOC uses the SAME PathPrefix as its parent - it only creates a scope for rehoming
-		var scopedPathPrefix = homeProvider.PathPrefix;
-
 		// Create the TOC navigation with empty children initially
 		// We use null parent temporarily - we'll set it properly at the end using the public setter
+		// Pass tocHomeProvider so the TOC uses parent's NavigationRoot (enables dynamic URL updates)
 		var tocNavigation = new TableOfContentsNavigation(
 			tocDirectory,
 			depth + 1,
 			fullTocPath,
 			null, // Temporary null parent
-			scopedPathPrefix,
+			homeProvider.PathPrefix,
 			[],
 			Git,
-			_tableOfContentNodes
+			_tableOfContentNodes,
+			homeProvider
 		)
 		{
 			NavigationIndex = index
 		};
 
-		// Create a scoped HomeProvider for TOC children
-		// According to url-building.md: "In isolated builds the NavigationRoot is always the DocumentationSetNavigation"
-		// So we use the parent's NavigationRoot, not the TOC itself
-		var tocHomeProvider = new NavigationHomeProvider(scopedPathPrefix, homeProvider.NavigationRoot);
-
 		// Convert children - pass tocNavigation as parent and tocHomeProvider as HomeProvider (TOC creates new scope)
 		var children = new List<INavigationItem>();
 		var childIndex = 0;
@@ -441,7 +430,7 @@ int depth
 				childIndex++,
 				context,
 				tocNavigation,
-				tocHomeProvider, // Use the scoped HomeProvider with correct NavigationRoot
+				homeProvider, // Use the scoped HomeProvider with correct NavigationRoot
 				depth + 1
 			);
 
@@ -470,10 +459,11 @@ int depth
 			depth + 1,
 			fullTocPath,
 			parent, // Now set the correct parent
-			scopedPathPrefix,
+			homeProvider.PathPrefix,
 			children,
 			Git,
-			_tableOfContentNodes
+			_tableOfContentNodes,
+			homeProvider // Pass same HomeProvider to final TOC
 		)
 		{
 			NavigationIndex = index

src/Elastic.Documentation.Navigation/Isolated/TableOfContentsNavigation.cs

@@ -26,7 +26,8 @@ public TableOfContentsNavigation(
 		string pathPrefix,
 		IReadOnlyCollection<INavigationItem> navigationItems,
 		GitCheckoutInformation git,
-		Dictionary<Uri, INodeNavigationItem<IDocumentationFile, INavigationItem>> tocNodes
+		Dictionary<Uri, INodeNavigationItem<IDocumentationFile, INavigationItem>> tocNodes,
+		INavigationHomeProvider homeProvider
 	)
 	{
 		TableOfContentsDirectory = tableOfContentsDirectory;
@@ -38,10 +39,11 @@ Dictionary<Uri, INodeNavigationItem<IDocumentationFile, INavigationItem>> tocNod
 		Id = ShortId.Create(parentPath);
 		Depth = depth;
 		ParentPath = parentPath;
-		_pathPrefix = pathPrefix;
+		PathPrefix = pathPrefix;
 
-		// Initialize _homeProvider to this - it will be updated in assembler builds if needed
-		_homeProvider = this;
+		// Initialize _homeProvider from the provided homeProvider
+		// According to url-building.md: "In isolated builds the NavigationRoot is always the DocumentationSetNavigation"
+		_homeProvider = homeProvider;
 
 		// Create an identifier for this TOC
 		Identifier = new Uri($"{git.RepositoryName}://{parentPath}");
@@ -51,20 +53,17 @@ Dictionary<Uri, INodeNavigationItem<IDocumentationFile, INavigationItem>> tocNod
 		Index = this.FindIndex<IDocumentationFile>(new NotFoundModel($"{parentPath}/index.md"));
 	}
 
-	private readonly string _pathPrefix;
-
 	/// <summary>
-	/// Internal HomeProvider - defaults to this, but can be updated in assembler builds.
+	/// Internal HomeProvider - can be updated in assembler builds for rehoming.
 	/// </summary>
 	private INavigationHomeProvider _homeProvider { get; set; }
 
 	/// <summary>
-	/// The composed path prefix for this TOC, which is the parent's prefix + this TOC's parent path.
-	/// This is used by children to build their URLs.
-	/// Implements INavigationHomeProvider.PathPrefix
-	/// When HomeProvider is set (during assembler), this returns the external provider's PathPrefix.
+	/// The path prefix for this TOC - same as parent per url-building.md.
+	/// Implements INavigationHomeProvider.PathPrefix.
+	/// TOC doesn't change PathPrefix from parent.
 	/// </summary>
-	public string PathPrefix => _homeProvider == this ? _pathPrefix : _homeProvider.PathPrefix;
+	public string PathPrefix { get; }
 
 	/// <inheritdoc />
 	public string Url => Index.Url;
@@ -73,11 +72,11 @@ Dictionary<Uri, INodeNavigationItem<IDocumentationFile, INavigationItem>> tocNod
 	public string NavigationTitle => Index.NavigationTitle;
 
 	/// <summary>
-	/// TableOfContentsNavigation is its own NavigationRoot in isolated builds.
-	/// In assembler builds, this can be overridden via HomeProvider.
+	/// TableOfContentsNavigation's NavigationRoot comes from its HomeProvider.
+	/// According to url-building.md: "In isolated builds the NavigationRoot is always the DocumentationSetNavigation"
 	/// This satisfies both INavigationItem.NavigationRoot and INavigationHomeProvider.NavigationRoot.
 	/// </summary>
-	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => _homeProvider == this ? this : _homeProvider.NavigationRoot;
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => _homeProvider.NavigationRoot;
 
 	/// <inheritdoc />
 	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }

tests/Navigation.Tests/Isolation/NavigationStructureTests.cs

@@ -340,12 +340,12 @@ void VisitNavigationItems(INavigationItem item)
 		gettingStarted.NavigationRoot.Should().BeSameAs(navigation);
 
 		// According to url-building.md: "In isolated builds the NavigationRoot is always the DocumentationSetNavigation"
-		// Items in advanced TOC should point to DocumentationSetNavigation, not the TOC
+		// ALL items including TOCs should point to DocumentationSetNavigation as NavigationRoot
 		var advancedToc = setupFolder.NavigationItems.ElementAt(1).Should().BeOfType<TableOfContentsNavigation>().Subject;
-		advancedToc.NavigationRoot.Should().BeSameAs(advancedToc, "TableOfContentsNavigation is its own root when not rehomed");
+		advancedToc.NavigationRoot.Should().BeSameAs(navigation, "TOC NavigationRoot should be DocumentationSetNavigation in isolated builds");
 
 		var advancedIndex = advancedToc.NavigationItems.First();
-		advancedIndex.NavigationRoot.Should().BeSameAs(navigation, "Items within TOC should point to DocumentationSetNavigation in isolated builds");
+		advancedIndex.NavigationRoot.Should().BeSameAs(navigation, "TOC children should point to DocumentationSetNavigation in isolated builds");
 
 		// Items in file with children should point to DocumentationSetNavigation
 		var guideFile = navigation.NavigationItems.ElementAt(2).Should().BeOfType<VirtualFileNavigation<TestDocumentationFile>>().Subject;