Revert "Refactor markdown and layout rendering by decoupling from `GlobalLayo…" (#1356)

This reverts commit 8df9149.

Author: reakaleek

src/Elastic.ApiExplorer/Endpoints/ApiEndpoint.cs

@@ -58,13 +58,10 @@ public EndpointNavigationItem(int depth, string url, ApiEndpoint apiEndpoint, La
 	public ApiEndpoint Index { get; }
 	public string Url { get; }
 	public string NavigationTitle { get; }
-	public bool Hidden => false;
 
 	public IReadOnlyCollection<OperationNavigationItem> NavigationItems { get; set; } = [];
 
 	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 
 	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
-
-	public int NavigationIndex { get; set; }
 }

src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml

@@ -7,15 +7,24 @@
 	{
 		DocSetName = "Api Explorer",
 		Description = "",
+		Layout = null,
+		PageTocItems = [],
 		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = null,
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
+		LegacyPage = null,
 		UrlPathPrefix = null,
+		GithubEditUrl = null,
+		ReportIssueUrl = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),
 		Features = new FeatureFlags([]),
+		Parents =
+		[
+		],
+		Products = null,
 		StaticFileContentHashProvider = Model.StaticFileContentHashProvider
 	};
 }

src/Elastic.ApiExplorer/Landing/LandingNavigationItem.cs

@@ -34,10 +34,8 @@ public class LandingNavigationItem : INodeNavigationItem<ApiLanding, EndpointNav
 	public int Depth { get; }
 	public ApiLanding Index { get; }
 	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
-	public int NavigationIndex { get; set; }
 	public IReadOnlyCollection<EndpointNavigationItem> NavigationItems { get; set; } = [];
 	public string Url { get; }
-	public bool Hidden => false;
 
 	//TODO
 	public string NavigationTitle { get; } = "API Documentation";

src/Elastic.ApiExplorer/Landing/LandingView.cshtml

@@ -7,15 +7,24 @@
 	{
 		DocSetName = "Api Explorer",
 		Description = "",
+		Layout = null,
+		PageTocItems = [],
 		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = null,
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
+		LegacyPage = null,
 		UrlPathPrefix = null,
+		GithubEditUrl = null,
+		ReportIssueUrl = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),
 		Features = new FeatureFlags([]),
+		Parents =
+		[
+		],
+		Products = null,
 		StaticFileContentHashProvider = Model.StaticFileContentHashProvider
 	};
 }

src/Elastic.ApiExplorer/Operations/OperationNavigationItem.cs

@@ -47,12 +47,8 @@ public OperationNavigationItem(int depth, string url, ApiOperation apiOperation,
 	public int Depth { get; }
 	public ApiOperation Model { get; }
 	public string Url { get; }
-	public bool Hidden => false;
 
 	public string NavigationTitle { get; }
 
 	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
-
-	public int NavigationIndex { get; set; }
-
 }

src/Elastic.ApiExplorer/Operations/OperationView.cshtml

@@ -7,15 +7,24 @@
 	{
 		DocSetName = "Api Explorer",
 		Description = "",
+		Layout = null,
+		PageTocItems = [],
 		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = null,
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
+		LegacyPage = null,
 		UrlPathPrefix = null,
+		GithubEditUrl = null,
+		ReportIssueUrl = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),
 		Features = new FeatureFlags([]),
+		Parents =
+		[
+		],
+		Products = null,
 		StaticFileContentHashProvider = Model.StaticFileContentHashProvider
 	};
 }

src/Elastic.Documentation.Configuration/TableOfContents/ITocItem.cs

@@ -22,20 +22,4 @@ public record TocReference(Uri Source, ITableOfContentsScope TableOfContentsScop
 {
 	public IReadOnlyDictionary<Uri, TocReference> TocReferences { get; } =
 		Children.OfType<TocReference>().ToDictionary(kv => kv.Source, kv => kv);
-
-	/// <summary>
-	/// A phantom table of contents is a table of contents that is not rendered in the UI but is used to generate the TOC.
-	/// This should be used sparingly and needs explicit configuration in navigation.yml.
-	/// It's typically used for container TOC that holds various other TOC's where its children are rehomed throughout the navigation.
-	/// <para>Examples of phantom toc's:</para>
-	/// <list type="">
-	///		<item> - toc: elasticsearch://reference</item>
-	///		<item> - toc: docs-content://</item>
-	/// </list>
-	/// <para>Because navigation.yml does exhaustive checks to ensure all toc.yml files are referenced, marking these containers as phantoms
-	/// ensures that these skip validation checks
-	/// </para>
-	/// </summary>
-	public bool IsPhantom { get; init; }
 }
-

src/Elastic.Markdown/Slices/Layout/_Archive.cshtml renamed to src/Elastic.Documentation.Site/Layout/_Archive.cshtml

@@ -1,4 +1,4 @@
-@inherits RazorSlice<MarkdownLayoutViewModel>
+@inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 <div class="bg-[#F5F7FA] w-full px-8 py-16 text-center">
 	<div class="container mx-auto mt-20">
 		<h1 class="text-4xl md:text-6xl">Archive</h1>

src/Elastic.Documentation.Site/Layout/_Head.cshtml

@@ -1,5 +1,6 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 @using FontPreloader = Elastic.Documentation.Site.FileProviders.FontPreloader
+<head hx-head="merge">
 	<meta charset="utf-8">
 	<title>@Model.Title</title>
 	<meta name="description" content="@Model.Description">
@@ -34,3 +35,9 @@
 	{
 		<meta property="og:url" content="@Model.CanonicalUrl" />
 	}
+	@if (!string.IsNullOrEmpty(Model.Products))
+	{	
+		<meta class="elastic" name="product_name" content="@(Model.Products)"/>
+		<meta name="DC.subject" content="@(Model.Products)"/>
+	}
+</head>

src/Elastic.Markdown/Slices/Layout/_LandingPage.cshtml renamed to src/Elastic.Documentation.Site/Layout/_LandingPage.cshtml

@@ -1,4 +1,4 @@
-@inherits RazorSlice<MarkdownLayoutViewModel>
+@inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 <div class="w-full text-ink relative text-pretty">
 	<div class="w-full absolute top-0 left-0 right-0 htmx-indicator" id="htmx-indicator" role="status">
 		<div class="h-[2px] w-full overflow-hidden">