mirror/aliasvault
1
0
Fork 0
mirror of https://github.com/aliasvault/aliasvault.git synced 2025-12-23 22:28:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix related users navigation refresh in admin (#1400)

Browse Source
This commit is contained in:
Leendert de Borst
2025-11-26 11:09:41 +01:00
committed by Leendert de Borst
parent 6ebaf8e1b8
commit 23c9bf2fc9
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/RelatedUsersTable.razor
View File

@@ -15,6 +15,8 @@ else if (RelatedUsers.Any())
</SortableTableColumn>
<SortableTableColumn>@relatedUser.SharedIpAddresses.ToString("N0")</SortableTableColumn>
<SortableTableColumn>@relatedUser.MostRecentSharedIp</SortableTableColumn>
<SortableTableColumn>@relatedUser.CredentialsCount.ToString("N0")</SortableTableColumn>
<SortableTableColumn>@relatedUser.EmailClaimsCount.ToString("N0")</SortableTableColumn>
<SortableTableColumn>@relatedUser.RegistrationDate.ToString("yyyy-MM-dd HH:mm")</SortableTableColumn>
<SortableTableColumn><StatusPill Enabled="!relatedUser.IsBlocked" TextTrue="Active" TextFalse="Blocked" /></SortableTableColumn>
</SortableTableRow>
@@ -65,6 +67,8 @@ else
new TableColumn { Title = "Username", PropertyName = "Username" },
new TableColumn { Title = "Shared IPs", PropertyName = "SharedIpAddresses" },
new TableColumn { Title = "Most Recent IP", PropertyName = "MostRecentSharedIp" },
new TableColumn { Title = "Credentials", PropertyName = "CredentialsCount" },
new TableColumn { Title = "Email Claims", PropertyName = "EmailClaimsCount" },
new TableColumn { Title = "Registered", PropertyName = "RegistrationDate" },
new TableColumn { Title = "Status", PropertyName = "IsBlocked" },
];
@@ -152,15 +156,32 @@ else
TotalRelatedUsers = users.Count;
// Get vault statistics for all related users (from their latest vault)
var userIds = users.Select(u => u.Id).ToList();
var vaultStats = await dbContext.Vaults
.Where(v => userIds.Contains(v.UserId))
.GroupBy(v => v.UserId)
.Select(g => new
{
UserId = g.Key,
CredentialsCount = g.OrderByDescending(v => v.RevisionNumber).First().CredentialsCount,
EmailClaimsCount = g.OrderByDescending(v => v.RevisionNumber).First().EmailClaimsCount
})
.ToListAsync();
// Combine the data
RelatedUsers = (from user in users
join data in relatedUserData on user.UserName equals data.Username
join vaultStat in vaultStats on user.Id equals vaultStat.UserId into vaultGroup
from vault in vaultGroup.DefaultIfEmpty()
select new RelatedUserInfo
{
UserId = user.Id,
Username = user.UserName ?? "Unknown",
SharedIpAddresses = data.SharedIps,
MostRecentSharedIp = data.MostRecentSharedIp ?? "-",
CredentialsCount = vault?.CredentialsCount ?? 0,
EmailClaimsCount = vault?.EmailClaimsCount ?? 0,
RegistrationDate = user.CreatedAt,
IsBlocked = user.Blocked
})
@@ -186,6 +207,8 @@ else
"Username" => SortableTable.SortListByProperty(relatedUsers, r => r.Username, sortDirection),
"SharedIpAddresses" => SortableTable.SortListByProperty(relatedUsers, r => r.SharedIpAddresses, sortDirection),
"MostRecentSharedIp" => SortableTable.SortListByProperty(relatedUsers, r => r.MostRecentSharedIp, sortDirection),
"CredentialsCount" => SortableTable.SortListByProperty(relatedUsers, r => r.CredentialsCount, sortDirection),
"EmailClaimsCount" => SortableTable.SortListByProperty(relatedUsers, r => r.EmailClaimsCount, sortDirection),
"RegistrationDate" => SortableTable.SortListByProperty(relatedUsers, r => r.RegistrationDate, sortDirection),
"IsBlocked" => SortableTable.SortListByProperty(relatedUsers, r => r.IsBlocked, sortDirection),
_ => relatedUsers
@@ -206,6 +229,8 @@ else
public string Username { get; set; } = string.Empty;
public int SharedIpAddresses { get; set; }
public string MostRecentSharedIp { get; set; } = string.Empty;
public int CredentialsCount { get; set; }
public int EmailClaimsCount { get; set; }
public DateTime RegistrationDate { get; set; }
public bool IsBlocked { get; set; }
}

12
apps/server/AliasVault.Admin/Main/Pages/Users/View/Index.razor
View File

@@ -332,6 +332,18 @@ else
}
}
/// <inheritdoc />
protected override async Task OnParametersSetAsync()
{
await base.OnParametersSetAsync();
// Refresh data when navigating to a different user (e.g., clicking related user links)
if (!IsLoading && User?.Id != Id)
{
await RefreshData();
}
}
private async Task RefreshData()
{
IsLoading = true;