Merge branch 'main' into feature/disable-edit-gh-link-2

Author: reakaleek

config/legacy-url-mappings.yml

@@ -4,7 +4,7 @@
 # TODO: Refactor the model, for now we just use the first element as current version
 #############################################
 
-stack: &stack [ '9.0+', '8.18', '8.17', '8.16', '8.15', '8.14', '8.13', '8.12', '8.11', '8.10', '8.9', '8.8', '8.7', '8.6', '8.5', '8.4', '8.3', '8.2', '8.1', '8.0', '7.17' ]
+stack: &stack [ '9.0+', '8.19', '8.18', '8.17', '8.16', '8.15', '8.14', '8.13', '8.12', '8.11', '8.10', '8.9', '8.8', '8.7', '8.6', '8.5', '8.4', '8.3', '8.2', '8.1', '8.0', '7.17' ]
 
 mappings:
   en/apm/agent/android/: [ '1.0.0' , '0.x' ]
@@ -32,7 +32,7 @@ mappings:
   en/beats/topbeat/: *stack
   en/beats/winlogbeat/: *stack
   en/cloud-heroku/: []
-  en/cloud-on-k8s/: [ '3.0.0', '2.16', '2.15', '2.14', '2.13', '2.12', '2.11', '2.10', '2.9', '2.8', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
+  en/cloud-on-k8s/: [ '3.0+', '2.16', '2.15', '2.14', '2.13', '2.12', '2.11', '2.10', '2.9', '2.8', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
   en/cloud/: []
   en/cloud-enterprise/: [ '4.0', '3.8', '3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0', '2.13', '2.12', '2.11', '2.10', '2.9', '2.8', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.1', '1.0' ]
   en/ecctl/: [ '1.14+', '1.13', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]

config/versions.yml

@@ -19,7 +19,7 @@ versioning_systems:
   ech: *all
   eck:
     base: 3.0
-    current: 3.0.0
+    current: 3.1.0
   ess: *all
   self: *stack
   ecctl:
@@ -82,7 +82,7 @@ versioning_systems:
     current: 1.5.0
   edot_node:
     base: 1.0
-    current: 1.1.1
+    current: 1.2.0
   edot_php:
     base: 1.0
     current: 1.1.1

src/Elastic.Documentation.LegacyDocs/legacy-pages.bloom.bin

@@ -68,6 +68,8 @@ public class ImageBlock(DirectiveBlockParser parser, ParserContext context)
 
 	public string? Label { get; private set; }
 
+	private static readonly HashSet<string> AllowedUriHosts = ["epr.elastic.co"];
+
 	public override void FinalizeAndValidate(ParserContext context)
 	{
 		Label = Prop("label", "name");
@@ -98,7 +100,9 @@ private void ExtractImageUrl(ParserContext context)
 
 		if (Uri.TryCreate(imageUrl, UriKind.Absolute, out var uri) && uri.Scheme.StartsWith("http"))
 		{
-			this.EmitWarning($"{Directive} is using an external URI: {uri} ");
+			if (!AllowedUriHosts.Contains(uri.Host))
+				this.EmitWarning($"{Directive} is using an external URI: {uri} ");
+
 			Found = true;
 			ImageUrl = imageUrl;
 			return;

src/Elastic.Markdown/Myst/Directives/Image/ImageBlock.cs

@@ -169,7 +169,7 @@ public async Task<int> BuildAll(
 		var navigation = new GlobalNavigation(assembleSources, navigationFile);
 
 		var pathProvider = new GlobalNavigationPathProvider(navigationFile, assembleSources, assembleContext);
-		var htmlWriter = new GlobalNavigationHtmlWriter(logFactory, navigation);
+		var htmlWriter = new GlobalNavigationHtmlWriter(logFactory, navigation, collector);
 		var legacyPageChecker = new LegacyPageChecker();
 		var historyMapper = new PageLegacyUrlMapper(legacyPageChecker, assembleSources.HistoryMappings);
 

src/tooling/docs-assembler/Cli/RepositoryCommands.cs

@@ -47,7 +47,7 @@ public GlobalNavigation(AssembleSources assembleSources, GlobalNavigationFile na
 
 		var navigationIndex = 0;
 		var allNavigationItems = new HashSet<INavigationItem>();
-		UpdateParent(allNavigationItems, NavigationItems, null);
+		UpdateParent(allNavigationItems, NavigationItems, null, null);
 		UpdateNavigationIndex(NavigationItems, ref navigationIndex);
 		TopLevelItems = NavigationItems.OfType<TableOfContentsTree>().Where(t => !t.Hidden).ToList();
 		NavigationLookup = TopLevelItems.ToDictionary(kv => kv.Source, kv => kv);
@@ -64,23 +64,30 @@ public GlobalNavigation(AssembleSources assembleSources, GlobalNavigationFile na
 	private void UpdateParent(
 		HashSet<INavigationItem> allNavigationItems,
 		IReadOnlyCollection<INavigationItem> navigationItems,
-		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+		INodeNavigationItem<INavigationModel, INavigationItem>? parent,
+		IRootNavigationItem<INavigationModel, INavigationItem>? topLevelNavigation
 	)
 	{
+		if (parent is IRootNavigationItem<INavigationModel, INavigationItem> tree)
+			topLevelNavigation ??= tree;
 		foreach (var item in navigationItems)
 		{
 			switch (item)
 			{
 				case FileNavigationItem fileNavigationItem:
 					if (parent is not null)
 						fileNavigationItem.Parent = parent;
+					if (topLevelNavigation is not null)
+						fileNavigationItem.Model.NavigationRoot = topLevelNavigation;
 					_ = allNavigationItems.Add(fileNavigationItem);
 					break;
 				case DocumentationGroup documentationGroup:
 					if (parent is not null)
 						documentationGroup.Parent = parent;
+					if (topLevelNavigation is not null)
+						documentationGroup.Index.NavigationRoot = topLevelNavigation;
 					_ = allNavigationItems.Add(documentationGroup);
-					UpdateParent(allNavigationItems, documentationGroup.NavigationItems, documentationGroup);
+					UpdateParent(allNavigationItems, documentationGroup.NavigationItems, documentationGroup, topLevelNavigation);
 					break;
 				default:
 					_navigationFile.EmitError($"Unhandled navigation item type: {item.GetType()}");

src/tooling/docs-assembler/Navigation/GlobalNavigation.cs

@@ -3,48 +3,45 @@
 // See the LICENSE file in the project root for more information
 
 using System.Collections.Concurrent;
+using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.IO.Navigation;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Assembler.Navigation;
 
-public class GlobalNavigationHtmlWriter(ILoggerFactory logFactory, GlobalNavigation globalNavigation) : INavigationHtmlWriter
+public class GlobalNavigationHtmlWriter(ILoggerFactory logFactory, GlobalNavigation globalNavigation, DiagnosticsCollector collector) : INavigationHtmlWriter
 {
 	private readonly ILogger<Program> _logger = logFactory.CreateLogger<Program>();
 
 	private readonly ConcurrentDictionary<(string, int), string> _renderedNavigationCache = [];
 
 	public async Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, int maxLevel, Cancel ctx = default)
 	{
-		INodeNavigationItem<INavigationModel, INavigationItem> lastParentBeforeRoot = currentRootNavigation;
-		INodeNavigationItem<INavigationModel, INavigationItem> parent = currentRootNavigation;
-		while (parent.Parent is not null)
-		{
-			lastParentBeforeRoot = parent;
-			parent = parent.Parent;
-		}
-		if (_renderedNavigationCache.TryGetValue((lastParentBeforeRoot.Id, maxLevel), out var html))
+		if (currentRootNavigation.Parent is not null && currentRootNavigation.Parent.Depth != 0)
+			collector.EmitGlobalError($"Passed root is not actually a top level navigation item {currentRootNavigation.NavigationTitle} ({currentRootNavigation.Id}) in {currentRootNavigation.Url}");
+
+		if (_renderedNavigationCache.TryGetValue((currentRootNavigation.Id, maxLevel), out var html))
 		{
 			return new NavigationRenderResult
 			{
 				Html = html,
-				Id = lastParentBeforeRoot.Id
+				Id = currentRootNavigation.Id
 			};
 		}
 
-		_logger.LogInformation("Rendering navigation for {NavigationTitle} ({Id})", lastParentBeforeRoot.NavigationTitle, lastParentBeforeRoot.Id);
+		_logger.LogInformation("Rendering navigation for {NavigationTitle} ({Id})", currentRootNavigation.NavigationTitle, currentRootNavigation.Id);
 
-		if (lastParentBeforeRoot is not DocumentationGroup group)
+		if (currentRootNavigation is not DocumentationGroup group)
 			return NavigationRenderResult.Empty;
 
 		var model = CreateNavigationModel(group, maxLevel);
 		html = await ((INavigationHtmlWriter)this).Render(model, ctx);
-		_renderedNavigationCache[(lastParentBeforeRoot.Id, maxLevel)] = html;
+		_renderedNavigationCache[(currentRootNavigation.Id, maxLevel)] = html;
 		return new NavigationRenderResult
 		{
 			Html = html,
-			Id = lastParentBeforeRoot.Id
+			Id = currentRootNavigation.Id
 		};
 	}