Merge pull request #354 from sbwalker/master

NavigateUrl fix to deal with scenario where alias has a value and path is ""

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Oqtane.Client/Modules/[Module]/Edit.razor

@@ -26,9 +26,8 @@
 }
 
 @code {
-
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } }
-    public override string Actions { get { return "Add,Edit"; } }
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+    public override string Actions => "Add,Edit";
 
     int _id;
     string _name;

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Oqtane.Client/Modules/[Module]/Settings.razor

@@ -14,7 +14,7 @@
 </table>
 
 @code {
-    public override string Title { get { return "[Module] Settings"; } }
+    public override string Title => "[Module] Settings";
 
     string _value;
 

Oqtane.Shared/Shared/Utilities.cs

@@ -20,7 +20,9 @@ namespace Oqtane.Shared
             var uriBuilder = new UriBuilder
             {
                 Path = !string.IsNullOrEmpty(alias)
-                ? $"{alias}/{path}"
+                ? (!string.IsNullOrEmpty(path)) 
+                    ? $"{alias}/{path}" 
+                    : $"{alias}"
                 : $"{path}",
                 Query = parameters
             };

Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs

@@ -10,11 +10,11 @@ namespace Oqtane.Test.Oqtane.Shared.Tests
         [InlineData("contoso", "admin", "", "/contoso/admin")]
         [InlineData("contoso", "", "pageId=4", "/contoso?pageId=4")]
         [InlineData("contoso", "", "pageId=4&moduleId=10", "/contoso?pageId=4&moduleId=10")]
-        [InlineData("contoso", "", "", "/contoso/")]
+        [InlineData("contoso", "", "", "/contoso")]
         [InlineData("", "login", "returnUrl=/admin", "/login?returnUrl=/admin")]
         [InlineData("", "admin", "", "/admin")]
-        [InlineData("", "", "pageId=4", "?pageId=4")]
-        [InlineData("", "", "pageId=4&moduleId=10", "?pageId=4&moduleId=10")]
+        [InlineData("", "", "pageId=4", "/?pageId=4")]
+        [InlineData("", "", "pageId=4&moduleId=10", "/?pageId=4&moduleId=10")]
         [InlineData("", "", "", "/")]
         public void NavigateUrlTest(string alias, string path, string parameters, string expectedUrl)
         {