more navigation interface refactorings

Mpdreamz · Mpdreamz · commit 612a4d48e689 · 2025-06-06T22:17:42.000+02:00
diff --git a/src/Elastic.ApiExplorer/Endpoints/ApiEndpoint.cs b/src/Elastic.ApiExplorer/Endpoints/ApiEndpoint.cs
@@ -11,19 +11,17 @@
 
 namespace Elastic.ApiExplorer.Endpoints;
 
-public record ApiEndpoint : IPageInformation, IPageRenderer<ApiRenderContext>
+public record ApiEndpoint : INavigationModel, IPageRenderer<ApiRenderContext>
 {
-	public ApiEndpoint(string route, IOpenApiPathItem openApiPath, LandingNavigationItem navigationRoot)
+	public ApiEndpoint(string route, IOpenApiPathItem openApiPath)
 	{
 		Route = route;
 		OpenApiPath = openApiPath;
-		NavigationRoot = navigationRoot;
 
 	}
 
 	public string Route { get; }
 	public IOpenApiPathItem OpenApiPath { get; }
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }
 
 	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, Cancel ctx = default)
 	{
@@ -63,7 +61,7 @@ public EndpointNavigationItem(int depth, string url, ApiEndpoint apiEndpoint, La
 
 	public IReadOnlyCollection<OperationNavigationItem> NavigationItems { get; set; } = [];
 
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 
-	public INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 }
diff --git a/src/Elastic.ApiExplorer/Landing/LandingNavigationItem.cs b/src/Elastic.ApiExplorer/Landing/LandingNavigationItem.cs
@@ -10,10 +10,8 @@
 
 namespace Elastic.ApiExplorer.Landing;
 
-public class ApiLanding(INodeNavigationItem<IPageInformation, INavigationItem> root) : IPageInformation, IPageRenderer<ApiRenderContext>
+public class ApiLanding : INavigationModel, IPageRenderer<ApiRenderContext>
 {
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; } = root;
-
 	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, Cancel ctx = default)
 	{
 		var viewModel = new LandingViewModel
@@ -31,11 +29,11 @@ public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context,
 
 public class LandingNavigationItem : INodeNavigationItem<ApiLanding, EndpointNavigationItem>
 {
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 	public string Id { get; }
 	public int Depth { get; }
 	public ApiLanding Index { get; }
-	public INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 	public IReadOnlyCollection<EndpointNavigationItem> NavigationItems { get; set; } = [];
 	public string Url { get; }
 
@@ -49,7 +47,7 @@ public LandingNavigationItem(string url)
 		NavigationRoot = this;
 		Id = ShortId.Create("root");
 
-		var landing = new ApiLanding(this);
+		var landing = new ApiLanding();
 		Url = url;
 
 		Index = landing;
diff --git a/src/Elastic.ApiExplorer/OpenApiGenerator.cs b/src/Elastic.ApiExplorer/OpenApiGenerator.cs
@@ -29,13 +29,13 @@ public static LandingNavigationItem CreateNavigation(OpenApiDocument openApiDocu
 		foreach (var path in openApiDocument.Paths)
 		{
 			var endpointUrl = $"{url}/{path.Key.Trim('/').Replace('/', '-').Replace("{", "").Replace("}", "")}";
-			var apiEndpoint = new ApiEndpoint(path.Key, path.Value, rootNavigation);
+			var apiEndpoint = new ApiEndpoint(path.Key, path.Value);
 			var endpointNavigationItem = new EndpointNavigationItem(1, endpointUrl, apiEndpoint, rootNavigation, rootNavigation);
 			var endpointNavigationItems = new List<OperationNavigationItem>();
 			foreach (var operation in path.Value.Operations)
 			{
 				var operationUrl = $"{endpointUrl}/{operation.Key.ToString().ToLowerInvariant()}";
-				var apiOperation = new ApiOperation(operation.Key, operation.Value, rootNavigation);
+				var apiOperation = new ApiOperation(operation.Key, operation.Value);
 				var navigation = new OperationNavigationItem(2, operationUrl, apiOperation, endpointNavigationItem, rootNavigation);
 				endpointNavigationItems.Add(navigation);
 			}
@@ -78,7 +78,7 @@ public async Task Generate(Cancel ctx = default)
 	}
 
 	private async Task<IFileInfo> Render<T>(T page, ApiRenderContext renderContext, Cancel ctx)
-		where T : IPageInformation, IPageRenderer<ApiRenderContext>
+		where T : INavigationModel, IPageRenderer<ApiRenderContext>
 	{
 		var outputFile = OutputFile(renderContext.CurrentNavigation);
 		if (!outputFile.Directory!.Exists)
diff --git a/src/Elastic.ApiExplorer/Operations/OperationNavigationItem.cs b/src/Elastic.ApiExplorer/Operations/OperationNavigationItem.cs
@@ -11,21 +11,9 @@
 
 namespace Elastic.ApiExplorer.Operations;
 
-public record ApiOperation : IPageInformation, IPageRenderer<ApiRenderContext>
+public record ApiOperation(OperationType OperationType, OpenApiOperation Operation) : INavigationModel, IPageRenderer<ApiRenderContext>
 {
-	public ApiOperation(OperationType operationType, OpenApiOperation operation, LandingNavigationItem navigationRoot)
-	{
-		OperationType = operationType;
-		Operation = operation;
-		NavigationRoot = navigationRoot;
-
-	}
-
-	public OperationType OperationType { get; }
-	public OpenApiOperation Operation { get; }
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }
-
-	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, CancellationToken ctx = default)
+	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, Cancel ctx = default)
 	{
 		var viewModel = new OperationViewModel
 		{
@@ -54,13 +42,13 @@ public OperationNavigationItem(int depth, string url, ApiOperation apiOperation,
 		NavigationTitle = $"{apiOperation.OperationType.ToString().ToLowerInvariant()} {apiOperation.Operation.OperationId}";
 	}
 
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 	public string Id { get; }
 	public int Depth { get; }
 	public ApiOperation Model { get; }
 	public string Url { get; }
 
 	public string NavigationTitle { get; }
 
-	public INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs b/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs
@@ -8,7 +8,7 @@ namespace Elastic.Documentation.Site.Navigation;
 
 public interface INavigationHtmlWriter
 {
-	Task<string> RenderNavigation(INodeNavigationItem<IPageInformation, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default);
+	Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default);
 
 	async Task<string> Render(NavigationViewModel model, Cancel ctx)
 	{
diff --git a/src/Elastic.Documentation.Site/Navigation/INavigationItem.cs b/src/Elastic.Documentation.Site/Navigation/INavigationItem.cs
@@ -4,29 +4,27 @@
 
 namespace Elastic.Documentation.Site.Navigation;
 
-public interface INavigationScope
-{
-	INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }
-}
+public interface INavigationModel;
 
-public interface INavigationItem : INavigationScope
+public interface INavigationItem
 {
 	string Url { get; }
 	string NavigationTitle { get; }
+	INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 
 	//TODO the setter smells
-	INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; }
+	INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 }
 
 public interface ILeafNavigationItem<out TModel> : INavigationItem
-	where TModel : IPageInformation
+	where TModel : INavigationModel
 {
 	TModel Model { get; }
 }
 
 public interface INodeNavigationItem<out TIndex, out TChildNavigation>
 	: INavigationItem
-	where TIndex : IPageInformation
+	where TIndex : INavigationModel
 	where TChildNavigation : INavigationItem
 {
 	int Depth { get; }
@@ -35,5 +33,3 @@ public interface INodeNavigationItem<out TIndex, out TChildNavigation>
 	IReadOnlyCollection<TChildNavigation> NavigationItems { get; }
 }
 
-public interface IPageInformation : INavigationScope;
-
diff --git a/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs b/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs
@@ -7,12 +7,12 @@
 
 namespace Elastic.Documentation.Site.Navigation;
 
-public class IsolatedBuildNavigationHtmlWriter(BuildContext context, INodeNavigationItem<IPageInformation, INavigationItem> siteRoot)
+public class IsolatedBuildNavigationHtmlWriter(BuildContext context, INodeNavigationItem<INavigationModel, INavigationItem> siteRoot)
 	: INavigationHtmlWriter
 {
 	private readonly ConcurrentDictionary<string, string> _renderedNavigationCache = [];
 
-	public async Task<string> RenderNavigation(INodeNavigationItem<IPageInformation, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)
+	public async Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)
 	{
 		var navigation = context.Configuration.Features.IsPrimaryNavEnabled
 			? currentRootNavigation
@@ -27,14 +27,14 @@ public async Task<string> RenderNavigation(INodeNavigationItem<IPageInformation,
 		return value;
 	}
 
-	private NavigationViewModel CreateNavigationModel(INodeNavigationItem<IPageInformation, INavigationItem> navigation) =>
+	private NavigationViewModel CreateNavigationModel(INodeNavigationItem<INavigationModel, INavigationItem> navigation) =>
 		new()
 		{
 			Title = navigation.NavigationTitle ?? "Docs",
 			TitleUrl = navigation.Url ?? context.UrlPathPrefix ?? "/",
 			Tree = navigation,
 			IsPrimaryNavEnabled = context.Configuration.Features.IsPrimaryNavEnabled,
 			IsGlobalAssemblyBuild = false,
-			TopLevelItems = siteRoot.NavigationItems.OfType<INodeNavigationItem<IPageInformation, INavigationItem>>().ToList()
+			TopLevelItems = siteRoot.NavigationItems.OfType<INodeNavigationItem<INavigationModel, INavigationItem>>().ToList()
 		};
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
@@ -8,7 +8,7 @@ public class NavigationTreeItem
 {
 	public required int Level { get; init; }
 	//public required MarkdownFile CurrentDocument { get; init; }
-	public required INodeNavigationItem<IPageInformation, INavigationItem> SubTree { get; init; }
+	public required INodeNavigationItem<INavigationModel, INavigationItem> SubTree { get; init; }
 	public required bool IsPrimaryNavEnabled { get; init; }
 	public required bool IsGlobalAssemblyBuild { get; init; }
 	public required string RootNavigationId { get; set; }
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
@@ -8,10 +8,10 @@ public class NavigationViewModel
 {
 	public required string Title { get; init; }
 	public required string TitleUrl { get; init; }
-	public required INodeNavigationItem<IPageInformation, INavigationItem> Tree { get; init; }
+	public required INodeNavigationItem<INavigationModel, INavigationItem> Tree { get; init; }
 	/// controls whether to split the navigation tree automatically
 	public required bool IsPrimaryNavEnabled { get; init; }
 	public required bool IsGlobalAssemblyBuild { get; init; }
 	//public required IEnumerable<GroupNavigationItem> TopLevelItems { get; init; }
-	public required IEnumerable<INodeNavigationItem<IPageInformation, INavigationItem>> TopLevelItems { get; init; }
+	public required IEnumerable<INodeNavigationItem<INavigationModel, INavigationItem>> TopLevelItems { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -36,7 +36,7 @@
 							if (item.Id == current?.Id) continue;
 							<li class="block">
 								<a
-									class="block py-2 px-4 hover:underline hover:text-black hover:bg-grey-10 active:bg-blue-elastic-70 active:text-white font-semibold @(item.Index.NavigationRoot.Id == Model.Tree.Id ? "text-blue-elastic" : "")"
+									class="block py-2 px-4 hover:underline hover:text-black hover:bg-grey-10 active:bg-blue-elastic-70 active:text-white font-semibold @(item.NavigationRoot.Id == Model.Tree.Id ? "text-blue-elastic" : "")"
 									href="@item.Url"
 									@Htmx.GetNavHxAttributes(false, "mouseover")>
 									@item.NavigationTitle
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml
@@ -5,20 +5,19 @@
 }
 @foreach (var item in Model.SubTree.NavigationItems)
 {
-	if (item is INodeNavigationItem<IPageInformation, INavigationItem> { NavigationItems.Count: 0, Index: not null } group)
+	if (item is INodeNavigationItem<INavigationModel, INavigationItem> { NavigationItems.Count: 0, Index: not null } group)
 	{
-		var f = group.Index;
 		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
 			<a
 				href="@group.Url"
-				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && f.NavigationRoot.Id == Model.RootNavigationId || true)
+				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && group.NavigationRoot.Id == Model.RootNavigationId || true)
 				class="sidebar-link group-[.current]/li:text-blue-elastic!"
 			>
 				@group.NavigationTitle
 			</a>
 		</li>
 	}
-	else if (item is INodeNavigationItem<IPageInformation, INavigationItem> folder)
+	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> folder)
 	{
 		var g = folder;
 		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4")">
@@ -63,13 +62,12 @@
 			}
 		</li>
 	}
-	else if (item is ILeafNavigationItem<IPageInformation> leaf && Model.SubTree.Url != leaf.Url)
+	else if (item is ILeafNavigationItem<INavigationModel> leaf && Model.SubTree.Url != leaf.Url)
 	{
-		var f = leaf.Model;
 		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
 			<a
 				href="@leaf.Url"
-				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && f.NavigationRoot.Id == Model.RootNavigationId || true)
+				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && leaf.NavigationRoot.Id == Model.RootNavigationId || true)
 				class="sidebar-link grow group-[.current]/li:text-blue-elastic!"
 			>
 				@leaf.NavigationTitle
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -22,7 +22,7 @@
 
 namespace Elastic.Markdown.IO;
 
-public record MarkdownFile : DocumentationFile, ITableOfContentsScope, IPageInformation
+public record MarkdownFile : DocumentationFile, ITableOfContentsScope, INavigationModel
 {
 	private string? _navigationTitle;
 
@@ -60,7 +60,7 @@ DocumentationSet set
 
 	public IDirectoryInfo ScopeDirectory { get; set; }
 
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; set; }
 
 	public Uri NavigationSource { get; set; }
 
diff --git a/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs b/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
@@ -15,8 +15,8 @@ namespace Elastic.Markdown.IO.Navigation;
 [DebuggerDisplay("Current: {Model.RelativePath}")]
 public record FileNavigationItem(MarkdownFile Model, DocumentationGroup Group) : ILeafNavigationItem<MarkdownFile>
 {
-	public INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; } = Group;
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; } = Group.NavigationRoot;
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = Group;
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = Group.NavigationRoot;
 	public string Url => Model.Url;
 	public string NavigationTitle => Model.NavigationTitle;
 }
