dan/Walleby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to fully delete items from the DB

Browse Source
This commit is contained in:
TheXamlGuy
2024-06-23 09:58:19 +01:00
parent 95de9d187f
commit db20ee15cc
18 changed files with 98 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit
+1 -1
Submodule Toolkit updated: 4a33a1931f...f993e1d44b
Wallet.Avalonia/App.axaml.cs
+3 -1
View File
@@ -105,6 +105,7 @@ public partial class App : Application
services.AddHandler<QueryWalletHandler>();
services.AddHandler<RequestItemHandler>();
services.AddHandler<CreateItemHandler>();
services.AddHandler<DeleteItemHandler>();
services.AddHandler<UpdateItemHander>();
services.AddHandler<UpdateItemStateHandler>();
services.AddHandler<CountCategoriesHandler>();
@@ -181,7 +182,8 @@ public partial class App : Application
services.AddHandler<ConfirmUpdateItemHandler>(nameof(ItemState.Write));
services.AddHandler<ConfirmCreateItemHandler>(nameof(ItemState.New));
services.AddHandler<ConfirmDeleteItemHandler>();
services.AddHandler<HyperlinkHandler>();
services.AddHandler<ItemChangedHandler>(ServiceLifetime.Singleton);
Wallet.Avalonia/ArchiveItemActionView.axaml
+1 -1
View File
@@ -16,7 +16,7 @@
Margin="0,3,0,0"
VerticalAlignment="Center"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="16"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
Text="&#xE073;" />
</Button>
Wallet.Avalonia/ConfirmItemActionView.axaml
+1 -1
View File
@@ -15,7 +15,7 @@
Margin="0,3,0,0"
VerticalAlignment="Center"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="16"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
Text="&#xE3EA;" />
</Button>
Wallet.Avalonia/DeleteItemActionView.axaml
+3 -3
View File
@@ -14,9 +14,9 @@
<TextBlock
Margin="0,3,0,0"
VerticalAlignment="Center"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
FontSize="16"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
Text="&#xE107;" />
Text="&#xE5B9;" />
</Button>
</UserControl>
Wallet.Avalonia/DismissItemActionView.axaml
+1 -1
View File
@@ -15,7 +15,7 @@
Margin="0,3,0,0"
VerticalAlignment="Center"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="16"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
Text="&#xE607;" />
</Button>
Wallet.Avalonia/EditItemActionView.axaml
+1 -1
View File
@@ -15,7 +15,7 @@
Margin="0,3,0,0"
VerticalAlignment="Center"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="16"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
Text="&#xE759;" />
</Button>
Wallet.Avalonia/FavouriteItemActionView.axaml
+2 -2
View File
@@ -14,14 +14,14 @@
<TextBlock
VerticalAlignment="Center"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="16"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
IsVisible="{Binding !Value}"
Text="&#xEF61;" />
<TextBlock
VerticalAlignment="Center"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="16"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
IsVisible="{Binding Value}"
Text="&#xEF60;" />
Wallet.Avalonia/ItemSectionView.axaml
+5
View File
@@ -5,6 +5,11 @@
xmlns:vm="using:Wallet"
x:DataType="vm:ItemSectionViewModel">
<ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}">
<ItemsControl.Styles>
<Style Selector="ContentPresenter">
<Setter Property="IsTabStop" Value="False" />
</Style>
</ItemsControl.Styles>
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical" Spacing="4" />
Wallet.Avalonia/ItemView.axaml
+7
View File
@@ -2,8 +2,15 @@
x:Class="Wallet.Avalonia.ItemView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="using:FluentAvalonia.UI.Controls"
xmlns:vm="using:Wallet"
x:DataType="vm:ItemViewModel">
<UserControl.Styles>
<Style Selector="ui|SettingsExpander">
<Setter Property="IsTabStop" Value="False" />
<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
</Style>
</UserControl.Styles>
<Interaction.Behaviors>
<AttachedBehaviour>
<NavigateAction
Wallet.Avalonia/UnarchiveItemActionView.axaml
+3 -3
View File
@@ -10,12 +10,12 @@
VerticalAlignment="Center"
Command="{Binding InvokeCommand}"
Foreground="{DynamicResource IconForegroundBrush}"
ToolTip.Tip="Unarchive">
ToolTip.Tip="Restore">
<TextBlock
VerticalAlignment="Center"
FontFamily="{DynamicResource FluentThemeFontFamily}"
FontSize="16"
FontSize="18"
Foreground="{DynamicResource IconForegroundBrush}"
Text="&#xF1A0;" />
Text="&#xE075;" />
</Button>
</UserControl>
Wallet.Data/LockerContext.cs
+4 -2
View File
@@ -15,10 +15,12 @@ public class WalletContext(DbContextOptions<WalletContext> options) :
{
modelBuilder.Entity<ItemEntry>()
.HasMany(x => x.Tags)
.WithOne();
.WithOne()
.OnDelete(DeleteBehavior.Cascade);
modelBuilder.Entity<ItemEntry>()
.HasMany(x => x.Blobs)
.WithOne();
.WithOne()
.OnDelete(DeleteBehavior.Cascade);
}
}
Wallet/ConfirmDeleteItemHandler.cs
+30
View File
@@ -0,0 +1,30 @@
using Toolkit.Foundation;
namespace Wallet;
public class ConfirmDeleteItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
ICache<Item<(Guid, string)>> cache,
IMediator mediator,
IPublisher publisher) :
INotificationHandler<DeleteEventArgs<Item>>
{
public async Task Handle(DeleteEventArgs<Item> args)
{
try
{
if (decoratorService.Service is Item<(Guid, string)> item)
{
(Guid id, string name) = item.Value;
await mediator.Handle<DeleteEventArgs<Item<Guid>>,
bool>(new DeleteEventArgs<Item<Guid>>(new Item<Guid>(id)));
cache.Add(item);
publisher.Publish(Changed.As<Item>());
}
}
catch
{
}
}
}
Wallet/DeleteItemHandler.cs
+26
View File
@@ -0,0 +1,26 @@
using Microsoft.EntityFrameworkCore;
using Toolkit.Foundation;
using Wallet.Data;
namespace Wallet;
public class DeleteItemHandler(IDbContextFactory<WalletContext> dbContextFactory) :
IHandler<DeleteEventArgs<Item<Guid>>, bool>
{
public async Task<bool> Handle(DeleteEventArgs<Item<Guid>> args,
CancellationToken cancellationToken)
{
if (args.Sender is Item<Guid> item)
{
Guid id = item.Value;
using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken);
if (await context.FindAsync<ItemEntry>(id) is ItemEntry result)
{
context.Items.Remove(result);
await context.SaveChangesAsync(cancellationToken);
}
}
return false;
}
}
Wallet/ItemNavigationViewModel.cs
+7 -4
View File
@@ -23,6 +23,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
INotificationHandler<UnarchiveEventArgs<Item>>,
INotificationHandler<FavouriteEventArgs<Item>>,
INotificationHandler<UnfavouriteEventArgs<Item>>,
INotificationHandler<DeleteEventArgs<Item>>,
INotificationHandler<NotifyEventArgs<ItemHeader<string>>>,
IKeyed<Guid>,
ISelectable,
@@ -43,15 +44,14 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
[ObservableProperty]
private Guid id = id;
[ObservableProperty]
private bool isSelected = isSelected;
[ObservableProperty]
private string? name = name;
[ObservableProperty]
private string named = $"{named}";
[ObservableProperty]
private bool isSelected = isSelected;
public IContentTemplate Template { get; set; } = template;
public Task Handle(ArchiveEventArgs<Item> args) =>
@@ -75,4 +75,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
return Task.CompletedTask;
}
public Task Handle(DeleteEventArgs<Item> args) =>
Task.Run(Dispose);
}
Wallet/ItemViewModel.cs
+1
View File
@@ -108,6 +108,7 @@ public partial class ItemViewModel :
Publisher.Publish(Notify.As(Factory.Create<ItemCommandHeaderCollection>(new List<IDisposable>
{
Factory.Create<UnarchiveItemActionViewModel>(),
Factory.Create<DeleteItemActionViewModel>(),
})));
}
else
Wallet/UpdateItemHander.cs
+1 -1
View File
@@ -12,7 +12,7 @@ public class UpdateItemHander(IDbContextFactory<WalletContext> dbContextFactory)
public async Task<bool> Handle(UpdateEventArgs<Item<(Guid, string, ItemConfiguration)>> args,
CancellationToken cancellationToken)
{
if (args.Value is Item<(Guid, string, ItemConfiguration)> item)
if (args.Sender is Item<(Guid, string, ItemConfiguration)> item)
{
(Guid id, string name, ItemConfiguration configuration) = item.Value;
Wallet/UpdateItemStateHandler.cs
+1 -1
View File
@@ -10,7 +10,7 @@ public class UpdateItemStateHandler(IDbContextFactory<WalletContext> dbContextFa
public async Task<bool> Handle(UpdateEventArgs<(Guid, int)> args,
CancellationToken cancellationToken)
{
if (args.Value is (Guid id, int state))
if (args.Sender is (Guid id, int state))
{
using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken);
if (await context.FindAsync<ItemEntry>(id) is ItemEntry result)