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 @@