Improve behavior of Active Directory installation page

Blazam-App · Oct 5, 2023 · 165ebc2 · 165ebc2
1 parent 7de022f
commit 165ebc2
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 12 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>0.8.2</AssemblyVersion>
-		<Version>2023.10.05.1238</Version>
+		<Version>2023.10.05.1505</Version>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
 

diff --git a/BLAZAM/Pages/Install/ADirectory.razor b/BLAZAM/Pages/Install/ADirectory.razor
@@ -4,19 +4,20 @@
 @{
 }
     <div>
-    <DirectorySettings />
+    <DirectorySettings SettingsSaved="@(()=>{directoryStatusPanel.ResetStatus();})" />
 
-        <ActiveDirectoryStatusPanel DirectoryConnected="@(()=>{disableNext=false;})"/>
+        <ActiveDirectoryStatusPanel @ref=directoryStatusPanel DirectoryConnected="@(()=>{disableNext=false;})"/>
         <br/>
         <br/>
         <MudButton Color="Color.Success" @onclick="ShowNext" Disabled="@disableNext">Proceed</MudButton>
     </div>
 
 @code {
-#nullable disable warnings
+    #nullable disable warnings
     [Parameter]
     public EventCallback StepCompleted { get; set; }
 
+    ActiveDirectoryStatusPanel directoryStatusPanel;
     ADSettings currentSettings;
 
     bool disableNext = true;

diff --git a/BLAZAMActiveDirectory/ActiveDirectoryContext.cs b/BLAZAMActiveDirectory/ActiveDirectoryContext.cs
@@ -513,6 +513,7 @@ public void Dispose()
                                 connection.SessionOptions.SecureSocketLayer = ConnectionSettings.UseTLS;
                                 connection.SessionOptions.PingWaitTimeout = TimeSpan.FromSeconds(5);
                                 connection.SessionOptions.SendTimeout = TimeSpan.FromSeconds(5);
+
                                 //connection.SessionOptions.FastConcurrentBind();
                                 connection.Credential = new NetworkCredential(loginReq.Username, loginReq.SecurePassword);
 

diff --git a/BLAZAMGui/UI/Settings/ActiveDirectoryStatusPanel.razor b/BLAZAMGui/UI/Settings/ActiveDirectoryStatusPanel.razor
@@ -4,7 +4,14 @@
     <MudCardHeader>
         Active Directory Connection Status
     </MudCardHeader>
+    @if (showProgress)
+    {
+        <MudStack Row=true>
+            <MudProgressLinear Indeterminate=true />
 
+        </MudStack>
+    }
+
         <MudStack Row=true>
                 Server Port Open
                 <StatusCheck Status="_portStatus" />
@@ -59,7 +66,7 @@
     </MudCard>
 
 @code {
-#nullable disable warnings
+    #nullable disable warnings
 
     [Parameter]
     public EventCallback DirectoryConnected { get; set; }
@@ -77,10 +84,19 @@
 
     }
 
+    public void ResetStatus()
+    {
+        Directory = DirectoryFactory.CreateActiveDirectoryContext();
+        Directory.ConnectAsync();
+        _portStatus = false;
+        _credStatus = false;
+        _encryptedStatus = false;
+        showProgress = true;
+        StateHasChanged();
+    }
 
 
-
-    private async void UpdateStatus(object? state)
+    public async void UpdateStatus(object? state)
     {
         await Task.Run(async () =>
         {
@@ -89,6 +105,7 @@
                 _monitoring = true;
                 while (_monitoring == true)
                 {
+
                     if (Directory.Status == DirectoryConnectionStatus.Connecting)
                     {
                         showProgress = true;

diff --git a/BLAZAMGui/UI/Settings/DirectorySettings.razor b/BLAZAMGui/UI/Settings/DirectorySettings.razor
@@ -135,7 +135,7 @@
 </MudForm>
 @code {
 
-#nullable disable warnings
+    #nullable disable warnings
     ADSettings settings = new ADSettings();
     bool _insert;
 
@@ -163,7 +163,7 @@
     }
     protected override async void Save()
     {
-     
+
         if (!settings.Password.Equals(passwordInDb))
         {
             settings.Password = settings.Password.Encrypt();
@@ -176,7 +176,8 @@
         }
         await AuditLogger.System.SettingsChanged("Active Directory", settings.GetChanges(originalSettings));
         base.Save();
-
+        SettingsSaved.InvokeAsync();
+
 
     }
 

diff --git a/BLAZAMGui/UI/Settings/SettingsComponents.razor.cs b/BLAZAMGui/UI/Settings/SettingsComponents.razor.cs
@@ -2,7 +2,7 @@
 
 namespace BLAZAM.Gui.UI.Settings
 {
-    public partial class SettingsComponents:ValidatedForm
+    public partial class SettingsComponents : ValidatedForm
     {
         protected object? originalSettings;
 
@@ -13,8 +13,10 @@ protected override Task OnInitializedAsync()
         //TODO do we need this save
         protected void Save(IEnumerable<EntityEntry> changedEntries)
         {
-     
+
             base.Save();
         }
+        [Parameter]
+        public EventCallback SettingsSaved { get; set; }
     }
 }