From e1a8d3db548adf6e4dc06ca1bba235d403d7b09e Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 28 Jun 2023 12:17:27 -0400 Subject: [PATCH 1/7] fix #2938 - path not updated correctly when parent page changed --- Oqtane.Client/Modules/Admin/Pages/Edit.razor | 10 ------ Oqtane.Server/Controllers/PageController.cs | 32 +++++++++++++++----- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index f77c3970..50aebf5d 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -603,16 +603,6 @@ await PageService.UpdatePageOrderAsync(_page.SiteId, _page.PageId, int.Parse(_currentparentid)); } - // update child paths - if (_parentid != _currentparentid) - { - foreach (Page p in PageState.Pages.Where(item => item.Path.StartsWith(currentPath))) - { - p.Path = p.Path.Replace(currentPath, _page.Path); - await PageService.UpdatePageAsync(p); - } - } - if (_themeSettingsType != null && _themeSettings is ISettingsControl themeSettingsControl) { await themeSettingsControl.UpdateSettings(); diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index ce81eec2..c3501345 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -12,6 +12,8 @@ using Oqtane.Infrastructure; using Oqtane.Repository; using Oqtane.Modules.Admin.Users; using System.IO; +using Oqtane.Services; +using Oqtane.UI; namespace Oqtane.Controllers { @@ -263,14 +265,18 @@ namespace Oqtane.Controllers // save url mapping if page path changed if (currentPage.Path != page.Path) { - var urlMapping = new UrlMapping(); - urlMapping.SiteId = page.SiteId; - urlMapping.Url = currentPage.Path; - urlMapping.MappedUrl = page.Path; - urlMapping.Requests = 0; - urlMapping.CreatedOn = System.DateTime.UtcNow; - urlMapping.RequestedOn = System.DateTime.UtcNow; - _urlMappings.AddUrlMapping(urlMapping); + var urlMapping = _urlMappings.GetUrlMapping(page.SiteId, currentPage.Path); + if (urlMapping == null) + { + urlMapping = new UrlMapping(); + urlMapping.SiteId = page.SiteId; + urlMapping.Url = currentPage.Path; + urlMapping.MappedUrl = page.Path; + urlMapping.Requests = 0; + urlMapping.CreatedOn = System.DateTime.UtcNow; + urlMapping.RequestedOn = System.DateTime.UtcNow; + _urlMappings.AddUrlMapping(urlMapping); + } } // get differences between current and new page permissions @@ -314,6 +320,16 @@ namespace Oqtane.Controllers } } + // update child paths + if (page.ParentId != currentPage.ParentId) + { + foreach (Page _page in _pages.GetPages(page.SiteId).Where(item => item.Path.StartsWith(currentPage.Path)).ToList()) + { + _page.Path = _page.Path.Replace(currentPage.Path, page.Path); + _pages.UpdatePage(_page); + } + } + _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Update); _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", page); From d06feec37b34051e95386b10f1e3ea2409713eeb Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 28 Jun 2023 12:24:59 -0400 Subject: [PATCH 2/7] set Expanded to lowercase if specified --- Oqtane.Client/Modules/Controls/Section.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Controls/Section.razor b/Oqtane.Client/Modules/Controls/Section.razor index 3620d893..115e352d 100644 --- a/Oqtane.Client/Modules/Controls/Section.razor +++ b/Oqtane.Client/Modules/Controls/Section.razor @@ -40,7 +40,7 @@ protected override void OnInitialized() { _heading = (!string.IsNullOrEmpty(Heading)) ? Heading : Name; - _expanded = (!string.IsNullOrEmpty(Expanded)) ? Expanded : "false"; + _expanded = (!string.IsNullOrEmpty(Expanded)) ? Expanded.ToLower() : "false"; if (_expanded == "true") { _show = "show"; } } From 22ec675cecf97825041977a3fde13cad1b074d83 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 28 Jun 2023 12:27:21 -0400 Subject: [PATCH 3/7] use case insensitive comparison for activetab name --- Oqtane.Client/Modules/Controls/TabStrip.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Controls/TabStrip.razor b/Oqtane.Client/Modules/Controls/TabStrip.razor index 01f5aded..90b3948a 100644 --- a/Oqtane.Client/Modules/Controls/TabStrip.razor +++ b/Oqtane.Client/Modules/Controls/TabStrip.razor @@ -8,7 +8,7 @@ @foreach (TabPanel tabPanel in _tabPanels) {
  • - @if (tabPanel.Name == ActiveTab) + @if (tabPanel.Name.ToLower() == ActiveTab.ToLower()) { @tabPanel.DisplayHeading() From 03bd88a2d54d7790cc31c16be88cedc5f9c26c42 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 28 Jun 2023 12:44:00 -0400 Subject: [PATCH 4/7] improve helptext for Aliases --- Oqtane.Client/Modules/Admin/Site/Index.razor | 92 +++++++++---------- Oqtane.Client/Modules/Admin/Sites/Add.razor | 2 +- Oqtane.Client/Modules/Admin/Sites/Index.razor | 2 +- .../Resources/Modules/Admin/Site/Index.resx | 8 +- .../Resources/Modules/Admin/Sites/Add.resx | 4 +- .../Resources/Modules/Admin/Sites/Index.resx | 3 + 6 files changed, 57 insertions(+), 54 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 49579b57..6589f770 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -234,53 +234,53 @@ {
    -
    - -
    - - -
    -   -   - @Localizer["AliasName"] - @Localizer["AliasDefault"] -
    - - @if (context.AliasId != _aliasid) - { - - @if (_aliasid == -1) - { - - } - - - @if (_aliasid == -1) - { - - } - - @context.Name - @context.IsDefault - } - else - { - - - - - - - - - } - -     -
    +
    + +
    + + +
    +   +   + @Localizer["AliasName"] + @Localizer["AliasDefault"] +
    + + @if (context.AliasId != _aliasid) + { + + @if (_aliasid == -1) + { + + } + + + @if (_aliasid == -1) + { + + } + + @context.Name + @context.IsDefault + } + else + { + + + + + + + + + } + +
    +
    diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index 4b61f801..371a2525 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -29,7 +29,7 @@ else
    - +
    diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor index 4ece6608..7a6257ff 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor @@ -18,7 +18,7 @@ else
        - @SharedLocalizer["Name"] + @Localizer["AliasName"]
    diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx index e4a4c438..5f66f8b9 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx @@ -166,7 +166,7 @@ The name of the database used for the site - The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). + The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder). Is this site deleted? @@ -217,7 +217,7 @@ Database: - Aliases: + Urls: Deleted? @@ -322,10 +322,10 @@ Default Alias: - Aliases + Urls - Name + Url Default? diff --git a/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx index f42efc99..bc840f28 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx @@ -136,7 +136,7 @@ Default Admin Container - Enter the alias for the server + The urls for the site (comman delimited). This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or a virtual folder (ie. domain.com/folder). Select the default container for the site @@ -145,7 +145,7 @@ Database: - Aliases: + Urls: Default Theme: diff --git a/Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx index 3a3b783c..07085283 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx @@ -135,4 +135,7 @@ Browse + + Url + \ No newline at end of file From 452c3fd355806fb2b70fd45036119607cf6b57dd Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 28 Jun 2023 12:50:58 -0400 Subject: [PATCH 5/7] fix #2942 - reverse ordering of page name and site name for page title --- Oqtane.Client/UI/ThemeBuilder.razor | 2 +- Oqtane.Server/Controllers/PageController.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor index 0719a546..ebe824ab 100644 --- a/Oqtane.Client/UI/ThemeBuilder.razor +++ b/Oqtane.Client/UI/ThemeBuilder.razor @@ -26,7 +26,7 @@ } else { - SiteState.Properties.PageTitle = PageState.Site.Name + " - " + PageState.Page.Name; + SiteState.Properties.PageTitle = PageState.Page.Name + " - " + PageState.Site.Name; } // set page head content diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index c3501345..f22f7467 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -14,6 +14,7 @@ using Oqtane.Modules.Admin.Users; using System.IO; using Oqtane.Services; using Oqtane.UI; +using System; namespace Oqtane.Controllers { @@ -182,9 +183,9 @@ namespace Oqtane.Controllers page = new Page(); page.SiteId = parent.SiteId; page.ParentId = parent.PageId; - page.Name = user.Username; - page.Path = parent.Path + "/" + page.Name; - page.Title = parent.Name + " - " + page.Name; + page.Name = user.DisplayName; + page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(page.Name); + page.Title = page.Name + " - " + parent.Name; page.Order = 0; page.IsNavigation = false; page.Url = ""; From c55c8bff6e1a40ee355f4f38079d594451d1947c Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 28 Jun 2023 13:05:34 -0400 Subject: [PATCH 6/7] fix #2941 - HasChildren property not considering deleted pages --- Oqtane.Server/Controllers/SiteController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index 95de3a92..99a64b32 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -246,7 +246,7 @@ namespace Oqtane.Controllers foreach (Page child in children) { child.Level = level + 1; - child.HasChildren = pages.Any(item => item.ParentId == child.PageId); + child.HasChildren = pages.Any(item => item.ParentId == child.PageId && !item.IsDeleted); hierarchy.Add(child); getPath(pageList, child); } From 8edc4fd67ae393d7ee442086d39bad7d8a7b8a16 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 28 Jun 2023 13:11:15 -0400 Subject: [PATCH 7/7] allow admin to navigate to site settings for deleted site --- Oqtane.Server/Pages/_Host.cshtml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs index 4b44e341..98b94e13 100644 --- a/Oqtane.Server/Pages/_Host.cshtml.cs +++ b/Oqtane.Server/Pages/_Host.cshtml.cs @@ -114,7 +114,7 @@ namespace Oqtane.Pages } var site = _sites.InitializeSite(alias); - if (site != null && !site.IsDeleted && site.Runtime != "Hybrid") + if (site != null && (!site.IsDeleted || url.Contains("admin/site")) && site.Runtime != "Hybrid") { Route route = new Route(url, alias.Path);