Fixed build errors and unit tests

riganti · Jun 4, 2024 · 83fc30d · 83fc30d
1 parent 37b3826
commit 83fc30d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/Framework/Framework/Controls/RouteLink.cs b/src/Framework/Framework/Controls/RouteLink.cs
@@ -69,13 +69,13 @@ public string Text
         /// Gets or sets the required culture of the page. This property is supported only when using localizable routes.
         /// </summary>
         [MarkupOptions(AllowBinding = false)]
-        public string Culture
+        public string? Culture
         {
-            get { return (string)GetValue(CultureProperty); }
+            get { return (string?)GetValue(CultureProperty); }
             set { SetValue(CultureProperty, value); }
         }
         public static readonly DotvvmProperty CultureProperty
-            = DotvvmProperty.Register<string, RouteLink>(c => c.Culture, null);
+            = DotvvmProperty.Register<string?, RouteLink>(c => c.Culture, null);
 
         /// <summary>
         /// Gets or sets a collection of parameters to be substituted in the route URL. If the current route contains a parameter with the same name, its value will be reused unless another value is specified here.
@@ -219,7 +219,7 @@ public static IEnumerable<ControlUsageError> ValidateUsage(ResolvedControl contr
                 }
             }
 
-            var parameterDefinitions = route.ParameterNames;
+            var parameterDefinitions = route!.ParameterNames;
             var parameterReferences = control.Properties.Where(i => i.Key is GroupedDotvvmProperty p && p.PropertyGroup == ParamsGroupDescriptor);
 
             var undefinedReferences =

diff --git a/src/Framework/Framework/Routing/DotvvmRouteTable.cs b/src/Framework/Framework/Routing/DotvvmRouteTable.cs
@@ -225,7 +225,7 @@ public void AddRouteRedirection(string routeName, string urlPattern, Func<IDotvv
         /// <param name="url">The URL.</param>
         /// <param name="presenterType">The presenter factory.</param>
         /// <param name="defaultValues">The default values.</param>
-        public void Add(string routeName, string? url, Type presenterType, object? defaultValues = null, LocalizedRouteUrl[] localizedUrls = null)
+        public void Add(string routeName, string? url, Type presenterType, object? defaultValues = null, LocalizedRouteUrl[]? localizedUrls = null)
         {
             ThrowIfFrozen();
             if (!typeof(IDotvvmPresenter).IsAssignableFrom(presenterType))

diff --git a/src/Tests/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json b/src/Tests/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json
@@ -1354,6 +1354,10 @@
       }
     },
     "DotVVM.Framework.Controls.RouteLink": {
+      "Culture": {
+        "type": "System.String",
+        "onlyHardcoded": true
+      },
       "Enabled": {
         "type": "System.Boolean",
         "defaultValue": true