From b8b95babe0f4c81b0adc61bb82da137f6da61941 Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Thu, 1 Aug 2024 20:41:45 +0200 Subject: [PATCH] Admin dashboard tweaks (#137) --- .../Main/Models/UserViewModel.cs | 5 +++++ src/AliasVault.Admin/Main/Pages/Emails.razor | 22 +++++++++++++------ .../Main/Pages/Users/Users.razor | 9 +++++++- .../Main/Pages/Users/View.razor | 3 +-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/AliasVault.Admin/Main/Models/UserViewModel.cs b/src/AliasVault.Admin/Main/Models/UserViewModel.cs index aa7ab643e..977b1d605 100644 --- a/src/AliasVault.Admin/Main/Models/UserViewModel.cs +++ b/src/AliasVault.Admin/Main/Models/UserViewModel.cs @@ -32,6 +32,11 @@ public class UserViewModel /// public int VaultCount { get; set; } + /// + /// Gets or sets the email claim count. + /// + public int EmailClaimCount { get; set; } + /// /// Gets or sets the total vault storage that this user takes up in kilobytes. /// diff --git a/src/AliasVault.Admin/Main/Pages/Emails.razor b/src/AliasVault.Admin/Main/Pages/Emails.razor index f747e0050..c4da2b83e 100644 --- a/src/AliasVault.Admin/Main/Pages/Emails.razor +++ b/src/AliasVault.Admin/Main/Pages/Emails.razor @@ -40,17 +40,25 @@ else @foreach (var email in EmailList) { - @email.Id - @email.DateSystem.ToString("yyyy-MM-dd HH:mm") - - @email.FromLocal@@@email.FromDomain + + @email.Id - @email.ToLocal@@@email.ToDomain + @email.DateSystem.ToString("yyyy-MM-dd HH:mm") - @email.Subject - @email.MessagePreview + @(email.FromLocal.Length > 15 ? email.FromLocal.Substring(0, 15) : email.FromLocal)@@@(email.FromDomain.Length > 15 ? email.FromDomain.Substring(0, 15) : email.FromDomain) + + + @email.ToLocal@@@email.ToDomain + + + @(email.Subject.Length > 30 ? email.Subject.Substring(0, 30) : email.Subject) + + + + @(email.MessagePreview?.Length > 30 ? email.MessagePreview.Substring(0, 30) : email.MessagePreview) + @email.Attachments.Count diff --git a/src/AliasVault.Admin/Main/Pages/Users/Users.razor b/src/AliasVault.Admin/Main/Pages/Users/Users.razor index cafc5c51f..f77e8e57c 100644 --- a/src/AliasVault.Admin/Main/Pages/Users/Users.razor +++ b/src/AliasVault.Admin/Main/Pages/Users/Users.razor @@ -33,6 +33,7 @@ else Registered Username # Vaults + # Email claims Storage Last vault update Actions @@ -46,6 +47,7 @@ else @user.CreatedAt.ToString("yyyy-MM-dd HH:mm") @user.UserName @user.VaultCount + @user.EmailClaimCount @Math.Round((double)user.VaultStorageInKb / 1024, 1) MB @user.LastVaultUpdate.ToString("yyyy-MM-dd HH:mm") @@ -122,7 +124,11 @@ else { v.FileSize, v.CreatedAt - }) + }), + EmailClaims = u.EmailClaims.Select(ec => new + { + ec.CreatedAt + }), }) .ToListAsync(); @@ -132,6 +138,7 @@ else UserName = user.UserName?.ToLower() ?? "N/A", CreatedAt = user.CreatedAt, VaultCount = user.Vaults.Count(), + EmailClaimCount = user.EmailClaims.Count(), VaultStorageInKb = user.Vaults.Sum(x => x.FileSize), LastVaultUpdate = user.Vaults.Max(x => x.CreatedAt), }).ToList(); diff --git a/src/AliasVault.Admin/Main/Pages/Users/View.razor b/src/AliasVault.Admin/Main/Pages/Users/View.razor index c1c20057b..c7174ea61 100644 --- a/src/AliasVault.Admin/Main/Pages/Users/View.razor +++ b/src/AliasVault.Admin/Main/Pages/Users/View.razor @@ -76,8 +76,7 @@ else ID Created - Filesize - DB version + Email