Merge pull request #119 from Lombiq/issue/OSOE-867

OSOE-867: Addressing analyzer warnings
Lombiq · Jun 11, 2024 · 2bd9952 · 2bd9952
2 parents e283890 + e291d83
commit 2bd9952
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Lombiq.BaseTheme/Attributes/DerivedThemeAttribute.cs b/Lombiq.BaseTheme/Attributes/DerivedThemeAttribute.cs
@@ -3,7 +3,6 @@
 using OrchardCore.ResourceManagement;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
 
 namespace Lombiq.BaseTheme.Attributes;
@@ -18,7 +17,7 @@ public sealed class DerivedThemeAttribute : ThemeAttribute
     public string Favicon { get; set; }
 
     public IEnumerable<LinkEntry> Links => LinksJson == null
-        ? Enumerable.Empty<LinkEntry>()
+        ? []
         : JsonSerializer.Deserialize<IEnumerable<LinkEntry>>(LinksJson);
 
     public DerivedThemeAttribute() =>

diff --git a/Lombiq.BaseTheme/Controllers/AdminController.cs b/Lombiq.BaseTheme/Controllers/AdminController.cs
@@ -84,6 +84,8 @@ public async Task<IActionResult> Index()
     [ValidateAntiForgeryToken]
     public async Task<IActionResult> Update([FromForm] BaseThemeSettingsViewModel viewModel)
     {
+        if (!ModelState.IsValid) return BadRequest(ModelState);
+
         var siteSettings = await _siteService.LoadSiteSettingsAsync();
         siteSettings.Alter<BaseThemeSettings>(nameof(BaseThemeSettings), settings =>
         {

diff --git a/Lombiq.BaseTheme/Permissions/BaseThemeSettingsPermissions.cs b/Lombiq.BaseTheme/Permissions/BaseThemeSettingsPermissions.cs
@@ -1,4 +1,4 @@
-using Lombiq.HelpfulLibraries.OrchardCore.Users;
+using Lombiq.HelpfulLibraries.OrchardCore.Users;
 using OrchardCore.Security.Permissions;
 using System.Collections.Generic;
 
@@ -9,5 +9,5 @@ public class BaseThemeSettingsPermissions : AdminPermissionBase
     public static readonly Permission ManageBaseThemeSettings =
         new(nameof(ManageBaseThemeSettings), "Manage Lombiq.BaseTheme Settings.");
 
-    protected override IEnumerable<Permission> AdminPermissions => new[] { ManageBaseThemeSettings };
+    protected override IEnumerable<Permission> AdminPermissions => [ManageBaseThemeSettings];
 }
diff --git a/Lombiq.BaseTheme/ViewModels/BaseThemeSettingsViewModel.cs b/Lombiq.BaseTheme/ViewModels/BaseThemeSettingsViewModel.cs
@@ -1,12 +1,13 @@
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.DisplayManagement;
 
 namespace Lombiq.BaseTheme.ViewModels;
 
 public class BaseThemeSettingsViewModel
 {
     public string Icon { get; set; }
-    public bool HideMenu { get; set; }
+
+    public required bool HideMenu { get; set; }
 
     [BindNever]
     public IShape Editor { get; set; }