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

Merge pull request #3917 from sbwalker/dev

Browse Source 
fix page Path so it supports the specification of external Urls, querystrings, and anchors
This commit is contained in:
Shaun Walker 2024-02-28 13:10:32 -05:00 committed by GitHub
commit 75b9a8a826
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 127 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -256,8 +256,9 @@
{ {
_pageId = Int32.Parse(PageState.QueryString["id"]); _pageId = Int32.Parse(PageState.QueryString["id"]);
_parent = await PageService.GetPageAsync(_pageId); _parent = await PageService.GetPageAsync(_pageId);
if (_parent != null) if (_parent != null && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{ {
// non-admins are authorized to create child pages of current page
_parentid = _parent.PageId.ToString(); _parentid = _parent.PageId.ToString();
} }
} }
@ -375,36 +376,56 @@
page.SiteId = PageState.Page.SiteId; page.SiteId = PageState.Page.SiteId;
page.Name = _name; page.Name = _name;
if (string.IsNullOrEmpty(_path)) // path can be a link to an external url
if (!_path.Contains("://"))
{ {
_path = _name; if (string.IsNullOrEmpty(_path))
}
if (_path.Contains("/"))
{
if (_path.EndsWith("/") && _path != "/")
{ {
_path = _path.Substring(0, _path.Length - 1); _path = _name;
} }
_path = _path.Substring(_path.LastIndexOf("/") + 1);
var fragment = (_path.Contains("?")) ? _path.Substring(_path.IndexOf("?")) : "";
fragment = (_path.Contains("#")) ? _path.Substring(_path.IndexOf("#")) : "";
_path = (!string.IsNullOrEmpty(fragment)) ? _path.Replace(fragment, "") : _path;
if (_path.Contains("/"))
{
if (_path.EndsWith("/") && _path != "/")
{
_path = _path.Substring(0, _path.Length - 1);
}
_path = _path.Substring(_path.LastIndexOf("/") + 1);
}
if (_parentid == "-1")
{
page.Path = Utilities.GetFriendlyUrl(_path);
}
else
{
Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId);
if (parent.Path == string.Empty)
{
page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
}
else
{
page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
}
}
page.Path += fragment;
}
else
{
page.Path = _path;
} }
if (_parentid == "-1") if (_parentid == "-1")
{ {
page.ParentId = null; page.ParentId = null;
page.Path = Utilities.GetFriendlyUrl(_path);
} }
else else
{ {
page.ParentId = Int32.Parse(_parentid); page.ParentId = Int32.Parse(_parentid);
var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
if (parent.Path == string.Empty)
{
page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
}
else
{
page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
}
} }
var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId); var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
@ -450,23 +471,23 @@
// appearance // appearance
page.Title = _title; page.Title = _title;
page.Icon = (_icon == null ? string.Empty : _icon); page.Icon = (_icon == null ? string.Empty : _icon);
page.ThemeType = _themetype; page.ThemeType = _themetype;
if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType) if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
{ {
page.ThemeType = string.Empty; page.ThemeType = string.Empty;
} }
page.DefaultContainerType = _containertype; page.DefaultContainerType = _containertype;
if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType) if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
{ {
page.DefaultContainerType = string.Empty; page.DefaultContainerType = string.Empty;
} }
// page content // page content
page.HeadContent = _headcontent; page.HeadContent = _headcontent;
page.BodyContent = _bodycontent; page.BodyContent = _bodycontent;
// permissions // permissions
page.PermissionList = _permissionGrid.GetPermissionList(); page.PermissionList = _permissionGrid.GetPermissionList();
page = await PageService.AddPageAsync(page); page = await PageService.AddPageAsync(page);
await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId); await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
@ -474,11 +495,18 @@
await logger.LogInformation("Page Added {Page}", page); await logger.LogInformation("Page Added {Page}", page);
if (!string.IsNullOrEmpty(PageState.ReturnUrl)) if (!string.IsNullOrEmpty(PageState.ReturnUrl))
{ {
NavigationManager.NavigateTo(page.Path); // redirect to new page NavigationManager.NavigateTo(PageState.ReturnUrl, true);
} }
else else
{ {
NavigationManager.NavigateTo(NavigateUrl()); // redirect to page management if (!page.Path.Contains("://"))
{
NavigationManager.NavigateTo(page.Path); // redirect to new page created
}
else
{
NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
}
} }
} }
else else

