From e2c404d8bb1008d8e6b8681a1b32d177d8995071 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 12:18:30 -0700 Subject: [PATCH 01/10] Adds await ScrollToPageTop(); to error messages + Page Name Error Message - Adds await ScrollToPageTop(); to error messages - Adds Blank Page Name Error Message --- Oqtane.Client/Modules/Admin/Pages/Edit.razor | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 0d408c03..62120623 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -466,7 +466,7 @@ _parentid = (string)e.Value; _children = new List(); foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid)))) - { + { if (p.PageId != _pageId && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList)) { _children.Add(p); @@ -479,6 +479,7 @@ { await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message); AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error); + await ScrollToPageTop(); } } @@ -494,6 +495,7 @@ if (ThemeService.GetTheme(PageState.Site.Themes, _themetype)?.ThemeName != ThemeService.GetTheme(PageState.Site.Themes, PageState.Site.DefaultThemeType)?.ThemeName) { AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning); + await ScrollToPageTop(); } } @@ -531,6 +533,7 @@ if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate)) { AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning); + await ScrollToPageTop(); return; } if (!string.IsNullOrEmpty(_themetype) && _containertype != "-") @@ -581,12 +584,14 @@ if (_pages.Any(item => item.Path == _page.Path && item.PageId != _page.PageId)) { AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning); + await ScrollToPageTop(); return; } if (_page.ParentId == null && Constants.ReservedRoutes.Contains(_page.Name.ToLower())) { AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], _page.Name), MessageType.Warning); + await ScrollToPageTop(); return; } @@ -671,17 +676,28 @@ else { AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning); + if (string.IsNullOrEmpty(_name)) + { + AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); + } + await ScrollToPageTop(); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving Page {Page} {Error}", _page, ex.Message); AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error); + await ScrollToPageTop(); } } else { AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); + if (string.IsNullOrEmpty(_name)) + { + AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); + } + await ScrollToPageTop(); } } From 15867a7807e38e87a1528ff968882bab3bb5092b Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 12:23:29 -0700 Subject: [PATCH 02/10] Adds await ScrollToPageTop(); to error messages + Page Name Error Message --- Oqtane.Client/Modules/Admin/Pages/Add.razor | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index ac7f064c..006f850b 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -316,6 +316,7 @@ { await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message); AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error); + await ScrollToPageTop(); } } @@ -330,6 +331,7 @@ if (ThemeService.GetTheme(PageState.Site.Themes, _themetype)?.ThemeName != ThemeService.GetTheme(PageState.Site.Themes, PageState.Site.DefaultThemeType)?.ThemeName) { AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning); + await ScrollToPageTop(); } } @@ -345,6 +347,7 @@ if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate)) { AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning); + await ScrollToPageTop(); return; } if (!string.IsNullOrEmpty(_themetype) && !string.IsNullOrEmpty(_containertype)) @@ -395,12 +398,14 @@ if (_pages.Any(item => item.Path == page.Path)) { AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning); + await ScrollToPageTop(); return; } if (page.ParentId == null && Constants.ReservedRoutes.Contains(page.Name.ToLower())) { AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], page.Name), MessageType.Warning); + await ScrollToPageTop(); return; } @@ -468,6 +473,11 @@ else { AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning); + if (string.IsNullOrEmpty(_name)) + { + AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); + } + await ScrollToPageTop(); } } @@ -475,11 +485,17 @@ { await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message); AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error); + await ScrollToPageTop(); } } else { AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); + if (string.IsNullOrEmpty(_name)) + { + AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); + } + await ScrollToPageTop(); } } From f2f22f35e8e1906d121e519cb964077d382b8c8e Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 12:26:36 -0700 Subject: [PATCH 03/10] Adds Message.Required.PageName --- Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx index 9ebed89a..fb31edea 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx @@ -162,6 +162,9 @@ A page with path '{0}' already exists for this site. Page paths must be unique. You may need to check if a page with this path exists in the Recycle Bin. + + You Must Provide Page A Name + You Must Provide Page Name, Theme, and Container @@ -267,4 +270,4 @@ Expiry Date: - \ No newline at end of file + From 58c422285a37bacfffa1348bdc8b4f12d73e1419 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 12:28:17 -0700 Subject: [PATCH 04/10] Adds Message.Required.PageName --- Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx index 478e7616..4dbc6d31 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx @@ -156,6 +156,9 @@ You Must Provide Page Name, Theme, and Container + + You Must Provide Page A Name + Error Saving Page @@ -297,4 +300,4 @@ Expiry Date: - \ No newline at end of file + From c25cce43986c2ee3f3cf1713c6ba00f12cecbde7 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 12:38:16 -0700 Subject: [PATCH 05/10] Clarify Page Name Required Message --- Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx index 4dbc6d31..d998f302 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx @@ -157,7 +157,7 @@ You Must Provide Page Name, Theme, and Container - You Must Provide Page A Name + A page name is required. Please enter one. Error Saving Page From 4c937be8847ffe7533fd9168c9a2a791b776acf6 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 12:38:51 -0700 Subject: [PATCH 06/10] Clarify Page Name Required Message --- Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx index fb31edea..988f85ef 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx @@ -163,7 +163,7 @@ A page with path '{0}' already exists for this site. Page paths must be unique. You may need to check if a page with this path exists in the Recycle Bin. - You Must Provide Page A Name + A page name is required. Please enter one. You Must Provide Page Name, Theme, and Container From 97d3764b6e61de2db67975dcb88eee75c0705240 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 13:20:52 -0700 Subject: [PATCH 07/10] Remove Blank Page Specific Error Message --- Oqtane.Client/Modules/Admin/Pages/Edit.razor | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 62120623..ebeffdb6 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -676,10 +676,6 @@ else { AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning); - if (string.IsNullOrEmpty(_name)) - { - AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); - } await ScrollToPageTop(); } } @@ -693,10 +689,6 @@ else { AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); - if (string.IsNullOrEmpty(_name)) - { - AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); - } await ScrollToPageTop(); } } From cbaebb7b7ce45bed2a68b0de44a670d68f4477a1 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 13:21:15 -0700 Subject: [PATCH 08/10] Remove Blank Page Specific Error Message --- Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx | 3 --- 1 file changed, 3 deletions(-) diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx index d998f302..b142a19c 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx @@ -156,9 +156,6 @@ You Must Provide Page Name, Theme, and Container - - A page name is required. Please enter one. - Error Saving Page From 80316824f7949d96395a49ea30763021d04c6469 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 13:21:40 -0700 Subject: [PATCH 09/10] Remove Blank Page Specific Error Message --- Oqtane.Client/Modules/Admin/Pages/Add.razor | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index 006f850b..42c0743c 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -473,10 +473,6 @@ else { AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning); - if (string.IsNullOrEmpty(_name)) - { - AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); - } await ScrollToPageTop(); } @@ -491,10 +487,6 @@ else { AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); - if (string.IsNullOrEmpty(_name)) - { - AddModuleMessage(Localizer["Message.Required.PageName"], MessageType.Warning); - } await ScrollToPageTop(); } } From 784f3771b334144b802af62d9813ba146516a353 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 24 Oct 2024 13:22:08 -0700 Subject: [PATCH 10/10] Remove Blank Page Specific Error Message --- Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx | 3 --- 1 file changed, 3 deletions(-) diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx index 988f85ef..b818eacd 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx @@ -162,9 +162,6 @@ A page with path '{0}' already exists for this site. Page paths must be unique. You may need to check if a page with this path exists in the Recycle Bin. - - A page name is required. Please enter one. - You Must Provide Page Name, Theme, and Container