Fix some edge cases

This commit is contained in:
TheXamlGuy
2024-05-14 16:52:47 +01:00
parent 942601d950
commit 72bededc3a
27 changed files with 197 additions and 29 deletions
+10
View File
@@ -0,0 +1,10 @@
namespace Bitvault;
public record Archive
{
public static ArchiveEventArgs<TValue> As<TValue>(TValue value) =>
new(value);
public static ArchiveEventArgs<TValue> As<TValue>() where TValue : new() =>
new(new TValue());
}
+3
View File
@@ -0,0 +1,3 @@
namespace Bitvault;
public record ArchiveEventArgs<TValue>(TValue Value);
+15
View File
@@ -0,0 +1,15 @@
using CommunityToolkit.Mvvm.Input;
using Toolkit.Foundation;
namespace Bitvault;
public partial class ArchiveItemActionViewModel(IServiceProvider provider,
IServiceFactory factory,
IMediator mediator,
IPublisher publisher,
ISubscriber subscriber,
IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
{
[RelayCommand]
public async Task Invoke() => await Publisher.Publish(Archive.As<Item>());
}
+3 -3
View File
@@ -3,7 +3,7 @@
namespace Bitvault;
public partial class ContainerHeaderViewModel : ObservableCollectionViewModel<string, IDisposable>,
INotificationHandler<ActivateEventArgs<Filter<string>>>
INotificationHandler<RequestEventArgs<Filter<string>>>
{
public ContainerHeaderViewModel(IServiceProvider provider,
IServiceFactory factory,
@@ -15,12 +15,12 @@ public partial class ContainerHeaderViewModel : ObservableCollectionViewModel<st
{
Template = template;
Add<AddItemActionViewModel>(scope: true);
Add<CreateItemActionViewModel>(scope: true);
}
public IContentTemplate Template { get; set; }
public Task Handle(ActivateEventArgs<Filter<string>> args,
public Task Handle(RequestEventArgs<Filter<string>> args,
CancellationToken cancellationToken = default)
{
if (args.Value is Filter<string> filter)
@@ -3,7 +3,7 @@ using Toolkit.Foundation;
namespace Bitvault;
public partial class AddItemActionViewModel(IServiceProvider provider,
public partial class CreateItemActionViewModel(IServiceProvider provider,
IServiceFactory factory,
IMediator mediator,
IPublisher publisher,
+7 -2
View File
@@ -1,4 +1,5 @@
using Toolkit.Foundation;
using CommunityToolkit.Mvvm.Input;
using Toolkit.Foundation;
namespace Bitvault;
@@ -7,4 +8,8 @@ public partial class DeleteItemActionViewModel(IServiceProvider provider,
IMediator mediator,
IPublisher publisher,
ISubscriber subscriber,
IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
{
[RelayCommand]
public async Task Invoke() => await Publisher.Publish(Delete.As<Item>());
}
+7 -2
View File
@@ -1,4 +1,5 @@
using Toolkit.Foundation;
using CommunityToolkit.Mvvm.Input;
using Toolkit.Foundation;
namespace Bitvault;
@@ -7,5 +8,9 @@ public partial class EditItemActionViewModel(IServiceProvider provider,
IMediator mediator,
IPublisher publisher,
ISubscriber subscriber,
IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
{
[RelayCommand]
public async Task Invoke() => await Publisher.Publish(Edit.As<Item>());
}
@@ -38,5 +38,5 @@ public partial class FilterContainerNavigationViewModel : ObservableViewModel,
Task.FromResult(Activated = true);
[RelayCommand]
public async Task Invoke() => await Publisher.Publish(Request.As(new Filter<string>(Filter)));
public async Task Invoke() => await Publisher.Publish(Request.As(new Filter<string>(Filter)), nameof(ContainerViewModel));
}
+3
View File
@@ -14,6 +14,9 @@ public partial class ItemCommandHeaderViewModel : ObservableCollectionViewModel
{
Add<ConfirmItemActionViewModel>();
Add<DismissItemActionViewModel>();
Add<EditItemActionViewModel>();
Add<DeleteItemActionViewModel>();
Add<ArchiveItemActionViewModel>();
Template = template;
}
+6 -2
View File
@@ -1,4 +1,5 @@
using Toolkit.Foundation;
using CommunityToolkit.Mvvm.ComponentModel;
using Toolkit.Foundation;
namespace Bitvault;
@@ -8,10 +9,13 @@ public partial class ItemHeaderViewModel(IServiceProvider provider,
IPublisher publisher,
ISubscriber subscriber,
IDisposer disposer,
bool immutable,
string? value = null) : ObservableViewModel<string, string>(provider, factory, mediator, publisher, subscriber, disposer, value),
IItemViewModel
{
[ObservableProperty]
private bool immutable = immutable;
public void Invoke(ItemConfiguration args) =>
args.Name = Value;
}
+10 -1
View File
@@ -14,7 +14,9 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
int id,
string name,
string description) :
ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
INotificationHandler<ArchiveEventArgs<Item>>,
IRemovable
{
[ObservableProperty]
private string? description = description;
@@ -31,4 +33,11 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
[ObservableProperty]
private bool selected;
public IContentTemplate Template { get; set; } = template;
public Task Handle(ArchiveEventArgs<Item> args,
CancellationToken cancellationToken = default)
{
Dispose();
return Task.CompletedTask;
}
}
+6 -1
View File
@@ -13,6 +13,9 @@ public partial class ItemViewModel :
[ObservableProperty]
private string named;
[ObservableProperty]
private bool immutable;
public ItemViewModel(IServiceProvider provider,
IServiceFactory factory,
IMediator mediator,
@@ -21,14 +24,16 @@ public partial class ItemViewModel :
IDisposer disposer,
IContentTemplate template,
NamedComponent named,
bool immutable = true,
int? id = null,
string? name = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
{
Template = template;
Named = $"{named}";
Id = id;
Immutable = immutable;
Add<ItemHeaderViewModel>(name ?? "");
Add<ItemHeaderViewModel>(immutable, name ?? "");
}
public IContentTemplate Template { get; set; }