rename popup to accurately reflect it

update filter on keyvault search list to properly filter values DRY update to run tasks on background thread on startup
sidestep-labs · Aug 6, 2024 · ba77a23 · ba77a23
1 parent 5e521e3
commit ba77a23
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 88 deletions.
diff --git a/KeyVaultExplorer/App.axaml.cs b/KeyVaultExplorer/App.axaml.cs
@@ -35,13 +35,14 @@ public static void CreateDesktopResources()
         if (!dbPassExists)
             DatabaseEncryptedPasswordManager.SetSecret($"keyvaultexplorer_{System.Guid.NewGuid().ToString()[..6]}");
 
-        Dispatcher.UIThread.Post(async () =>
+
+        Task.Run(async () =>
         {
             await KvExplorerDb.OpenSqlConnection();
 
             if (!dbExists)
                 KvExplorerDb.InitializeDatabase();
-        }, DispatcherPriority.Loaded);
+        });
 
         string settingsPath = Path.Combine(Constants.LocalAppDataFolder, "settings.json");
         if (!File.Exists(settingsPath))

diff --git a/KeyVaultExplorer/KeyVaultExplorer.csproj b/KeyVaultExplorer/KeyVaultExplorer.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
     <!-- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-macos</TargetFrameworks> -->
     <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
    	<Version>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)\\..\\VERSION"))</Version>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>

diff --git a/KeyVaultExplorer/Models/Constants.cs b/KeyVaultExplorer/Models/Constants.cs
@@ -29,9 +29,9 @@ public static class Constants
     // Cache settings
     public const string CacheFileName = "keyvaultexplorer_msal_cache.txt";
 
-    public static readonly string LocalAppDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\keyvaultexplorerforazure";
+    public static readonly string LocalAppDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\KeyVaultExplorerForAzure";
 
-    public static readonly string DatabaseFilePath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\keyvaultexplorerforazure\\keyvaultexplorerforazure.db";
+    public static readonly string DatabaseFilePath = LocalAppDataFolder+ "\\KeyVaultExplorerForAzure.db";
 
     public const string KeyChainServiceName = "keyvaultexplorerforazure_msal_service";
     public const string KeyChainAccountName = "keyvaultexplorerforazure_msal_account";

diff --git a/KeyVaultExplorer/Resources/Styles.axaml b/KeyVaultExplorer/Resources/Styles.axaml
@@ -208,7 +208,7 @@
                 <Canvas
                     Width="14"
                     Height="14"
-                    Margin="4,0,1,0"
+                    Margin="4,0,2,0"
                     Background="Transparent">
                     <Canvas.Styles>
                         <!--<Style Selector="ToolTip">

diff --git a/KeyVaultExplorer/Services/AuthService.cs b/KeyVaultExplorer/Services/AuthService.cs
@@ -42,7 +42,7 @@ public async Task<AuthenticationResult> LoginAsync(CancellationToken cancellatio
         {
             var options = new SystemWebViewOptions()
             {
-                HtmlMessageError = "<p> An error occured: {0}. Details {1}</p>",
+                HtmlMessageError = "<p> An error occurred: {0}. Details {1}</p>",
                 BrowserRedirectSuccess = new Uri("https://www.microsoft.com")
             };
             //.WithPrompt(Prompt.ForceLogin) //This is optional. If provided, on each execution, the username and the password must be entered.

diff --git a/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs b/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
@@ -96,10 +96,6 @@ public async Task EditDetails()
         else
             KeyVaultSecretModel.ExpiresOn = null;
 
-
-        //foreach (var tag in KeyVaultSecretModel.Tags)
-        //    KeyVaultSecretModel.Properties.Tags.Add(tag.Key, tag.Value);
-
         var updatedProps = await _vaultService.UpdateSecret(KeyVaultSecretModel, KeyVaultSecretModel.VaultUri);
         KeyVaultSecretModel = updatedProps;
     }
@@ -137,7 +133,6 @@ partial void OnKeyVaultSecretModelChanging(SecretProperties value)
         NotBeforeTimespan = value is not null && value.NotBefore.HasValue ? value?.NotBefore.Value.LocalDateTime.TimeOfDay : null;
     }
 
-
     partial void OnHasActivationDateCheckedChanged(bool oldValue, bool newValue)
     {
         if (newValue is false)

diff --git a/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs b/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs
@@ -129,7 +129,7 @@ await DelaySetIsBusy(async () =>
                 catch (Exception ex)
                 {
                     Debug.Write(ex);
-                    _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                    _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
                 }
             });
         }, DispatcherPriority.Background);

diff --git a/KeyVaultExplorer/ViewModels/NotificationViewModel.cs b/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
@@ -17,7 +17,7 @@ public void AddMessage(Notification notification)
         NotificationManager?.Show(notification);
     }
 
-    public async void ShowErrorPopup(Notification notification)
+    public async void ShowPopup(Notification notification)
     {
         var td = new TaskDialog
         {

diff --git a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs b/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
@@ -137,11 +137,11 @@ private async Task Copy()
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
         catch (Exception ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
         }
     }
 
@@ -181,11 +181,11 @@ private async Task Download(string exportType)
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
         catch (Exception ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
         }
     }
 
@@ -218,14 +218,16 @@ private async Task EditVersion()
                     try
                     {
                         await viewModel.EditDetailsCommand.ExecuteAsync(null);
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification("Success", "The properties have been updated."));
+
                     }
                     catch (KeyVaultInsufficientPrivilegesException ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
                     }
                     catch (Exception ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
                     }
                     finally
                     {
@@ -245,7 +247,7 @@ private async Task EditVersion()
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
     }
 
@@ -325,15 +327,15 @@ private async Task NewVersion()
                     try
                     {
                         await vm.NewVersionCommand.ExecuteAsync(null);
-                        _notificationViewModel.AddMessage(new Avalonia.Controls.Notifications.Notification("New Version", "Your value has been created.", Avalonia.Controls.Notifications.NotificationType.Success));
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification("Success", "The secret version has been created."));
                     }
                     catch (KeyVaultInsufficientPrivilegesException ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
                     }
                     catch (Exception ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
                     }
                     finally
                     {
@@ -351,7 +353,7 @@ private async Task NewVersion()
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
     }
 
@@ -399,11 +401,11 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
         catch (Exception ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
         }
     }
 }