Merge pull request #42 from phmatray/features/fix-warnings

phmatray · web-flow · commit 07427a933562 · 2025-08-08T15:28:44.000+02:00
refactor: simplify code
diff --git a/CLAUDE.md b/CLAUDE.md
diff --git a/FormCraft.DemoBlazorApp/Components/Pages/FieldGroups.razor.cs b/FormCraft.DemoBlazorApp/Components/Pages/FieldGroups.razor.cs
@@ -179,7 +179,7 @@ private void ResetForm()
         if (!string.IsNullOrEmpty(_model.Biography))
         {
             var bio = _model.Biography.Length > 50
-                ? _model.Biography.Substring(0, 50) + "..."
+                ? _model.Biography[..50] + "..."
                 : _model.Biography;
             items.Add(new() { Label = "Biography", Value = bio });
         }
diff --git a/FormCraft.DemoBlazorApp/Components/Pages/FileUploadDemo.razor.cs b/FormCraft.DemoBlazorApp/Components/Pages/FileUploadDemo.razor.cs
@@ -154,7 +154,7 @@ private void ResetForm()
             });
         }
 
-        if (_model.Certificates?.Any() == true)
+        if (_model.Certificates.Any())
         {
             items.Add(new FormSuccessDisplay.DataDisplayItem
             {
diff --git a/FormCraft.DemoBlazorApp/Components/Pages/FormSlots.razor.cs b/FormCraft.DemoBlazorApp/Components/Pages/FormSlots.razor.cs
@@ -11,7 +11,7 @@ public partial class FormSlots : IDisposable
     private IFormConfiguration<ContactModel> _formConfiguration = null!;
     private bool _isSubmitting;
     private bool _isSubmitted;
-    private int _activeStep = 0;
+    private int _activeStep;
     private bool _showCountdown = true;
     private string _countdownText = "";
     private System.Timers.Timer? _countdownTimer;
diff --git a/FormCraft.DemoBlazorApp/Components/Pages/SecurityDemo.razor.cs b/FormCraft.DemoBlazorApp/Components/Pages/SecurityDemo.razor.cs
@@ -16,8 +16,8 @@ public partial class SecurityDemo
     private string _decryptedResult = "";
     private int _submissionCount;
     private const int _maxSubmissions = 3;
-    private string _resetTime = "1 minute";
-    
+    private const string _resetTime = "1 minute";
+
     private readonly List<GuidelineItem> _securityGuidelines = new()
     {
         new()
@@ -240,8 +240,8 @@ private void ResetForm()
         {
             new() { Label = "Name", Value = _lastSubmission.Name },
             new() { Label = "Email", Value = _lastSubmission.Email },
-            new() { Label = "SSN", Value = _lastSubmission.SSN.Length > 10 ? "***-**-" + _lastSubmission.SSN.Substring(_lastSubmission.SSN.Length - 4) : "Encrypted" },
-            new() { Label = "Credit Card", Value = _lastSubmission.CreditCard.Length > 10 ? "****-****-****-" + _lastSubmission.CreditCard.Substring(_lastSubmission.CreditCard.Length - 4) : "Encrypted" },
+            new() { Label = "SSN", Value = _lastSubmission.SSN.Length > 10 ? "***-**-" + _lastSubmission.SSN[^4..] : "Encrypted" },
+            new() { Label = "Credit Card", Value = _lastSubmission.CreditCard.Length > 10 ? "****-****-****-" + _lastSubmission.CreditCard[^4..] : "Encrypted" },
             new() { Label = "Birth Date", Value = _lastSubmission.BirthDate.ToShortDateString() }
         };
     }
diff --git a/FormCraft.DemoBlazorApp/Helpers/GuidelineHelpers.cs b/FormCraft.DemoBlazorApp/Helpers/GuidelineHelpers.cs
@@ -17,7 +17,7 @@ public static GuidelineItem CreateGuideline(string feature, string usage, string
     
     public static GuidelineItem CreateCodeGuideline(string feature, string usage, string example)
     {
-        return CreateGuideline(feature, usage, example, true);
+        return CreateGuideline(feature, usage, example);
     }
     
     public static GuidelineItem CreateTextGuideline(string feature, string usage, string example)
diff --git a/FormCraft.DemoBlazorApp/Services/VersionService.cs b/FormCraft.DemoBlazorApp/Services/VersionService.cs
@@ -75,7 +75,7 @@ public async Task<string> GetFormCraftVersionAsync()
                         // Remove 'v' prefix if present
                         if (version.StartsWith("v"))
                         {
-                            version = version.Substring(1);
+                            version = version[1..];
                         }
                         _cachedVersion = version;
                         _cacheExpiry = DateTime.UtcNow.AddHours(1);
diff --git a/FormCraft.ForMudBlazor/Features/CustomFields/MudBlazorRatingComponent.razor b/FormCraft.ForMudBlazor/Features/CustomFields/MudBlazorRatingComponent.razor
@@ -33,6 +33,6 @@
     
     private int GetMaxRating()
     {
-        return GetAttribute<int>("MaxRating", 5);
+        return GetAttribute("MaxRating", 5);
     }
 }
diff --git a/FormCraft.ForMudBlazor/Fields/TextField/MudBlazorTextFieldComponent.razor.cs b/FormCraft.ForMudBlazor/Fields/TextField/MudBlazorTextFieldComponent.razor.cs
@@ -14,7 +14,7 @@ protected override void OnInitialized()
         base.OnInitialized();
 
         // Load configuration from additional attributes
-        Lines = GetAttribute<int>("Lines", 1);
+        Lines = GetAttribute("Lines", 1);
         MaxLength = GetAttribute<int?>("MaxLength");
         InputType = GetAttribute("InputType", "text") ?? "text";
         Mask = GetAttribute<string?>("Mask");
diff --git a/FormCraft.sln.DotSettings.user b/FormCraft.sln.DotSettings.user
@@ -2,7 +2,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fbf9021a960b74107a7e141aa06bc9d8a0a53c929178c2fb95b1597be8af8dc_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMemberExpression_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F22fcf6bc98d86f46d35d502592ddd281e5a9fc65b1ad2eec19898153ffa47_003FMemberExpression_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARenderTreeBuilder_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fcba2da7d9d9c9a4959d387508945f8ac78aac1812d1fc0a5f82e38ca8a3b4374_003FRenderTreeBuilder_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/SweaWarningsMode/@EntryValue">DoNotShowAndRun</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/SweaWarningsMode/@EntryValue">ShowAndRun</s:String>
 	
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=017026e3_002Db1e5_002D47e9_002Dbaf0_002Db4c86c281b07/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="All tests from &amp;lt;src&amp;gt;\&amp;lt;tests&amp;gt;\&amp;lt;FormCraft.UnitTests&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
   &lt;Project Location="/Users/phmatray/Repositories/github-phm/FormCraft/FormCraft.UnitTests" Presentation="&amp;lt;src&amp;gt;\&amp;lt;tests&amp;gt;\&amp;lt;FormCraft.UnitTests&amp;gt;" /&gt;
@@ -14,4 +14,9 @@
   &lt;Project Location="/Users/phmatray/Repositories/github-phm/FormCraft" Presentation="&amp;lt;src&amp;gt;" /&gt;
 &lt;/SessionState&gt;</s:String>
 	
+	
+	
+	
+	
+	
 	</wpf:ResourceDictionary>
diff --git a/FormCraft/Forms/Configuration/UIFrameworkConfiguration.cs b/FormCraft/Forms/Configuration/UIFrameworkConfiguration.cs
@@ -8,7 +8,7 @@ public class UIFrameworkConfiguration
     /// <summary>
     /// Gets or sets the current UI framework adapter.
     /// </summary>
-    public IUIFrameworkAdapter CurrentFramework { get; set; } = default!;
+    public IUIFrameworkAdapter CurrentFramework { get; set; } = null!;
     
     /// <summary>
     /// Gets the registered UI framework adapters.
diff --git a/FormCraft/Forms/Security/BlazorEncryptionService.cs b/FormCraft/Forms/Security/BlazorEncryptionService.cs
@@ -22,7 +22,7 @@ public BlazorEncryptionService(IConfiguration configuration)
             keyString = "DefaultKey123456DefaultKey123456"; // 32 bytes
         }
 
-        _key = Encoding.UTF8.GetBytes(keyString.PadRight(32).Substring(0, 32));
+        _key = Encoding.UTF8.GetBytes(keyString.PadRight(32)[..32]);
     }
 
     public string? Encrypt(string? value)
diff --git a/FormCraft/Forms/Security/DefaultEncryptionService.cs b/FormCraft/Forms/Security/DefaultEncryptionService.cs
@@ -23,7 +23,7 @@ public DefaultEncryptionService(IConfiguration configuration)
             keyString = "DefaultKey123456DefaultKey123456"; // 32 bytes for AES-256
         }
 
