kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #336 from hishamco/navigate-url

Browse Source 
Simplify NavigateUrl using UriBuilder
This commit is contained in:
Shaun Walker 2020-04-07 10:53:52 -04:00 committed by GitHub
commit 532a33ff47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Oqtane.Shared/Shared/Utilities.cs
View File

@ -14,30 +14,18 @@ namespace Oqtane.Shared
var assemblyName = assemblyFullName.Substring(0, assemblyFullName.IndexOf(",", StringComparison.Ordinal)); var assemblyName = assemblyFullName.Substring(0, assemblyFullName.IndexOf(",", StringComparison.Ordinal));
return $"{type.Namespace}, {assemblyName}"; return $"{type.Namespace}, {assemblyName}";
} }
public static string NavigateUrl(string alias, string path, string parameters) public static string NavigateUrl(string alias, string path, string parameters)
{ {
string url = ""; var uriBuilder = new UriBuilder
if (alias != "")
{ {
url += alias + "/"; Path = !string.IsNullOrEmpty(alias)
} ? $"{alias}/{path}"
if (path != "" && path != "/") : $"{path}",
{ Query = parameters
url += path + "/"; };
}
if (url.EndsWith("/")) return uriBuilder.Uri.PathAndQuery;
{
url = url.Substring(0, url.Length - 1);
}
if (!string.IsNullOrEmpty(parameters))
{
url += "?" + parameters;
}
if (!url.StartsWith("/"))
{
url = "/" + url;
}
return url;
} }
public static string EditUrl(string alias, string path, int moduleid, string action, string parameters) public static string EditUrl(string alias, string path, int moduleid, string action, string parameters)

31
Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs Normal file
View File

@ -0,0 +1,31 @@
using Oqtane.Shared;
using Xunit;
namespace Oqtane.Test.Oqtane.Shared.Tests
{
public class UtilitiesTests
{
[Theory]
[InlineData("contoso", "login", "returnUrl=/admin", "/contoso/login?returnUrl=/admin")]
[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("", "login", "returnUrl=/admin", "/login?returnUrl=/admin")]
[InlineData("", "admin", "", "/admin")]
[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)
{
// Arrange
var navigatedUrl = string.Empty;
// Act
navigatedUrl = Utilities.NavigateUrl(alias, path, parameters);
// Assert
Assert.Equal(expectedUrl, navigatedUrl);
}
}
}