From 769e7454b78f0354542c72e20f3cea887dc1cc65 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Sat, 9 Sep 2023 22:10:01 +0300
Subject: [PATCH 1/6] Remove extra warning alert from SmtpSettings.Edit

---
 .../OrchardCore.Email/Views/SmtpSettings.Edit.cshtml            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml
index 6577618403d..59d1f530a20 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml
@@ -1,8 +1,6 @@
 @using OrchardCore.Email
 @model SmtpSettings
 
-<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
-
 <div class="mb-3" asp-validation-class-for="DefaultSender">
     <label asp-for="DefaultSender">@T["Sender email address"]</label>
     <input asp-for="DefaultSender" class="form-control" type="text" />

From e8a50901f2e4f1ed99291077c987a6efaa42144a Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Sun, 10 Sep 2023 15:00:05 +0300
Subject: [PATCH 2/6] Remove extra alerts

---
 .../OrchardCore.Https/Views/HttpsSettings.Edit.cshtml         | 2 --
 .../Views/LocalizationSettings.Edit.cshtml                    | 2 --
 .../OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml | 3 ---
 .../OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml | 2 --
 .../Views/OpenIdValidationSettings.Edit.cshtml                | 2 --
 .../OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml | 2 --
 .../Views/ReverseProxySettings.Edit.cshtml                    | 4 ----
 7 files changed, 17 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml
index ab97d104a4e..e76c6d89291 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml
@@ -1,7 +1,5 @@
 @model HttpsSettingsViewModel
 
-<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
-
 <div class="mb-3" asp-validation-class-for="RequireHttps">
     <div class="form-check">
         <input type="checkbox" class="form-check-input" asp-for="RequireHttps" asp-is-disabled="@(!Model.IsHttpsRequest)" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
index da034f5e429..eebe50a1217 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
@@ -2,8 +2,6 @@
 @using Newtonsoft.Json
 @using System.Globalization
 
