From 96a7fbaf3bad25b56dc34b0df67de0733fba04ae Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Mon, 8 Jul 2024 11:25:50 +0200 Subject: [PATCH] Add vault decrypt error message (#74) --- .../AliasVault.WebApp.csproj | 3 + .../Main/Layout/DbStatusIndicator.razor | 4 +- .../Main/Layout/MainLayout.razor | 41 +-- .../StatusMessages/ErrorVaultDecrypt.razor | 8 + .../VaultDecryptionProgress.razor | 12 + .../Services/Database/DbService.cs | 17 +- .../Services/Database/DbServiceState.cs | 15 +- .../wwwroot/appsettings.Development.json | 4 + ...0708083723_100InitialMigration.Designer.cs | 278 ++++++++++++++++++ .../20240708083723_100InitialMigration.cs | 170 +++++++++++ .../AliasClientDbContextModelSnapshot.cs | 275 +++++++++++++++++ 11 files changed, 794 insertions(+), 33 deletions(-) create mode 100644 src/AliasVault.WebApp/Main/Layout/StatusMessages/ErrorVaultDecrypt.razor create mode 100644 src/AliasVault.WebApp/Main/Layout/StatusMessages/VaultDecryptionProgress.razor create mode 100644 src/AliasVault.WebApp/wwwroot/appsettings.Development.json create mode 100644 src/Databases/AliasClientDb/Migrations/20240708083723_100InitialMigration.Designer.cs create mode 100644 src/Databases/AliasClientDb/Migrations/20240708083723_100InitialMigration.cs create mode 100644 src/Databases/AliasClientDb/Migrations/AliasClientDbContextModelSnapshot.cs diff --git a/src/AliasVault.WebApp/AliasVault.WebApp.csproj b/src/AliasVault.WebApp/AliasVault.WebApp.csproj index 926557f7f..90aa4b9a8 100644 --- a/src/AliasVault.WebApp/AliasVault.WebApp.csproj +++ b/src/AliasVault.WebApp/AliasVault.WebApp.csproj @@ -70,6 +70,9 @@ .dockerignore + + PreserveNewest + diff --git a/src/AliasVault.WebApp/Main/Layout/DbStatusIndicator.razor b/src/AliasVault.WebApp/Main/Layout/DbStatusIndicator.razor index 2906b1c8e..13ead567a 100644 --- a/src/AliasVault.WebApp/Main/Layout/DbStatusIndicator.razor +++ b/src/AliasVault.WebApp/Main/Layout/DbStatusIndicator.razor @@ -34,13 +34,13 @@ else private async void OnDatabaseStateChanged(object? sender, DbServiceState.DatabaseState newState) { await InvokeAsync(StateHasChanged); - if (newState.Status == DbServiceState.DatabaseStatus.Saving) + if (newState.Status == DbServiceState.DatabaseStatus.SavingToServer) { // Show loading indicator for at least 0.5 seconds even if the save operation is faster. Message = "Saving..."; await ShowLoadingIndicatorAsync(); } - else if (newState.Status == DbServiceState.DatabaseStatus.Loading) + else if (newState.Status == DbServiceState.DatabaseStatus.LoadingFromServer) { Message = "Loading..."; await ShowLoadingIndicatorAsync(); diff --git a/src/AliasVault.WebApp/Main/Layout/MainLayout.razor b/src/AliasVault.WebApp/Main/Layout/MainLayout.razor index f0bf8d209..1750d31e7 100644 --- a/src/AliasVault.WebApp/Main/Layout/MainLayout.razor +++ b/src/AliasVault.WebApp/Main/Layout/MainLayout.razor @@ -2,9 +2,7 @@ @implements IDisposable @inject DbService DbService @inject AuthenticationStateProvider AuthStateProvider -@inject NavigationManager NavigationManager -@using Microsoft.AspNetCore.Components.Authorization -@using AliasVault.WebApp.Providers +@using AliasVault.WebApp.Main.Layout.StatusMessages @@ -19,20 +17,13 @@