Cleanup

Author: reakaleek

src/Elastic.Markdown/HtmlWriter.cs

@@ -114,7 +114,8 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 			fullNavigationRenderResult
 		);
 
-		var breadcrumbsList = CreateStructuredBreadcrumbsData(markdown, parents);
+		var breadcrumbs = parents.Reverse().DistinctBy(p => p.Url).ToArray();
+		var breadcrumbsList = CreateStructuredBreadcrumbsData(markdown, breadcrumbs);
 		var structuredBreadcrumbsJsonString = JsonSerializer.Serialize(breadcrumbsList, BreadcrumbsContext.Default.BreadcrumbsList);
 
 
@@ -128,12 +129,11 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 			TitleRaw = markdown.TitleRaw ?? "[TITLE NOT SET]",
 			MarkdownHtml = html,
 			PageTocItems = [.. markdown.PageTableOfContent.Values],
-			Tree = DocumentationSet.Tree,
 			CurrentDocument = markdown,
 			CurrentNavigationItem = current,
 			PreviousDocument = previous,
 			NextDocument = next,
-			Parents = parents,
+			Breadcrumbs = breadcrumbs,
 			NavigationHtml = navigationHtmlRenderResult.Html,
 			NavigationFileName = navigationFileName,
 			UrlPathPrefix = markdown.UrlPathPrefix,
@@ -164,11 +164,10 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 
 	}
 
-	private BreadcrumbsList CreateStructuredBreadcrumbsData(MarkdownFile markdown, INavigationItem[] parents)
+	private BreadcrumbsList CreateStructuredBreadcrumbsData(MarkdownFile markdown, INavigationItem[] crumbs)
 	{
 		List<BreadcrumbListItem> breadcrumbItems = [];
 		var position = 1;
-		var crumbs = parents.Reverse().DistinctBy(i => i.Url).ToList();
 		// Add parents
 		breadcrumbItems.AddRange(crumbs.Select(parent => new BreadcrumbListItem
 		{

src/Elastic.Markdown/Layout/_Breadcrumbs.cshtml

@@ -2,11 +2,11 @@
 @{
 	var targets =
 		Model.Features.PrimaryNavEnabled
-			? Model.Parents.Reverse()
-			: Model.Parents.Reverse().Skip(1);
+			? Model.Breadcrumbs
+			: Model.Breadcrumbs.Skip(1);
 
 	//TODO should we even distinctby
-	var crumbs = targets.DistinctBy(p => p.Url).ToList();
+	var crumbs = targets.ToList();
 }
 
 <ol id="breadcrumbs" class="flex flex-wrap gap-1 items-center w-full py-6">

src/Elastic.Markdown/MarkdownLayoutViewModel.cs

@@ -17,9 +17,7 @@ public record MarkdownLayoutViewModel : GlobalLayoutViewModel
 	public required bool HideEditThisPage { get; init; }
 	public required string? ReportIssueUrl { get; init; }
 
-	public required INavigationItem[] Parents { get; init; }
-
-	public required LegacyPageMapping[]? LegacyPages { get; init; }
+	public required INavigationItem[] Breadcrumbs { get; init; }
 
 	public required IReadOnlyCollection<PageTocItem> PageTocItems { get; init; }
 

src/Elastic.Markdown/Page/Index.cshtml

@@ -24,7 +24,6 @@
 		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = Model.PreviousDocument,
 		Next = Model.NextDocument,
-		Parents = Model.Parents,
 		NavigationHtml = Model.NavigationHtml,
 		NavigationFileName = Model.NavigationFileName,
 		UrlPathPrefix = Model.UrlPathPrefix,
@@ -37,7 +36,7 @@
 		Features = Model.Features,
 		StaticFileContentHashProvider = Model.StaticFileContentHashProvider,
 		ReportIssueUrl = Model.ReportIssueUrl,
-		LegacyPages = Model.LegacyPages,
+		Breadcrumbs = Model.Breadcrumbs,
 		CurrentVersion = Model.CurrentDocument.YamlFrontMatter?.Layout == MarkdownPageLayout.LandingPage ? Model.VersionsConfig.VersioningSystems[0].Current : Model.CurrentVersion,
 		AllVersionsUrl = Model.AllVersionsUrl,
 		VersionDropdownSerializedModel = JsonSerializer.Serialize(Model.VersionDropdownItems,

src/Elastic.Markdown/Page/IndexViewModel.cs

@@ -24,14 +24,13 @@ public class IndexViewModel
 	public required string Description { get; init; }
 	public required string TitleRaw { get; init; }
 	public required string MarkdownHtml { get; init; }
-	public required DocumentationGroup Tree { get; init; }
 	public required IReadOnlyCollection<PageTocItem> PageTocItems { get; init; }
 	public required MarkdownFile CurrentDocument { get; init; }
 
 	public required INavigationItem CurrentNavigationItem { get; init; }
 	public required INavigationItem? PreviousDocument { get; init; }
 	public required INavigationItem? NextDocument { get; init; }
-	public required INavigationItem[] Parents { get; init; }
+	public required INavigationItem[] Breadcrumbs { get; init; }
 
 	public required string NavigationHtml { get; init; }