From 6c3f1561d9a3e9c5a16f0157cb84b437eb522caf Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 12 Sep 2025 12:18:24 +0100 Subject: [PATCH] Refactor delete methods for consistency and clarity --- Aaru.Server/Components/Admin/Pages/MediaFormats/View.razor.cs | 4 ++-- Aaru.Server/Components/Admin/Pages/Medias/View.razor.cs | 4 ++-- Aaru.Server/Components/Admin/Pages/MmcSds/View.razor.cs | 4 ++-- Aaru.Server/Components/Admin/Pages/Pcmcia/View.razor.cs | 4 ++-- Aaru.Server/Components/Admin/Pages/Scsi/Cdrom/List.razor.cs | 4 ++-- Aaru.Server/Components/Admin/Pages/Scsi/Modes/View.razor.cs | 4 ++-- Aaru.Server/Components/Admin/Pages/Scsi/Pages/View.razor.cs | 4 ++-- .../Components/Admin/Pages/SupportedDensities/View.razor.cs | 4 ++-- Aaru.Server/Components/Admin/Pages/Versions/View.razor.cs | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Aaru.Server/Components/Admin/Pages/MediaFormats/View.razor.cs b/Aaru.Server/Components/Admin/Pages/MediaFormats/View.razor.cs index 8705c52c..8fd269f4 100644 --- a/Aaru.Server/Components/Admin/Pages/MediaFormats/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/MediaFormats/View.razor.cs @@ -41,12 +41,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); MediaFormat? mediaFormat = await ctx.MediaFormats.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/Medias/View.razor.cs b/Aaru.Server/Components/Admin/Pages/Medias/View.razor.cs index b2539eb2..c7b196fc 100644 --- a/Aaru.Server/Components/Admin/Pages/Medias/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/Medias/View.razor.cs @@ -44,12 +44,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); Media? mediaFormat = await ctx.Medias.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/MmcSds/View.razor.cs b/Aaru.Server/Components/Admin/Pages/MmcSds/View.razor.cs index 93bf1631..165a2f1b 100644 --- a/Aaru.Server/Components/Admin/Pages/MmcSds/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/MmcSds/View.razor.cs @@ -41,12 +41,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); MmcSd? mmcSd = await ctx.MmcSd.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/Pcmcia/View.razor.cs b/Aaru.Server/Components/Admin/Pages/Pcmcia/View.razor.cs index f6afeaf8..780a3b6a 100644 --- a/Aaru.Server/Components/Admin/Pages/Pcmcia/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/Pcmcia/View.razor.cs @@ -40,12 +40,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); CommonTypes.Metadata.Pcmcia? pcmcia = await ctx.Pcmcia.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/Scsi/Cdrom/List.razor.cs b/Aaru.Server/Components/Admin/Pages/Scsi/Cdrom/List.razor.cs index eb44d08b..e9687c58 100644 --- a/Aaru.Server/Components/Admin/Pages/Scsi/Cdrom/List.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/Scsi/Cdrom/List.razor.cs @@ -56,12 +56,12 @@ public partial class List private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); CommonTypes.Metadata.Mmc? mmc = await ctx.Mmc.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/Scsi/Modes/View.razor.cs b/Aaru.Server/Components/Admin/Pages/Scsi/Modes/View.razor.cs index f301f6b9..334464ea 100644 --- a/Aaru.Server/Components/Admin/Pages/Scsi/Modes/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/Scsi/Modes/View.razor.cs @@ -41,12 +41,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); ScsiMode? mode = await ctx.ScsiMode.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/Scsi/Pages/View.razor.cs b/Aaru.Server/Components/Admin/Pages/Scsi/Pages/View.razor.cs index 325c3f79..599c6926 100644 --- a/Aaru.Server/Components/Admin/Pages/Scsi/Pages/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/Scsi/Pages/View.razor.cs @@ -41,12 +41,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); ScsiPage? page = await ctx.ScsiPage.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/SupportedDensities/View.razor.cs b/Aaru.Server/Components/Admin/Pages/SupportedDensities/View.razor.cs index 80789a04..8ec35406 100644 --- a/Aaru.Server/Components/Admin/Pages/SupportedDensities/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/SupportedDensities/View.razor.cs @@ -53,12 +53,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); SupportedDensity? supportedDensity = await ctx.SupportedDensity.FindAsync(id); diff --git a/Aaru.Server/Components/Admin/Pages/Versions/View.razor.cs b/Aaru.Server/Components/Admin/Pages/Versions/View.razor.cs index 5e50d248..3aead4a5 100644 --- a/Aaru.Server/Components/Admin/Pages/Versions/View.razor.cs +++ b/Aaru.Server/Components/Admin/Pages/Versions/View.razor.cs @@ -41,12 +41,12 @@ public partial class View private async Task ConfirmDelete() { - await DeleteVersionAsync(_deleteId); + await DeleteAsync(_deleteId); await HideDeleteModal(); await RefreshItemsAsync(); } - private async Task DeleteVersionAsync(int id) + private async Task DeleteAsync(int id) { await using DbContext ctx = await DbContextFactory.CreateDbContextAsync(); Version? version = await ctx.Versions.FindAsync(id);