update more places with hx-get and make append of querystring try to check for existing querystring

Author: Mpdreamz

src/Elastic.Documentation.Site/Htmx.cs

@@ -2,12 +2,19 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.Reflection;
 using System.Text;
+using Elastic.Documentation.Extensions;
 
 namespace Elastic.Documentation.Site;
 
 public static class Htmx
 {
+	private static readonly string Version =
+		Assembly.GetExecutingAssembly().GetCustomAttributes<AssemblyInformationalVersionAttribute>()
+			.FirstOrDefault()?.InformationalVersion ?? "0.0.0";
+	public static readonly string VersionHash = ShortId.Create(Version);
+
 	public static string GetHxSelectOob(bool hasSameTopLevelGroup) => hasSameTopLevelGroup ? "#content-container,#toc-nav" : "#main-container";
 	public const string Preload = "mousedown";
 	public const string HxSwap = "none";
@@ -24,6 +31,7 @@ public static string GetHxAttributes(
 		string? hxIndicator = HxIndicator
 	)
 	{
+		targetUrl = targetUrl.Contains('?') ? $"{targetUrl}&v={VersionHash}" : $"{targetUrl}?v={VersionHash}";
 		var attributes = new StringBuilder();
 		_ = attributes.Append($" hx-get={targetUrl}");
 		_ = attributes.Append($" hx-select-oob={hxSwapOob ?? GetHxSelectOob(hasSameTopLevelGroup)}");

src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs

@@ -16,11 +16,6 @@ namespace Elastic.Markdown.Myst.Renderers;
 
 public class HtmxLinkInlineRenderer : LinkInlineRenderer
 {
-	private static readonly string Version =
-		Assembly.GetExecutingAssembly().GetCustomAttributes<AssemblyInformationalVersionAttribute>()
-			.FirstOrDefault()?.InformationalVersion ?? "0.0.0";
-	private static readonly string VersionHash = ShortId.Create(Version);
-
 	protected override void Write(HtmlRenderer renderer, LinkInline link)
 	{
 		if (renderer.EnableHtmlForInline && !link.IsImage)
@@ -33,7 +28,8 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 			}
 
 			var url = link.GetDynamicUrl?.Invoke() ?? link.Url;
-			url = $"{url}?v={VersionHash}";
+			if (url is not null)
+				url = url.Contains('?') ? $"{url}&v={Htmx.VersionHash}" : $"{url}?v={Htmx.VersionHash}";
 
 			var isCrossLink = (link.GetData("isCrossLink") as bool?) == true;
 			var isHttpLink = url?.StartsWith("http") ?? false;