@@ -98,7 +98,7 @@ public class DocumentationGroup : INodeNavigationItem<MarkdownFile, INavigationI
 
 	public string Id { get; }
 
-	public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; protected init; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; protected init; }
 
 	public Uri NavigationSource { get; set; }
 
@@ -119,7 +119,7 @@ public class DocumentationGroup : INodeNavigationItem<MarkdownFile, INavigationI
 
 	public int Depth { get; }
 
-	public INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 
 	public string FolderName { get; }
 
diff --git a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
@@ -39,8 +39,8 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 
 			if (link.Url?.StartsWith('/') == true)
 			{
-				var currentRootNavigation = link.GetData(nameof(MarkdownFile.NavigationRoot)) as INodeNavigationItem<IPageInformation, INavigationItem>;
-				var targetRootNavigation = link.GetData($"Target{nameof(MarkdownFile.NavigationRoot)}") as INodeNavigationItem<IPageInformation, INavigationItem>;
+				var currentRootNavigation = link.GetData(nameof(MarkdownFile.NavigationRoot)) as INodeNavigationItem<INavigationModel, INavigationItem>;
+				var targetRootNavigation = link.GetData($"Target{nameof(MarkdownFile.NavigationRoot)}") as INodeNavigationItem<INavigationModel, INavigationItem>;
 				var hasSameTopLevelGroup = !isCrossLink && (currentRootNavigation?.Id == targetRootNavigation?.Id);
 				_ = renderer.Write(" hx-get=\"");
 				_ = renderer.WriteEscapeUrl(url);
diff --git a/src/tooling/docs-assembler/Navigation/GlobalNavigation.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigation.cs
@@ -52,7 +52,7 @@ public GlobalNavigation(AssembleSources assembleSources, GlobalNavigationFile na
 	private void UpdateNavigationIndex(
 		HashSet<MarkdownFile> markdownFiles,
 		IReadOnlyCollection<INavigationItem> navigationItems,
-		INodeNavigationItem<IPageInformation, INavigationItem>? parent,
+		INodeNavigationItem<INavigationModel, INavigationItem>? parent,
 		ref int navigationIndex
 	)
 	{
diff --git a/src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -46,7 +46,7 @@ private bool TryGetNavigationRoot(
 		return true;
 	}
 
-	public async Task<string> RenderNavigation(INodeNavigationItem<IPageInformation, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)
+	public async Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)
 	{
 		if (!TryGetNavigationRoot(navigationSource, out var navigationRoot, out var navigationRootSource))
 			return string.Empty;

Original file line number	Diff line number	Diff line change
`@@ -11,19 +11,17 @@`
`11`	`11`
`12`	`12`	`namespace Elastic.ApiExplorer.Endpoints;`
`13`	`13`
`14`		`-public record ApiEndpoint : IPageInformation, IPageRenderer<ApiRenderContext>`
	`14`	`+public record ApiEndpoint : INavigationModel, IPageRenderer<ApiRenderContext>`
`15`	`15`	`{`
`16`		`- public ApiEndpoint(string route, IOpenApiPathItem openApiPath, LandingNavigationItem navigationRoot)`
	`16`	`+ public ApiEndpoint(string route, IOpenApiPathItem openApiPath)`
`17`	`17`	`{`
`18`	`18`	`Route = route;`
`19`	`19`	`OpenApiPath = openApiPath;`
`20`		`- NavigationRoot = navigationRoot;`
`21`	`20`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`public string Route { get; }`
`25`	`24`	`public IOpenApiPathItem OpenApiPath { get; }`
`26`		`- public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }`
`27`	`25`
`28`	`26`	`public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, Cancel ctx = default)`
`29`	`27`	`{`
`@@ -63,7 +61,7 @@ public EndpointNavigationItem(int depth, string url, ApiEndpoint apiEndpoint, La`
`63`	`61`
`64`	`62`	`public IReadOnlyCollection<OperationNavigationItem> NavigationItems { get; set; } = [];`
`65`	`63`
`66`		`- public INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }`
	`64`	`+ public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }`
`67`	`65`
`68`		`- public INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; }`
	`66`	`+ public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }`
`69`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@ public static LandingNavigationItem CreateNavigation(OpenApiDocument openApiDocu`
`29`	`29`	`foreach (var path in openApiDocument.Paths)`
`30`	`30`	`{`
`31`	`31`	`var endpointUrl = $"{url}/{path.Key.Trim('/').Replace('/', '-').Replace("{", "").Replace("}", "")}";`
`32`		`- var apiEndpoint = new ApiEndpoint(path.Key, path.Value, rootNavigation);`
	`32`	`+ var apiEndpoint = new ApiEndpoint(path.Key, path.Value);`
`33`	`33`	`var endpointNavigationItem = new EndpointNavigationItem(1, endpointUrl, apiEndpoint, rootNavigation, rootNavigation);`
`34`	`34`	`var endpointNavigationItems = new List<OperationNavigationItem>();`
`35`	`35`	`foreach (var operation in path.Value.Operations)`
`36`	`36`	`{`
`37`	`37`	`var operationUrl = $"{endpointUrl}/{operation.Key.ToString().ToLowerInvariant()}";`
`38`		`- var apiOperation = new ApiOperation(operation.Key, operation.Value, rootNavigation);`
	`38`	`+ var apiOperation = new ApiOperation(operation.Key, operation.Value);`
`39`	`39`	`var navigation = new OperationNavigationItem(2, operationUrl, apiOperation, endpointNavigationItem, rootNavigation);`
`40`	`40`	`endpointNavigationItems.Add(navigation);`
`41`	`41`	`}`
`@@ -78,7 +78,7 @@ public async Task Generate(Cancel ctx = default)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`private async Task<IFileInfo> Render<T>(T page, ApiRenderContext renderContext, Cancel ctx)`
`81`		`- where T : IPageInformation, IPageRenderer<ApiRenderContext>`
	`81`	`+ where T : INavigationModel, IPageRenderer<ApiRenderContext>`
`82`	`82`	`{`
`83`	`83`	`var outputFile = OutputFile(renderContext.CurrentNavigation);`
`84`	`84`	`if (!outputFile.Directory!.Exists)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Elastic.Documentation.Site.Navigation;`
`8`	`8`
`9`	`9`	`public interface INavigationHtmlWriter`
`10`	`10`	`{`
`11`		`- Task<string> RenderNavigation(INodeNavigationItem<IPageInformation, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default);`
	`11`	`+ Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default);`
`12`	`12`
`13`	`13`	`async Task<string> Render(NavigationViewModel model, Cancel ctx)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,29 +4,27 @@`
`4`	`4`
`5`	`5`	`namespace Elastic.Documentation.Site.Navigation;`
`6`	`6`
`7`		`-public interface INavigationScope`
`8`		`-{`
`9`		`- INodeNavigationItem<IPageInformation, INavigationItem> NavigationRoot { get; }`
`10`		`-}`
	`7`	`+public interface INavigationModel;`
`11`	`8`
`12`		`-public interface INavigationItem : INavigationScope`
	`9`	`+public interface INavigationItem`
`13`	`10`	`{`
`14`	`11`	`string Url { get; }`
`15`	`12`	`string NavigationTitle { get; }`
	`13`	`+ INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }`
`16`	`14`
`17`	`15`	`//TODO the setter smells`
`18`		`- INodeNavigationItem<IPageInformation, INavigationItem>? Parent { get; set; }`
	`16`	`+ INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }`
`19`	`17`	`}`
`20`	`18`
`21`	`19`	`public interface ILeafNavigationItem<out TModel> : INavigationItem`
`22`		`- where TModel : IPageInformation`
	`20`	`+ where TModel : INavigationModel`
`23`	`21`	`{`
`24`	`22`	`TModel Model { get; }`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`public interface INodeNavigationItem<out TIndex, out TChildNavigation>`
`28`	`26`	`: INavigationItem`
`29`		`- where TIndex : IPageInformation`
	`27`	`+ where TIndex : INavigationModel`
`30`	`28`	`where TChildNavigation : INavigationItem`
`31`	`29`	`{`
`32`	`30`	`int Depth { get; }`
`@@ -35,5 +33,3 @@ public interface INodeNavigationItem<out TIndex, out TChildNavigation>`
`35`	`33`	`IReadOnlyCollection<TChildNavigation> NavigationItems { get; }`
`36`	`34`	`}`
`37`	`35`
`38`		`-public interface IPageInformation : INavigationScope;`
`39`		`-`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@`
`7`	`7`
`8`	`8`	`namespace Elastic.Documentation.Site.Navigation;`
`9`	`9`
`10`		`-public class IsolatedBuildNavigationHtmlWriter(BuildContext context, INodeNavigationItem<IPageInformation, INavigationItem> siteRoot)`
	`10`	`+public class IsolatedBuildNavigationHtmlWriter(BuildContext context, INodeNavigationItem<INavigationModel, INavigationItem> siteRoot)`
`11`	`11`	`: INavigationHtmlWriter`
`12`	`12`	`{`
`13`	`13`	`private readonly ConcurrentDictionary<string, string> _renderedNavigationCache = [];`
`14`	`14`
`15`		`- public async Task<string> RenderNavigation(INodeNavigationItem<IPageInformation, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)`
	`15`	`+ public async Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)`
`16`	`16`	`{`
`17`	`17`	`var navigation = context.Configuration.Features.IsPrimaryNavEnabled`
`18`	`18`	`? currentRootNavigation`
`@@ -27,14 +27,14 @@ public async Task<string> RenderNavigation(INodeNavigationItem<IPageInformation,`
`27`	`27`	`return value;`
`28`	`28`	`}`
`29`	`29`
`30`		`- private NavigationViewModel CreateNavigationModel(INodeNavigationItem<IPageInformation, INavigationItem> navigation) =>`
	`30`	`+ private NavigationViewModel CreateNavigationModel(INodeNavigationItem<INavigationModel, INavigationItem> navigation) =>`
`31`	`31`	`new()`
`32`	`32`	`{`
`33`	`33`	`Title = navigation.NavigationTitle ?? "Docs",`
`34`	`34`	`TitleUrl = navigation.Url ?? context.UrlPathPrefix ?? "/",`
`35`	`35`	`Tree = navigation,`
`36`	`36`	`IsPrimaryNavEnabled = context.Configuration.Features.IsPrimaryNavEnabled,`
`37`	`37`	`IsGlobalAssemblyBuild = false,`
`38`		`- TopLevelItems = siteRoot.NavigationItems.OfType<INodeNavigationItem<IPageInformation, INavigationItem>>().ToList()`
	`38`	`+ TopLevelItems = siteRoot.NavigationItems.OfType<INodeNavigationItem<INavigationModel, INavigationItem>>().ToList()`
`39`	`39`	`};`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class NavigationTreeItem`
`8`	`8`	`{`
`9`	`9`	`public required int Level { get; init; }`
`10`	`10`	`//public required MarkdownFile CurrentDocument { get; init; }`
`11`		`- public required INodeNavigationItem<IPageInformation, INavigationItem> SubTree { get; init; }`
	`11`	`+ public required INodeNavigationItem<INavigationModel, INavigationItem> SubTree { get; init; }`
`12`	`12`	`public required bool IsPrimaryNavEnabled { get; init; }`
`13`	`13`	`public required bool IsGlobalAssemblyBuild { get; init; }`
`14`	`14`	`public required string RootNavigationId { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ public class NavigationViewModel`
`8`	`8`	`{`
`9`	`9`	`public required string Title { get; init; }`
`10`	`10`	`public required string TitleUrl { get; init; }`
`11`		`- public required INodeNavigationItem<IPageInformation, INavigationItem> Tree { get; init; }`
	`11`	`+ public required INodeNavigationItem<INavigationModel, INavigationItem> Tree { get; init; }`
`12`	`12`	`/// controls whether to split the navigation tree automatically`
`13`	`13`	`public required bool IsPrimaryNavEnabled { get; init; }`
`14`	`14`	`public required bool IsGlobalAssemblyBuild { get; init; }`
`15`	`15`	`//public required IEnumerable<GroupNavigationItem> TopLevelItems { get; init; }`
`16`		`- public required IEnumerable<INodeNavigationItem<IPageInformation, INavigationItem>> TopLevelItems { get; init; }`
	`16`	`+ public required IEnumerable<INodeNavigationItem<INavigationModel, INavigationItem>> TopLevelItems { get; init; }`
`17`	`17`	`}`