-        _key = Encoding.UTF8.GetBytes(keyString.PadRight(32).Substring(0, 32));
+        _key = Encoding.UTF8.GetBytes(keyString.PadRight(32)[..32]);
         _iv = Encoding.UTF8.GetBytes(configuration["FormCraft:Encryption:IV"] ?? "1234567890123456");
     }
 
diff --git a/FormCraft/Forms/Security/EncryptedFieldHelper.cs b/FormCraft/Forms/Security/EncryptedFieldHelper.cs
@@ -19,7 +19,7 @@ public static void EncryptFields<TModel>(TModel model, IFormSecurity security, I
         foreach (var fieldName in security.EncryptedFields)
         {
             var property = typeof(TModel).GetProperty(fieldName);
-            if (property?.PropertyType == typeof(string) && property.CanRead && property.CanWrite)
+            if (property?.PropertyType == typeof(string) && property is { CanRead: true, CanWrite: true })
             {
                 var value = property.GetValue(model) as string;
                 if (!string.IsNullOrEmpty(value))

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ private void ResetForm()`
`179`	`179`	`if (!string.IsNullOrEmpty(_model.Biography))`
`180`	`180`	`{`
`181`	`181`	`var bio = _model.Biography.Length > 50`
`182`		`- ? _model.Biography.Substring(0, 50) + "..."`
	`182`	`+ ? _model.Biography[..50] + "..."`
`183`	`183`	`: _model.Biography;`
`184`	`184`	`items.Add(new() { Label = "Biography", Value = bio });`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private void ResetForm()`
`154`	`154`	`});`
`155`	`155`	`}`
`156`	`156`
`157`		`- if (_model.Certificates?.Any() == true)`
	`157`	`+ if (_model.Certificates.Any())`
`158`	`158`	`{`
`159`	`159`	`items.Add(new FormSuccessDisplay.DataDisplayItem`
`160`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static GuidelineItem CreateGuideline(string feature, string usage, string`
`17`	`17`
`18`	`18`	`public static GuidelineItem CreateCodeGuideline(string feature, string usage, string example)`
`19`	`19`	`{`
`20`		`- return CreateGuideline(feature, usage, example, true);`
	`20`	`+ return CreateGuideline(feature, usage, example);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public static GuidelineItem CreateTextGuideline(string feature, string usage, string example)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public async Task<string> GetFormCraftVersionAsync()`
`75`	`75`	`// Remove 'v' prefix if present`
`76`	`76`	`if (version.StartsWith("v"))`
`77`	`77`	`{`
`78`		`- version = version.Substring(1);`
	`78`	`+ version = version[1..];`
`79`	`79`	`}`
`80`	`80`	`_cachedVersion = version;`
`81`	`81`	`_cacheExpiry = DateTime.UtcNow.AddHours(1);`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@`
`33`	`33`
`34`	`34`	`private int GetMaxRating()`
`35`	`35`	`{`
`36`		`- return GetAttribute<int>("MaxRating", 5);`
	`36`	`+ return GetAttribute("MaxRating", 5);`
`37`	`37`	`}`
`38`	`38`	`}`