67
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -380,7 +380,7 @@
} }
else else
{ {
if (_path.Contains("/")) if (_path.Contains("/") & !_path.Contains("://"))
{ {
_path = _path.Substring(_path.LastIndexOf("/") + 1); _path = _path.Substring(_path.LastIndexOf("/") + 1);
} }
@ -518,36 +518,56 @@
_page.Name = _name; _page.Name = _name;
if (string.IsNullOrEmpty(_path)) // path can be a link to an external url
if (!_path.Contains("://"))
{ {
_path = _name; if (string.IsNullOrEmpty(_path))
}
if (_path.Contains("/"))
{
if (_path.EndsWith("/") && _path != "/")
{ {
_path = _path.Substring(0, _path.Length - 1); _path = _name;
} }
_path = _path.Substring(_path.LastIndexOf("/") + 1);
var fragment = (_path.Contains("?")) ? _path.Substring(_path.IndexOf("?")) : "";
fragment = (_path.Contains("#")) ? _path.Substring(_path.IndexOf("#")) : "";
_path = (!string.IsNullOrEmpty(fragment)) ? _path.Replace(fragment, "") : _path;
if (_path.Contains("/"))
{
if (_path.EndsWith("/") && _path != "/")
{
_path = _path.Substring(0, _path.Length - 1);
}
_path = _path.Substring(_path.LastIndexOf("/") + 1);
}
if (_parentid == "-1")
{
_page.Path = Utilities.GetFriendlyUrl(_path);
}
else
{
Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == _page.ParentId);
if (parent.Path == string.Empty)
{
_page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
}
else
{
_page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
}
}
_page.Path += fragment;
}
else
{
_page.Path = _path;
} }
if (_parentid == "-1") if (_parentid == "-1")
{ {
_page.ParentId = null; _page.ParentId = null;
_page.Path = Utilities.GetFriendlyUrl(_path);
} }
else else
{ {
_page.ParentId = Int32.Parse(_parentid); _page.ParentId = Int32.Parse(_parentid);
Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == _page.ParentId);
if (parent.Path == string.Empty)
{
_page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
}
else
{
_page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
}
} }
var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId); var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
@ -638,7 +658,14 @@
} }
else else
{ {
NavigationManager.NavigateTo(NavigateUrl(), true); if (!_page.Path.Contains("://"))
{
NavigationManager.NavigateTo(NavigateUrl(), true); // redirect to page being edited
}
else
{
NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
}
} }
} }
else else

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

@ -55,12 +55,32 @@ namespace Oqtane.Shared
return (urlparameters, querystring, anchor); return (urlparameters, querystring, anchor);
} }
private static (string Path, string Parameters) ParsePath(string path, string parameters)
{
if (!string.IsNullOrEmpty(path))
{
if (path.Contains('?'))
{
parameters = "?" + path.Split('?').Last();
path = path.Split('?').First();
}
if (path.Contains('#'))
{
parameters = "#" + path.Split('#').Last();
path = path.Split('#').First();
}
}
return (path, parameters);
}
public static string NavigateUrl(string alias, string path, string parameters) public static string NavigateUrl(string alias, string path, string parameters)
{ {
string urlparameters; string urlparameters;
string querystring; string querystring;
string anchor; string anchor;
// parse path (in case parameters are embedded in path)
(path, parameters) = ParsePath(path, parameters);
// parse parameters // parse parameters
(urlparameters, querystring, anchor) = ParseParameters(parameters); (urlparameters, querystring, anchor) = ParseParameters(parameters);
if (!string.IsNullOrEmpty(urlparameters)) if (!string.IsNullOrEmpty(urlparameters))