-<p class="alert alert-warning col-xl-6">@T["The current tenant will be reloaded when the settings are saved."]</p>
-
 @{
     // ['fr-FR', 'en-US']
     var supportedCultures = JsonConvert.SerializeObject(Model.Cultures.Where(x => x.Supported).Select(c => c.CultureInfo.Name).ToArray());
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml
index cc6a0438909..1d47f7a3666 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml
@@ -2,9 +2,6 @@
 @using Microsoft.IdentityModel.Protocols.OpenIdConnect
 @model OpenIdClientSettingsViewModel
 
-<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
-
-
 <script asp-src="~/OrchardCore.OpenId/Scripts/parametersEditor.min.js" debug-src="~/OrchardCore.OpenId/Scripts/parametersEditor.js" asp-name="parametersEditor" at="Foot" depends-on="vuejs, vuedraggable"></script>
 <style asp-src="~/OrchardCore.OpenId/Styles/parametersEditor.min.css" debug-src="~/OrchardCore.OpenId/Styles/parametersEditor.css"></style>
 
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml
index 7ac34218a2c..06940356b2e 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml
@@ -3,8 +3,6 @@
 @using System.Security.Cryptography.X509Certificates
 @model OpenIdServerSettingsViewModel
 
-<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
-
 <h3>@T["Endpoints"]</h3>
 <div class="mb-3" asp-validation-class-for="EnableTokenEndpoint">
     <div class="form-check">
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml
index cb2700672dc..e9b7789a388 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml
@@ -1,8 +1,6 @@
 @using OrchardCore.OpenId.ViewModels
 @model OpenIdValidationSettingsViewModel
 
-<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
-
 <p class="alert alert-warning">
     @T["To be able to validate tokens issued by a separate tenant, " +
        "you must register a custom scope in the server options " +
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml
index 41b8bbd166e..8bbab80d841 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml
@@ -1,7 +1,5 @@
 @model ReCaptchaSettingsViewModel
 
-<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
-
 <div class="mb-3" asp-validation-class-for="SiteKey">
     <label asp-for="SiteKey">@T["Site Key"]</label>
     <input asp-for="SiteKey" class="form-control" type="text" />
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml
index 43cc396d590..481381ce2d0 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml
@@ -4,10 +4,6 @@
 
 @inject IClientIPAddressAccessor ClientIPAddressAccessor
 
-<p class="alert alert-warning">
-    @T["The current tenant will be reloaded when the settings are saved."]
-</p>
-
 <div class="mb-3" asp-validation-class-for="EnableXForwardedFor">
     <div class="form-check">
         <label class="form-check-label">

From 2dea6f5fe6a0b91b559467746b8a06fe7eb7dd54 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Tue, 12 Sep 2023 18:19:03 +0300
Subject: [PATCH 3/6] Address feedback

---
 .../Drivers/DefaultSiteSettingsDisplayDriver.cs        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
index 96c9c494e6b..042e28f703e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
@@ -30,6 +30,11 @@ public DefaultSiteSettingsDisplayDriver(
 
         public override Task<IDisplayResult> EditAsync(ISite site, BuildEditorContext context)
         {
+            if (!IsGeneralSettings(context))
+            {
+                return Task.FromResult<IDisplayResult>(null);
+            }
+
             context.Shape.Metadata.Wrappers.Add("Settings_Wrapper__General");
 
             var result = Combine(
@@ -49,7 +54,7 @@ public override Task<IDisplayResult> EditAsync(ISite site, BuildEditorContext co
 
         public override async Task<IDisplayResult> UpdateAsync(ISite site, UpdateEditorContext context)
         {
-            if (context.GroupId.Equals(GroupId, StringComparison.OrdinalIgnoreCase))
+            if (IsGeneralSettings(context))
             {
                 var model = new SiteSettingsViewModel();
 
@@ -104,5 +109,8 @@ private static void PopulateProperties(ISite site, SiteSettingsViewModel model)
             model.AppendVersion = site.AppendVersion;
             model.CacheMode = site.CacheMode;
         }
+
+        private static bool IsGeneralSettings(BuildEditorContext context)
+            => context.GroupId.Equals(GroupId, StringComparison.OrdinalIgnoreCase);
     }
 }

From 2e0bd0352d1b8afcc668bd4e135d4f7f34052c13 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Tue, 12 Sep 2023 18:20:43 +0300
Subject: [PATCH 4/6] Revert "Remove extra alerts"

This reverts commit e8a50901f2e4f1ed99291077c987a6efaa42144a.
---
 .../OrchardCore.Https/Views/HttpsSettings.Edit.cshtml         | 2 ++
 .../Views/LocalizationSettings.Edit.cshtml                    | 2 ++
 .../OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml | 3 +++
 .../OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml | 2 ++
 .../Views/OpenIdValidationSettings.Edit.cshtml                | 2 ++
 .../OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml | 2 ++
 .../Views/ReverseProxySettings.Edit.cshtml                    | 4 ++++
 7 files changed, 17 insertions(+)

diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml
index e76c6d89291..ab97d104a4e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Https/Views/HttpsSettings.Edit.cshtml
@@ -1,5 +1,7 @@
 @model HttpsSettingsViewModel
 
+<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
+
 <div class="mb-3" asp-validation-class-for="RequireHttps">
     <div class="form-check">
         <input type="checkbox" class="form-check-input" asp-for="RequireHttps" asp-is-disabled="@(!Model.IsHttpsRequest)" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
index eebe50a1217..da034f5e429 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
@@ -2,6 +2,8 @@
 @using Newtonsoft.Json
 @using System.Globalization
 
+<p class="alert alert-warning col-xl-6">@T["The current tenant will be reloaded when the settings are saved."]</p>
+
 @{
     // ['fr-FR', 'en-US']
     var supportedCultures = JsonConvert.SerializeObject(Model.Cultures.Where(x => x.Supported).Select(c => c.CultureInfo.Name).ToArray());
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml
index 1d47f7a3666..cc6a0438909 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml
@@ -2,6 +2,9 @@
 @using Microsoft.IdentityModel.Protocols.OpenIdConnect
 @model OpenIdClientSettingsViewModel
 
+<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
+
+
 <script asp-src="~/OrchardCore.OpenId/Scripts/parametersEditor.min.js" debug-src="~/OrchardCore.OpenId/Scripts/parametersEditor.js" asp-name="parametersEditor" at="Foot" depends-on="vuejs, vuedraggable"></script>
 <style asp-src="~/OrchardCore.OpenId/Styles/parametersEditor.min.css" debug-src="~/OrchardCore.OpenId/Styles/parametersEditor.css"></style>
 
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml
index 06940356b2e..7ac34218a2c 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdServerSettings.Edit.cshtml
@@ -3,6 +3,8 @@
 @using System.Security.Cryptography.X509Certificates
 @model OpenIdServerSettingsViewModel
 
+<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
+
 <h3>@T["Endpoints"]</h3>
 <div class="mb-3" asp-validation-class-for="EnableTokenEndpoint">
     <div class="form-check">
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml
index e9b7789a388..cb2700672dc 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdValidationSettings.Edit.cshtml
@@ -1,6 +1,8 @@
 @using OrchardCore.OpenId.ViewModels
 @model OpenIdValidationSettingsViewModel
 
+<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
+
 <p class="alert alert-warning">
     @T["To be able to validate tokens issued by a separate tenant, " +
        "you must register a custom scope in the server options " +
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml
index 8bbab80d841..41b8bbd166e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Views/ReCaptchaSettings.Edit.cshtml
@@ -1,5 +1,7 @@
 @model ReCaptchaSettingsViewModel
 
+<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
+
 <div class="mb-3" asp-validation-class-for="SiteKey">
     <label asp-for="SiteKey">@T["Site Key"]</label>
     <input asp-for="SiteKey" class="form-control" type="text" />
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml
index 481381ce2d0..43cc396d590 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/ReverseProxySettings.Edit.cshtml
@@ -4,6 +4,10 @@
 
 @inject IClientIPAddressAccessor ClientIPAddressAccessor
 
+<p class="alert alert-warning">
+    @T["The current tenant will be reloaded when the settings are saved."]
+</p>
+
 <div class="mb-3" asp-validation-class-for="EnableXForwardedFor">
     <div class="form-check">
         <label class="form-check-label">

From c30eb5b5a001c7489882109c7c155434499cec07 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Tue, 12 Sep 2023 18:23:07 +0300
Subject: [PATCH 5/6] Revert SmtpSettings changes

---
 .../OrchardCore.Email/Views/SmtpSettings.Edit.cshtml            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml
index 59d1f530a20..6577618403d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Views/SmtpSettings.Edit.cshtml
@@ -1,6 +1,8 @@
 @using OrchardCore.Email
 @model SmtpSettings
 
+<p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]</p>
+
 <div class="mb-3" asp-validation-class-for="DefaultSender">
     <label asp-for="DefaultSender">@T["Sender email address"]</label>
     <input asp-for="DefaultSender" class="form-control" type="text" />

From 6f8f5ead39851f31ad3c254ff22b3c85f1e5f5cd Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Tue, 12 Sep 2023 19:13:59 +0300
Subject: [PATCH 6/6] Feedback

---
 .../DefaultSiteSettingsDisplayDriver.cs       | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
index 042e28f703e..7fe6f7ffc46 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
@@ -30,7 +30,7 @@ public DefaultSiteSettingsDisplayDriver(
 
         public override Task<IDisplayResult> EditAsync(ISite site, BuildEditorContext context)
         {
-            if (!IsGeneralSettings(context))
+            if (!IsGeneralGroup(context))
             {
                 return Task.FromResult<IDisplayResult>(null);
             }
@@ -54,45 +54,47 @@ public override Task<IDisplayResult> EditAsync(ISite site, BuildEditorContext co
 
         public override async Task<IDisplayResult> UpdateAsync(ISite site, UpdateEditorContext context)
         {
-            if (IsGeneralSettings(context))
+            if (!IsGeneralGroup(context))
             {
-                var model = new SiteSettingsViewModel();
+                return null;
+            }
 
-                if (await context.Updater.TryUpdateModelAsync(model, Prefix))
-                {
-                    site.SiteName = model.SiteName;
-                    site.PageTitleFormat = model.PageTitleFormat;
-                    site.BaseUrl = model.BaseUrl;
-                    site.TimeZoneId = model.TimeZone;
-                    site.PageSize = model.PageSize.Value;
-                    site.UseCdn = model.UseCdn;
-                    site.CdnBaseUrl = model.CdnBaseUrl;
-                    site.ResourceDebugMode = model.ResourceDebugMode;
-                    site.AppendVersion = model.AppendVersion;
-                    site.CacheMode = model.CacheMode;
-
-                    if (model.PageSize.Value < 1)
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-                    }
-
-                    if (site.MaxPageSize > 0 && model.PageSize.Value > site.MaxPageSize)
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-                    }
-                }
+            var model = new SiteSettingsViewModel();
 
-                if (!String.IsNullOrEmpty(site.BaseUrl) && !Uri.TryCreate(site.BaseUrl, UriKind.Absolute, out _))
+            if (await context.Updater.TryUpdateModelAsync(model, Prefix))
+            {
+                site.SiteName = model.SiteName;
+                site.PageTitleFormat = model.PageTitleFormat;
+                site.BaseUrl = model.BaseUrl;
+                site.TimeZoneId = model.TimeZone;
+                site.PageSize = model.PageSize.Value;
+                site.UseCdn = model.UseCdn;
+                site.CdnBaseUrl = model.CdnBaseUrl;
+                site.ResourceDebugMode = model.ResourceDebugMode;
+                site.AppendVersion = model.AppendVersion;
+                site.CacheMode = model.CacheMode;
+
+                if (model.PageSize.Value < 1)
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
                 }
 
-                if (context.Updater.ModelState.IsValid)
+                if (site.MaxPageSize > 0 && model.PageSize.Value > site.MaxPageSize)
                 {
-                    await _shellHost.ReleaseShellContextAsync(_shellSettings);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
                 }
             }
 
+            if (!String.IsNullOrEmpty(site.BaseUrl) && !Uri.TryCreate(site.BaseUrl, UriKind.Absolute, out _))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
+            }
+
+            if (context.Updater.ModelState.IsValid)
+            {
+                await _shellHost.ReleaseShellContextAsync(_shellSettings);
+            }
+
             return await EditAsync(site, context);
         }
 
@@ -110,7 +112,7 @@ private static void PopulateProperties(ISite site, SiteSettingsViewModel model)
             model.CacheMode = site.CacheMode;
         }
 
-        private static bool IsGeneralSettings(BuildEditorContext context)
+        private static bool IsGeneralGroup(BuildEditorContext context)
             => context.GroupId.Equals(GroupId, StringComparison.OrdinalIgnoreCase);
     }
 }