update url logic to be relative conditionally

Author: Mpdreamz

src/Elastic.Documentation.Configuration/DocSet/DocumentationSetFile.cs

@@ -128,7 +128,11 @@ public record SiteTableOfContentsRef(Uri Source, string PathPrefix, IReadOnlyCol
 	: ITableOfContentsItem
 {
 	// For site-level TOC refs, the Path is the path prefix (where it will be mounted in the site)
-	public string Path => PathPrefix;
+	public string PathRelativeToDocumentationSet => PathPrefix;
+
+	// For site-level TOC refs, PathRelativeToContainer is the same as PathRelativeToDocumentationSet
+	// since they're all defined in the same navigation.yml file
+	public string PathRelativeToContainer => PathPrefix;
 
 	// For site-level TOC refs, the Context is the navigation.yml file path
 	// This will be set during site navigation loading

src/Elastic.Documentation.Configuration/DocSet/SiteNavigationFile.cs

@@ -18,14 +18,14 @@ public record RuleOverviewReference : FileRef
 	private string TocContext { get; }
 
 	public RuleOverviewReference(
-		string overviewFilePath,
+		string overviewFilePathRelativeToDocumentationSet,
 		string parentPath,
 		ConfigurationFile configuration,
 		IDocumentationSetContext context,
 		IReadOnlyCollection<string> detectionRuleFolders,
 		string tocContext
 	)
-		: base(overviewFilePath, false, [], tocContext)
+		: base(overviewFilePathRelativeToDocumentationSet, overviewFilePathRelativeToDocumentationSet, false, [], tocContext)
 	{
 		ParentPath = parentPath;
 		TocContext = tocContext;
@@ -70,7 +70,7 @@ private IReadOnlyCollection<ITableOfContentsItem> ReadDetectionRuleFolder(IDocum
 					return new RuleReference(relativePath, detectionRuleFolder, true, [], rule, TocContext);
 				}
 
-				return new FileRef(relativePath, false, [], TocContext);
+				return new FileRef(relativePath, relativePath, false, [], TocContext);
 			})
 			.ToArray();
 

src/Elastic.Documentation.Configuration/Plugins/DetectionRules/TableOfContents/DetectionRulesReference.cs

@@ -7,11 +7,11 @@
 namespace Elastic.Documentation.Configuration.Plugins.DetectionRules.TableOfContents;
 
 public record RuleReference(
-	string RelativePath,
+	string RelativePathRelativeToDocumentationSet,
 	string SourceDirectory,
 	bool Found,
 	IReadOnlyCollection<ITableOfContentsItem> Children,
 	DetectionRule Rule,
 	string Context
 )
-	: FileRef(RelativePath, true, Children, Context);
+	: FileRef(RelativePathRelativeToDocumentationSet, RelativePathRelativeToDocumentationSet, true, Children, Context);

src/Elastic.Documentation.Configuration/Plugins/DetectionRules/TableOfContents/RuleReference.cs

@@ -236,7 +236,7 @@ INavigationHomeAccessor homeAccessor
 	)
 	{
 		// FileRef.Path already contains the correct path from LoadAndResolve
-		var fullPath = fileRef.Path;
+		var fullPath = fileRef.PathRelativeToDocumentationSet;
 
 		// Create file info and documentation file
 		var fileInfo = ResolveFileInfo(context, fullPath);
@@ -247,13 +247,14 @@ INavigationHomeAccessor homeAccessor
 		// Handle leaf case (no children)
 		if (fileRef.Children.Count <= 0)
 		{
-			var leafNavigationArgs = new FileNavigationArgs(fullPath, fileRef.Hidden, index, parent, homeAccessor);
+			var leafNavigationArgs = new FileNavigationArgs(fullPath, fileRef.PathRelativeToContainer, fileRef.Hidden, index, parent, homeAccessor);
 			return DocumentationNavigationFactory.CreateFileNavigationLeaf(documentationFile, fileInfo, leafNavigationArgs);
 		}
 
 		// Create file navigation with empty children initially
 		var virtualFileNavigationArgs = new VirtualFileNavigationArgs(
 			fullPath,
+			fileRef.PathRelativeToContainer,
 			fileRef.Hidden,
 			index,
 			parent?.Depth + 1 ?? 0,
@@ -324,7 +325,7 @@ int depth
 	)
 	{
 		// FolderRef.Path already contains the correct path from LoadAndResolve
-		var folderPath = folderRef.Path;
+		var folderPath = folderRef.PathRelativeToDocumentationSet;
 
 		// Create folder navigation with null parent initially - we'll pass it to children but set it properly after
 		var folderNavigation = new FolderNavigation(depth + 1, folderPath, parent, homeAccessor, [])
@@ -372,7 +373,7 @@ int depth
 	)
 	{
 		// tocRef.Path is now the FULL path (e.g., "guides/api" or "setup/advanced") after LoadAndResolve
-		var fullTocPath = tocRef.Path;
+		var fullTocPath = tocRef.PathRelativeToDocumentationSet;
 
 		var tocDirectory = context.ReadFileSystem.DirectoryInfo.New(
 			context.ReadFileSystem.Path.Combine(context.DocumentationSourceDirectory.FullName, fullTocPath)

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

@@ -4,6 +4,7 @@
 
 using System.Diagnostics;
 using System.IO.Abstractions;
+using Elastic.Documentation.Navigation.Assembler;
 
 namespace Elastic.Documentation.Navigation.Isolated;
 
@@ -31,8 +32,10 @@ public string Url
 		get
 		{
 			var rootUrl = args.HomeAccessor.HomeProvider.PathPrefix.TrimEnd('/');
+			var relativeToContainer = args.HomeAccessor.HomeProvider.NavigationRoot.Parent is SiteNavigation;
+
 			// Remove extension while preserving the directory path
-			var relativePath = args.RelativePathToDocumentationSet;
+			var relativePath = relativeToContainer ? args.RelativePathToTableOfContents : args.RelativePathToDocumentationSet;
 			var path = relativePath.EndsWith(".md", StringComparison.OrdinalIgnoreCase)
 				? relativePath[..^3]  // Remove last 3 characters (.md)
 				: relativePath;

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

@@ -53,7 +53,7 @@ public class VirtualFileNavigation<TModel>(TModel model, IFileInfo fileInfo, Vir
 
 	/// <inheritdoc />
 	public ILeafNavigationItem<TModel> Index { get; } =
-		new FileNavigationLeaf<TModel>(model, fileInfo, new FileNavigationArgs(args.RelativePathToDocumentationSet, args.RelativePathToDocumentationSet, args.Hidden, args.NavigationIndex, args.Parent, args.HomeAccessor));
+		new FileNavigationLeaf<TModel>(model, fileInfo, new FileNavigationArgs(args.RelativePathToDocumentationSet, args.RelativePathToTableOfContents, args.Hidden, args.NavigationIndex, args.Parent, args.HomeAccessor));
 
 	public IReadOnlyCollection<INavigationItem> NavigationItems { get; private set; } = [];
 

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

@@ -23,7 +23,7 @@ public DetectionRuleOverviewFile(IFileInfo sourceFile, IDirectoryInfo rootPath,
 
 	private Dictionary<string, DetectionRuleFile> Files { get; } = [];
 
-	public void AddDetectionRuleFile(DetectionRuleFile df, RuleReference ruleReference) => Files[ruleReference.RelativePath] = df;
+	public void AddDetectionRuleFile(DetectionRuleFile df, RuleReference ruleReference) => Files[ruleReference.RelativePathRelativeToDocumentationSet] = df;
 
 	protected override Task<MarkdownDocument> GetMinimalParseDocumentAsync(Cancel ctx)
 	{

src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs

@@ -71,7 +71,7 @@ Func<IFileInfo, IDirectoryInfo, DocumentationFile> defaultFileHandling
 		var sourceDirectory = Build.ReadFileSystem.DirectoryInfo.New(sourcePath);
 		return rules.Select(r =>
 		{
-			var file = Build.ReadFileSystem.FileInfo.New(Path.Combine(sourceDirectory.FullName, r.RelativePath));
+			var file = Build.ReadFileSystem.FileInfo.New(Path.Combine(sourceDirectory.FullName, r.RelativePathRelativeToDocumentationSet));
 			return (file, defaultFileHandling(file, sourceDirectory));
 
 		}).ToArray();