Fixes in route localization

Author: tomasherceg

src/Framework/Framework/Routing/DotvvmRouteTable.cs

@@ -64,7 +64,8 @@ public void AddGroup(string groupName,
             string urlPrefix,
             string virtualPathPrefix,
             Action<DotvvmRouteTable> content,
-            Func<IServiceProvider, IDotvvmPresenter>? presenterFactory = null)
+            Func<IServiceProvider, IDotvvmPresenter>? presenterFactory = null,
+            LocalizedRouteUrl[]? localizedUrls = null)
         {
             ThrowIfFrozen();
             if (string.IsNullOrEmpty(groupName))
@@ -77,6 +78,7 @@ public void AddGroup(string groupName,
             }
             urlPrefix = CombinePath(group?.UrlPrefix, urlPrefix);
             virtualPathPrefix = CombinePath(group?.VirtualPathPrefix, virtualPathPrefix);
+            localizedUrls = CombineLocalizedUrls(group, urlPrefix, localizedUrls);
 
             var newGroup = new DotvvmRouteTable(configuration);
             newGroup.group = new RouteTableGroup(
@@ -85,7 +87,8 @@ public void AddGroup(string groupName,
                 urlPrefix,
                 virtualPathPrefix,
                 addToParentRouteTable: Add,
-                presenterFactory);
+                presenterFactory,
+                localizedUrls);
 
             content(newGroup);
             routeTableGroups.Add(groupName, newGroup);
@@ -142,14 +145,15 @@ public void Add(string routeName, string? url, Func<IServiceProvider, IDotvvmPre
 
         private void AddCore(string routeName, string? url, string virtualPath, object? defaultValues, Func<IServiceProvider, IDotvvmPresenter>? presenterFactory, LocalizedRouteUrl[]? localizedUrls)
         {
+            localizedUrls = CombineLocalizedUrls(group, url ?? string.Empty, localizedUrls);
             url = CombinePath(group?.UrlPrefix, url);
             presenterFactory ??= GetDefaultPresenter;
             routeName = group?.RouteNamePrefix + routeName;
 
             RouteBase route = localizedUrls == null
                 ? new DotvvmRoute(url, virtualPath, defaultValues, presenterFactory, configuration)
                 : new LocalizedDotvvmRoute(url,
-                    localizedUrls.Select(l => new LocalizedRouteUrl(l.CultureIdentifier, CombinePath(group?.UrlPrefix, l.RouteUrl))).ToArray(),
+                    localizedUrls.Select(l => new LocalizedRouteUrl(l.CultureIdentifier, l.RouteUrl)).ToArray(),
                     virtualPath, defaultValues, presenterFactory, configuration);
             Add(routeName, route);
         }
@@ -324,6 +328,25 @@ private string CombinePath(string? prefix, string? appendedPath)
             return $"{prefix}/{appendedPath}";
         }
 
+        private LocalizedRouteUrl[]? CombineLocalizedUrls(RouteTableGroup? group, string routeUrl, LocalizedRouteUrl[]? localizedUrls)
+        {
+            if (group == null)
+            {
+                return localizedUrls;
+            }
+
+            var groupCultures = group.LocalizedUrls?.ToDictionary(u => u.CultureIdentifier, u => u.RouteUrl) ?? new();
+            var routeCultures = localizedUrls?.ToDictionary(u => u.CultureIdentifier, u => u.RouteUrl) ?? new();
+
+            return groupCultures.Keys.Union(routeCultures.Keys)
+                .Select(c =>
+                    new LocalizedRouteUrl(c, CombinePath(
+                        groupCultures.TryGetValue(c, out var localizedGroupUrl) ? localizedGroupUrl : group.UrlPrefix,
+                        routeCultures.TryGetValue(c, out var localizedRouteUrl) ? localizedRouteUrl : routeUrl)
+                    ))
+                .ToArray();
+        }
+
         private bool isFrozen = false;
 
         private void ThrowIfFrozen()

src/Framework/Framework/Routing/LocalizedDotvvmRoute.cs

@@ -119,9 +119,15 @@ public static void ValidateCultureName(string cultureIdentifier)
         public override bool IsMatch(string url, [MaybeNullWhen(false)] out IDictionary<string, object?> values) => GetRouteForCulture(CultureInfo.CurrentCulture).IsMatch(url, out values);
 
         public bool IsPartialMatch(string url, [MaybeNullWhen(false)] out RouteBase matchedRoute, [MaybeNullWhen(false)] out IDictionary<string, object?> values)
+        {
+            return IsPartialMatch(url, out matchedRoute, out values, out _);
+        }
+
+        public bool IsPartialMatch(string url, [MaybeNullWhen(false)] out RouteBase matchedRoute, [MaybeNullWhen(false)] out IDictionary<string, object?> values, [MaybeNullWhen(false)] out string? matchedCulture)
         {
             RouteBase? twoLetterCultureMatch = null;
             IDictionary<string, object?>? twoLetterCultureMatchValues = null;
+            matchedCulture = null;
 
             foreach (var route in localizedRoutes)
             {
@@ -131,13 +137,15 @@ public bool IsPartialMatch(string url, [MaybeNullWhen(false)] out RouteBase matc
                     {
                         // exact culture match - return immediately
                         matchedRoute = route.Value;
+                        matchedCulture = route.Key;
                         return true;
                     }
                     else if (route.Key.Length > 0 && twoLetterCultureMatch == null)
                     {
                         // match for two-letter culture - continue searching if there is a better match
                         twoLetterCultureMatch = route.Value;
                         twoLetterCultureMatchValues = values;
+                        matchedCulture = route.Key;
                     }
                     else
                     {

src/Framework/Framework/Routing/RouteTableGroup.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Text;
 using DotVVM.Framework.Hosting;
 
@@ -15,15 +16,17 @@ public class RouteTableGroup
         public string RouteNamePrefix { get; private set; }
         public string UrlPrefix { get; private set; }
         public string VirtualPathPrefix { get; private set; }
+        public ImmutableArray<LocalizedRouteUrl>? LocalizedUrls { get; private set; }
 
-        public RouteTableGroup(string groupName, string routeNamePrefix, string urlPrefix, string virtualPathPrefix, Action<string, RouteBase> addToParentRouteTable, Func<IServiceProvider, IDotvvmPresenter>? presenterFactory)
+        public RouteTableGroup(string groupName, string routeNamePrefix, string urlPrefix, string virtualPathPrefix, Action<string, RouteBase> addToParentRouteTable, Func<IServiceProvider, IDotvvmPresenter>? presenterFactory, LocalizedRouteUrl[]? localizedUrls = null)
         {
             GroupName = groupName;
             RouteNamePrefix = routeNamePrefix;
             UrlPrefix = urlPrefix;
             VirtualPathPrefix = virtualPathPrefix;
             AddToParentRouteTable = addToParentRouteTable;
             PresenterFactory = presenterFactory;
+            LocalizedUrls = localizedUrls?.ToImmutableArray();
         }
     }
 }

src/Tests/Routing/RouteTableGroupTests.cs

@@ -185,5 +185,61 @@ public void RouteTableGroup_DefaultPresenterFactory()
             }, p => p.GetRequiredService<TestPresenter>());
             Assert.IsInstanceOfType(table.First().GetPresenter(configuration.ServiceProvider), typeof(TestPresenter));
         }
