From 5a4084be6ebd825528e5a419eaba7f70df23be89 Mon Sep 17 00:00:00 2001
From: joao4all <joao.rua@4all-software.com>
Date: Fri, 6 Oct 2023 16:32:22 +0100
Subject: [PATCH] Requested changes

---
 .../Components/LoginTestFixture.cs            | 29 ++++++++++---------
 COMET.Web.Common/Components/Login.razor       |  2 +-
 COMET.Web.Common/Components/Login.razor.cs    | 19 ++++--------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/COMET.Web.Common.Tests/Components/LoginTestFixture.cs b/COMET.Web.Common.Tests/Components/LoginTestFixture.cs
index ca7e864e..f93b62c4 100644
--- a/COMET.Web.Common.Tests/Components/LoginTestFixture.cs
+++ b/COMET.Web.Common.Tests/Components/LoginTestFixture.cs
@@ -25,8 +25,6 @@
 
 namespace COMET.Web.Common.Tests.Components
 {
-    using AngleSharp.Dom;
-
     using Bunit;
 
     using COMET.Web.Common.Components;
@@ -40,7 +38,7 @@ namespace COMET.Web.Common.Tests.Components
     using Microsoft.AspNetCore.Components.Forms;
     using Microsoft.AspNetCore.Components.Web;
     using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.JSInterop;
+
     using Moq;
 
     using NUnit.Framework;
@@ -85,22 +83,27 @@ public async Task VerifyFocusingAndBluring()
                 { "Password", false }
             }));
 
-            Assert.IsFalse(renderer.Instance.FieldsFocusedStatus["UserName"]);
-            const string fieldToFocusOn = "Username";
-
+            const string fieldToFocusOn = "UserName";
+            Assert.That(renderer.Instance.FieldsFocusedStatus[fieldToFocusOn], Is.False);
             renderer.Instance.HandleFieldFocus(fieldToFocusOn);
-       
-            foreach (var fieldStatus in renderer.Instance.FieldsFocusedStatus)
+            
+            Assert.Multiple(()=>
             {
-                Assert.That(fieldStatus.Value, fieldStatus.Key == fieldToFocusOn ? Is.True : Is.False);
-            }
+                foreach (var fieldStatus in renderer.Instance.FieldsFocusedStatus)
+                {
+                    Assert.That(fieldStatus.Value, fieldStatus.Key == fieldToFocusOn ? Is.True : Is.False);
+                }
+            });
 
             renderer.Instance.HandleFieldBlur(fieldToFocusOn);
 
-            foreach (var fieldStatus in renderer.Instance.FieldsFocusedStatus)
+            Assert.Multiple(() =>
             {
-                Assert.That(fieldStatus.Value, Is.False);
-            }
+                foreach (var fieldStatus in renderer.Instance.FieldsFocusedStatus)
+                {
+                    Assert.That(fieldStatus.Value, Is.False);
+                }
+            });
         }
 
         [Test]
diff --git a/COMET.Web.Common/Components/Login.razor b/COMET.Web.Common/Components/Login.razor
index 938e9948..7ea2bb33 100644
--- a/COMET.Web.Common/Components/Login.razor
+++ b/COMET.Web.Common/Components/Login.razor
@@ -63,7 +63,7 @@
     </DxFormLayout>
 
     <ul class="validation-errors">
-        @foreach (var fieldFocusedStatus in this.fieldsFocusedStatus)
+        @foreach (var fieldFocusedStatus in this.FieldsFocusedStatus)
         {
             if (fieldFocusedStatus.Value)
             {
diff --git a/COMET.Web.Common/Components/Login.razor.cs b/COMET.Web.Common/Components/Login.razor.cs
index f3752e32..dc402af2 100644
--- a/COMET.Web.Common/Components/Login.razor.cs
+++ b/COMET.Web.Common/Components/Login.razor.cs
@@ -66,18 +66,9 @@ public partial class Login
         public bool LoginEnabled { get; set; } = true;
 
         /// <summary>
-        /// The dictionary of focus status from the fields, used by blazor component
+        /// The dictionary of focus status from the form fields
         /// </summary>
-        private Dictionary<string, bool> fieldsFocusedStatus;
-
-        /// <summary>
-        /// The dictionary of focus status from the fields
-        /// </summary>
-        public Dictionary<string, bool> FieldsFocusedStatus
-        {
-            get => this.fieldsFocusedStatus;
-            private set => this.fieldsFocusedStatus = value;
-        }
+        public Dictionary<string, bool> FieldsFocusedStatus { get; private set; }
 
         /// <summary>
         /// Method invoked when the component is ready to start, having received its
@@ -87,7 +78,7 @@ protected override void OnInitialized()
         {
             base.OnInitialized();
 
-            this.fieldsFocusedStatus = new Dictionary<string, bool>()
+            this.FieldsFocusedStatus = new Dictionary<string, bool>()
             {
                 { "SourceAddress", false },
                 { "UserName", false },
@@ -149,7 +140,7 @@ private async Task ExecuteLogin()
         /// <param name="fieldName">Form field name, as indexed in <see cref="FieldsFocusedStatus"/></param>
         public void HandleFieldFocus(string fieldName)
         {
-            this.fieldsFocusedStatus[fieldName] = true; // Set the field as focused
+            this.FieldsFocusedStatus[fieldName] = true; // Set the field as focused
         }
 
         /// <summary>
@@ -158,7 +149,7 @@ public void HandleFieldFocus(string fieldName)
         /// <param name="fieldName">Form field name, as indexed in <see cref="FieldsFocusedStatus"/></param>
         public void HandleFieldBlur(string fieldName)
         {
-            this.fieldsFocusedStatus[fieldName] = false; // Set the field as not focused when it loses focus
+            this.FieldsFocusedStatus[fieldName] = false; // Set the field as not focused when it loses focus
         }
     }
 }