Fix merge conflicts

Author: reakaleek

src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml

@@ -12,6 +12,7 @@
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
 		UrlPathPrefix = null,
+		VersionDropdown = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),

src/Elastic.ApiExplorer/Landing/LandingView.cshtml

@@ -12,6 +12,7 @@
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
 		UrlPathPrefix = null,
+		VersionDropdown = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),

src/Elastic.ApiExplorer/Operations/OperationView.cshtml

@@ -12,6 +12,7 @@
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
 		UrlPathPrefix = null,
+		VersionDropdown = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),

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

@@ -14,7 +14,7 @@
 			}
 			<a href="@Model.Link("/")" class="text-lg leading-[1em] hover:text-blue-elastic active:text-blue-elastic-100">Docs</a>
 
-			@if (Model.Features.IsVersionDropdownEnabled)
+			@if (Model.Features.IsVersionDropdownEnabled && Model.VersionDropdown is not null)
 			{
 				<div id="version-dropdown">
 					<version-dropdown items='@(new HtmlString(Model.VersionDropdown))' />

src/Elastic.Documentation.Site/_ViewModels.cs

@@ -25,14 +25,15 @@ public class GlobalLayoutViewModel
 	public required INavigationItem? Previous { get; init; }
 	public required INavigationItem? Next { get; init; }
 
+	public required string? VersionDropdown { get; init; }
+
 	public required string NavigationHtml { get; init; }
 	public required string? UrlPathPrefix { get; init; }
 	public required Uri? CanonicalBaseUrl { get; init; }
 	public string? CanonicalUrl => CanonicalBaseUrl is not null ?
 		new Uri(CanonicalBaseUrl, CurrentNavigationItem?.Url).ToString().TrimEnd('/') : null;
 
 	public required FeatureFlags Features { get; init; }
-
 	// TODO move to @inject
 	public required GoogleTagManagerConfiguration GoogleTagManager { get; init; }
 	public required bool AllowIndexing { get; init; }

src/Elastic.Documentation/Legacy/ILegacyUrlMapper.cs

@@ -16,5 +16,5 @@ public interface ILegacyUrlMapper
 
 public record NoopLegacyUrlMapper : ILegacyUrlMapper
 {
-	public List<LegacyPageMapping> MapLegacyUrl(IReadOnlyCollection<string>? mappedPages) => [];
+	public IReadOnlyCollection<LegacyPageMapping> MapLegacyUrl(IReadOnlyCollection<string>? mappedPages) => [];
 }

src/Elastic.Markdown/Slices/HtmlWriter.cs

@@ -110,8 +110,8 @@ private async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument
 			Features = DocumentationSet.Configuration.Features,
 			StaticFileContentHashProvider = StaticFileContentHashProvider,
 			ReportIssueUrl = reportUrl,
-			CurrentVersion = legacyPages.Count > 0 ? legacyPages[0].Version : "9.0+",
-			LegacyPages = legacyPages.Count > 1 ? [legacyPages[1]] : [],
+			CurrentVersion = legacyPages.Count > 0 ? legacyPages.ElementAt(0).Version : "9.0+",
+			LegacyPages = legacyPages.Count > 1 ? [legacyPages.ElementAt(1)] : [],
 			VersionDropdownItems = VersionDrownDownItemViewModel.FromLegacyPageMappings(legacyPages.Skip(1).ToArray()),
 			Products = allProducts
 		});

src/Elastic.Markdown/Slices/Index.cshtml

@@ -11,7 +11,11 @@
 		DocSetName = Model.DocSetName,
 		Title = $"{Model.Title} | {Model.SiteName}",
 		Description = Model.Description,
-		PageTocItems = Model.PageTocItems.Where(i => i is { Level: 2 or 3 }).ToList(),
+		PageTocItems = Model.PageTocItems.Where(i => i is
+			{
+				Level: 2 or 3
+			})
+			.ToList(),
 		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = Model.PreviousDocument,
 		Next = Model.NextDocument,
@@ -27,8 +31,8 @@
 		ReportIssueUrl = Model.ReportIssueUrl,
 		LegacyPages = Model.LegacyPages,
 		CurrentVersion = Model.CurrentVersion,
-		VersionDropdown = JsonSerializer.Serialize(Model.VersionDropdownItems, ViewModelSerializerContext.Default.VersionDrownDownItemViewModelArray),
-		Products = Model.Products is { Count: > 0} products ? string.Join(",", products.Select(p => p.DisplayName)) : null,
+		VersionDropdown = JsonSerializer.Serialize(Model.VersionDropdownItems,
+			ViewModelSerializerContext.Default.VersionDrownDownItemViewModelArray),
 	};
 	protected override Task ExecuteSectionAsync(string name)
 	{

src/Elastic.Markdown/Slices/MarkdownLayoutViewModel.cs

@@ -16,7 +16,9 @@ public class MarkdownLayoutViewModel : GlobalLayoutViewModel
 
 	public required INavigationItem[] Parents { get; init; }
 
-	public required LegacyPageMapping? LegacyPage { get; init; }
+	public required string? CurrentVersion { get; init; }
+
+	public required LegacyPageMapping[] LegacyPages { get; init; }
 
 	public required IReadOnlyCollection<PageTocItem> PageTocItems { get; init; }
 
@@ -29,4 +31,3 @@ public record PageTocItem
 	public required string Slug { get; init; }
 	public required int Level { get; init; }
 }
-

src/tooling/docs-assembler/AssembleSources.cs

@@ -109,9 +109,9 @@ private AssembleSources(ILoggerFactory logger, AssembleContext assembleContext,
 			.ToFrozenDictionary();
 	}
 
-	private static FrozenDictionary<string, List<string>> GetHistoryMapping(AssembleContext context)
+	private static FrozenDictionary<string, IReadOnlyCollection<string>> GetHistoryMapping(AssembleContext context)
 	{
-		var dictionary = new Dictionary<string, List<string>>();
+		var dictionary = new Dictionary<string, IReadOnlyCollection<string>>();
 		var reader = new YamlStreamReader(context.HistoryMappingPath, context.Collector);
 		string? stack = null;
 		foreach (var entry in reader.Read())
@@ -126,7 +126,7 @@ private static FrozenDictionary<string, List<string>> GetHistoryMapping(Assemble
 
 		return dictionary.OrderByDescending(x => x.Key.Length).ToFrozenDictionary();
 
-		static void ReadHistoryMappings(IDictionary<string, List<string>> dictionary, YamlStreamReader reader, YamlToplevelKey entry, string? newStack)
+		static void ReadHistoryMappings(IDictionary<string, IReadOnlyCollection<string>> dictionary, YamlStreamReader reader, YamlToplevelKey entry, string? newStack)
 		{
 			if (entry.Entry.Value is not YamlMappingNode mappings)
 			{