+
+        [TestMethod]
+        public void RouteTableGroup_LocalizedUrls_RouteOnly()
+        {
+            var table = new DotvvmRouteTable(configuration);
+            table.AddGroup("Group", "group", null, opt => {
+                opt.Add("Route", "route", null, null, null, [
+                    new LocalizedRouteUrl("cs-CZ", "cesta")
+                ]);
+            });
+
+            var route = table["Group_Route"];
+            Assert.IsInstanceOfType(route, typeof(LocalizedDotvvmRoute));
+            var csCzRoute = ((LocalizedDotvvmRoute)route).GetRouteForCulture("cs-CZ");
+
+            Assert.AreEqual("group/route", route.Url);
+            Assert.AreEqual("group/cesta", csCzRoute.Url);
+        }
+
+        [TestMethod]
+        public void RouteTableGroup_LocalizedUrls_GroupOnly()
+        {
+            var table = new DotvvmRouteTable(configuration);
+            table.AddGroup("Group", "group", null, opt => {
+                opt.Add("Route", "route", null, null, null, null);
+            }, localizedUrls: [
+                new LocalizedRouteUrl("cs-CZ", "skupina")
+            ]);
+
+            var route = table["Group_Route"];
+            Assert.IsInstanceOfType(route, typeof(LocalizedDotvvmRoute));
+            var csCzRoute = ((LocalizedDotvvmRoute)route).GetRouteForCulture("cs-CZ");
+
+            Assert.AreEqual("group/route", route.Url);
+            Assert.AreEqual("skupina/route", csCzRoute.Url);
+        }
+
+        [TestMethod]
+        public void RouteTableGroup_LocalizedUrls()
+        {
+            var table = new DotvvmRouteTable(configuration);
+            table.AddGroup("Group", "group", null, opt => {
+                opt.Add("Route", "route", null, null, null, [
+                    new LocalizedRouteUrl("cs-CZ", "cesta")
+                ]);
+            }, localizedUrls: [
+                new LocalizedRouteUrl("cs-CZ", "skupina")
+            ]);
+
+            var route = table["Group_Route"];
+            Assert.IsInstanceOfType(route, typeof(LocalizedDotvvmRoute));
+            var csCzRoute = ((LocalizedDotvvmRoute)route).GetRouteForCulture("cs-CZ");
+
+            Assert.AreEqual("group/route", route.Url);
+            Assert.AreEqual("skupina/cesta", csCzRoute.Url);
+        }
     }
 }