Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Show each databucket category in its own table (#2159)
Leendert de Borst306f3c2fb495
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razorindex c5c471366..e83e69521 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/View/Components/DataBucketTable.razor@@ -1,4 +1,5 @@@using AliasVault.RazorComponents.Tables+@using AliasVault.Shared.Models.WebApi.V2.Vault@if (Revisions.Count == 0){@@ -8,29 +9,41 @@}else{- <SortableTable Columns="@_bucketTableColumns" SortColumn="@SortColumn" SortDirection="@SortDirection" OnSortChanged="HandleSortChanged">- @foreach (var entry in SortedRevisions)+ <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">+ @foreach (var bucket in BucketGroups){- <SortableTableRow>- <SortableTableColumn IsPrimary="true">@entry.Category</SortableTableColumn>- <SortableTableColumn>@entry.RevisionNumber</SortableTableColumn>- <SortableTableColumn>@entry.UpdatedAt.ToString("yyyy-MM-dd HH:mm")</SortableTableColumn>- <SortableTableColumn>@StatisticsService.FormatBytes(entry.SizeBytes)</SortableTableColumn>- <SortableTableColumn>- @if (entry.IsCurrent)+ <div>+ <div class="mb-2 flex items-baseline gap-2">+ <h5 class="text-base font-semibold text-gray-900 dark:text-white">@bucket.Key</h5>+ <span class="text-sm text-gray-500 dark:text-gray-400">+ @bucket.Count() revisions · @StatisticsService.FormatBytes(bucket.Sum(x => x.SizeBytes))+ </span>+ </div>+ <SortableTable Columns="@_bucketTableColumns" SortColumn="@SortColumn" SortDirection="@SortDirection" OnSortChanged="HandleSortChanged">+ @foreach (var entry in SortList(bucket, SortColumn, SortDirection)){- <span class="bg-blue-100 text-blue-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">Current</span>+ <SortableTableRow>+ <SortableTableColumn IsPrimary="true">@entry.RevisionNumber</SortableTableColumn>+ <SortableTableColumn>@entry.UpdatedAt.ToString("yyyy-MM-dd HH:mm")</SortableTableColumn>+ <SortableTableColumn>@StatisticsService.FormatBytes(entry.SizeBytes)</SortableTableColumn>+ <SortableTableColumn>+ @if (entry.IsCurrent)+ {+ <span class="bg-blue-100 text-blue-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">Current</span>+ }+ </SortableTableColumn>+ <SortableTableColumn>+ @if (!entry.IsCurrent)+ {+ <Button OnClick="() => RestoreAsync(entry)">Restore</Button>+ }+ </SortableTableColumn>+ </SortableTableRow>}- </SortableTableColumn>- <SortableTableColumn>- @if (!entry.IsCurrent)- {- <Button OnClick="() => RestoreAsync(entry)">Restore</Button>- }- </SortableTableColumn>- </SortableTableRow>+ </SortableTable>+ </div>}- </SortableTable>+ </div>}@code {@@ -46,11 +59,10 @@ else[Parameter]public EventCallback<BucketRevisionRow> OnRestore { get; set; }- private string SortColumn { get; set; } = "Category";- private SortDirection SortDirection { get; set; } = SortDirection.Ascending;+ private string SortColumn { get; set; } = "RevisionNumber";+ private SortDirection SortDirection { get; set; } = SortDirection.Descending;private readonly List<TableColumn> _bucketTableColumns = [- new TableColumn { Title = "Bucket", PropertyName = "Category" },new TableColumn { Title = "Revision", PropertyName = "RevisionNumber" },new TableColumn { Title = "Written", PropertyName = "UpdatedAt" },new TableColumn { Title = "Size", PropertyName = "SizeBytes" },@@ -58,8 +70,14 @@ elsenew TableColumn { Title = "Actions", Sortable = false },];- private IEnumerable<BucketRevisionRow> SortedRevisions => SortList(Revisions, SortColumn, SortDirection);+ /// <summary>+ /// Gets one group per bucket category.+ /// </summary>+ private IEnumerable<IGrouping<VaultDataBucketCategory, BucketRevisionRow>> BucketGroups => Revisions.GroupBy(x => x.Category).OrderBy(g => g.Key);+ /// <summary>+ /// Applies the sort to every bucket table.+ /// </summary>private void HandleSortChanged((string column, SortDirection direction) sort){SortColumn = sort.column;@@ -67,17 +85,13 @@ elseStateHasChanged();}- private static IEnumerable<BucketRevisionRow> SortList(List<BucketRevisionRow> revisions, string sortColumn, SortDirection sortDirection)+ private static IEnumerable<BucketRevisionRow> SortList(IEnumerable<BucketRevisionRow> revisions, string sortColumn, SortDirection sortDirection){return sortColumn switch{- "Category" => sortDirection == SortDirection.Ascending- ? revisions.OrderBy(v => v.Category).ThenByDescending(v => v.RevisionNumber)- : revisions.OrderByDescending(v => v.Category).ThenByDescending(v => v.RevisionNumber),- "RevisionNumber" => SortableTable.SortListByProperty(revisions, v => v.RevisionNumber, sortDirection),"UpdatedAt" => SortableTable.SortListByProperty(revisions, v => v.UpdatedAt, sortDirection),"SizeBytes" => SortableTable.SortListByProperty(revisions, v => v.SizeBytes, sortDirection),- _ => revisions+ _ => SortableTable.SortListByProperty(revisions, v => v.RevisionNumber, sortDirection),};}diff --git a/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css b/apps/server/AliasVault.Admin/wwwroot/css/tailwind.cssindex 2edd9be34..e29ae6504 100644--- a/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css+++ b/apps/server/AliasVault.Admin/wwwroot/css/tailwind.css@@ -2704,6 +2704,10 @@ video {grid-template-columns: repeat(4, minmax(0, 1fr));}+ .lg\:grid-cols-2 {+ grid-template-columns: repeat(2, minmax(0, 1fr));+ }+.lg\:flex-row {flex-direction: row;}@@ -2766,6 +2770,10 @@ video {grid-column: span 2 / span 2;}+ .\32xl\:grid-cols-3 {+ grid-template-columns: repeat(3, minmax(0, 1fr));+ }+.\32xl\:space-x-4 > :not([hidden]) ~ :not([hidden]) {--tw-space-x-reverse: 0;margin-right: calc(1rem * var(--tw-space-x-reverse));