Add contextual commands

Bitvault.Avalonia/App.axaml.cs

@@ -83,7 +83,7 @@ public partial class App : Application
                         services.AddScoped<ContainerViewModelConfiguration>();
 
                         services.AddTemplate<ContainerViewModel, ContainerView>("Container");
-                        services.AddHandler<EnumerateContainerViewModelHandler>();
+                        services.AddHandler<AggerateContainerViewModelHandler>();
 
                         services.AddTemplate<SearchContainerActionViewModel, SearchContainerActionView>();
                         services.AddTemplate<ContainerHeaderViewModel, ContainerHeaderView>("ContainerHeader");
@@ -119,7 +119,7 @@ public partial class App : Application
                 services.AddInitializer<ContainerInitializer>();
 
                 services.AddTemplate<MainViewModel, MainView>("Main");
-                services.AddHandler<MainViewModelHandler>();
+                services.AddHandler<AggerateMainViewModelHandler>();
 
                 services.AddTransient<FooterViewModel>();
 

Bitvault.Avalonia/ContainerView.axaml

@@ -47,12 +47,8 @@
             BorderThickness="1,1,0,0"
             CornerRadius="8 0 0 0">
             <Grid RowDefinitions="Auto, *">
-                <Border
+                <Border Grid.Row="0" Padding="4">
-                    Grid.Row="0"
+                    <ContentControl>
-                    Padding="4"
-                    BorderBrush="{DynamicResource DividerStrokeColorDefaultBrush}"
-                    BorderThickness="0,0,0,1">
-                    <ContentControl x:Name="ContentHeader">
                         <Interaction.Behaviors>
                             <AttachedBehaviour>
                                 <NavigateRegionAction Name="{Binding Named, StringFormat='{}{0}:ContentHeader'}" />

Bitvault.Avalonia/CreateItemActionView.axaml

@@ -15,10 +15,6 @@
         ToolTip.Tip="Add item">
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-                <NavigateAction
-                    Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
-                    Route="ItemCommandHeader"
-                    Scope="self" />
                 <NavigateAction
                     Region="{Binding Named, StringFormat='{}{0}:Content'}"
                     Route="Item"

Bitvault.Avalonia/ItemNavigationView.axaml

@@ -14,13 +14,7 @@
             <NavigateAction
                 Region="{Binding Named, StringFormat='{}{0}:Content'}"
                 Route="Item"
-                Scope="self">
+                Scope="self" />
-                <NavigateAction.ParameterBindings>
-                    <ParameterBinding Key="Immutable" Value="{x:True}" />
-                    <ParameterBinding Key="Id" Value="{Binding Id}" />
-                    <ParameterBinding Key="Name" Value="{Binding Name}" />
-                </NavigateAction.ParameterBindings>
-            </NavigateAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
     <Grid Background="Transparent" ColumnDefinitions="Auto,*">

Bitvault/AggerateContainerViewModelHandler.cs

@@ -3,13 +3,14 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class EnumerateContainerViewModelHandler(IMediator mediator,
+public class AggerateContainerViewModelHandler(IMediator mediator,
     IServiceProvider serviceProvider,
     ICache<Item> cache,
     IPublisher publisher) :
-    INotificationHandler<Enumerate<ItemNavigationViewModel, ContainerViewModelConfiguration>>
+    INotificationHandler<Aggerate<ItemNavigationViewModel, ContainerViewModelConfiguration>>
 {
-    public async Task Handle(Enumerate<ItemNavigationViewModel, ContainerViewModelConfiguration> args)
+    public async Task Handle(Aggerate<ItemNavigationViewModel, 
+        ContainerViewModelConfiguration> args)
     {
         if (args.Options is ContainerViewModelConfiguration configuration)
         {

Bitvault/AggerateMainViewModelHandler.cs

@@ -3,11 +3,11 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class MainViewModelHandler(IPublisher publisher,
+public class AggerateMainViewModelHandler(IPublisher publisher,
     IContainerHostCollection containers) :
-    INotificationHandler<EnumerateEventArgs<IMainNavigationViewModel>>
+    INotificationHandler<AggerateEventArgs<IMainNavigationViewModel>>
 {
-    public Task Handle(EnumerateEventArgs<IMainNavigationViewModel> args)
+    public Task Handle(AggerateEventArgs<IMainNavigationViewModel> args)
     {
         foreach (IComponentHost container in containers.OrderBy(x => x.GetConfiguration<ContainerConfiguration>() 
             is ContainerConfiguration configuration ? configuration.Name : null))
@@ -18,7 +18,7 @@ public class MainViewModelHandler(IPublisher publisher,
                 {
                     if (factory.Create<ContainerNavigationViewModel>(configuration.Name) is ContainerNavigationViewModel viewModel)
                     {
-                        publisher.Publish(new CreateEventArgs<IMainNavigationViewModel>(viewModel),
+                        publisher.Publish(Create.As<IMainNavigationViewModel>(viewModel),
                             nameof(MainViewModel));
                     }
                 }

Bitvault/ArchiveItemActionViewModel.cs

@@ -8,7 +8,8 @@ public partial class ArchiveItemActionViewModel(IServiceProvider provider,
     IMediator mediator,
     IPublisher publisher,
     ISubscription subscriber,
-    IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
+    IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer),
+    IRemovable
 {
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Archive.As<Item>());

Bitvault/CommandCollection.cs

@@ -0,0 +1,12 @@
+using System.Collections.ObjectModel;
+
+namespace Bitvault;
+
+public class CommandCollection :
+    ReadOnlyCollection<IDisposable>
+{
+    public CommandCollection(IList<IDisposable> list) : base(list)
+    {
+
+    }
+}

Bitvault/ContainerViewModel.cs

@@ -1,17 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.EntityFrameworkCore;
-using System.Collections.ObjectModel;
 using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class ItemCommandCollection : ObservableCollection
-{
-    public void Add<TItem>(IDisposable diposer)
-    {
-
-    }
-}
 
 [Enumerate(nameof(ContainerViewModel))]
 public partial class ContainerViewModel(IServiceProvider provider,
@@ -48,7 +39,7 @@ public partial class ContainerViewModel(IServiceProvider provider,
         if (args.Value is Filter filter)
         {
             configuration = configuration with { Filter = filter.Value };
-            Enumerate();
+            Aggerate();
         }
 
         return Task.CompletedTask;
@@ -58,12 +49,12 @@ public partial class ContainerViewModel(IServiceProvider provider,
         if (args.Value is Search search)
         {
             configuration = configuration with { Query = search.Value };
-            Enumerate();
+            Aggerate();
         }
 
         return Task.CompletedTask;
     }
 
-    protected override IEnumerate PrepareEnumeration(object? key) =>
+    protected override IAggerate OnAggerate(object? key) =>
-        EnumerateEventArgs<ItemNavigationViewModel>.With(configuration) with { Key = key };
+        AggerateEventArgs<ItemNavigationViewModel>.With(configuration) with { Key = key };
 }

Bitvault/ItemCommandHeaderViewModel.cs

@@ -2,24 +2,30 @@
 
 namespace Bitvault;
 
-public partial class ItemCommandHeaderViewModel : ObservableCollection
+public partial class ItemCommandHeaderViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscription subscriber,
+    IDisposer disposer,
+    IContentTemplate template) : 
+    ObservableCollection(provider, factory, mediator, publisher, subscriber, disposer),
+    INotificationHandler<NotifyEventArgs<CommandCollection>>
 {
-    public ItemCommandHeaderViewModel(IServiceProvider provider, 
+    public IContentTemplate Template { get; set; } = template;
-        IServiceFactory factory,
+
-        IMediator mediator, 
+    public Task Handle(NotifyEventArgs<CommandCollection> args)
-        IPublisher publisher, 
-        ISubscription subscriber, 
-        IDisposer disposer,
-        IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-        Add<ConfirmItemActionViewModel>();
+        Clear();
-        Add<DismissItemActionViewModel>();
-        Add<EditItemActionViewModel>();
-        Add<DeleteItemActionViewModel>();
-        Add<ArchiveItemActionViewModel>();
 
-        Template = template;
+        if (args.Value is CommandCollection commandCollection)
+        {
+            foreach (IDisposable command in commandCollection)
+            {
+                Add(command);
+            }
+        }
+
+        return Task.CompletedTask;
     }
-
-    public IContentTemplate Template { get; set; }
 }

Bitvault/ItemViewModel.cs

@@ -1,33 +1,25 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using Toolkit.Foundation;
-using Toolkit.Foundation;
 
 namespace Bitvault;
 
 public partial class ItemViewModel : 
     ObservableCollection<IDisposable>
 {
-    [ObservableProperty]
-    private int? id;
-
-    [ObservableProperty]
-    private bool immutable;
-
     public ItemViewModel(IServiceProvider provider, 
         IServiceFactory factory, 
         IMediator mediator,
         IPublisher publisher, 
         ISubscription subscriber, 
         IDisposer disposer,
-        IContentTemplate template,
+        IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
-        bool immutable = true,
-        int? id = null,
-        string? name = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
         Template = template;
-        Id = id;
-        Immutable = immutable;
 
-        Add<ItemHeaderViewModel>(immutable, name ?? "");
+        Publisher.Publish(Notify.As(Factory.Create<CommandCollection>(new List<IDisposable>
+        {
+            Factory.Create<EditItemActionViewModel>(),
+            Factory.Create<ArchiveItemActionViewModel>(),
+        })));
     }
 
     public IContentTemplate Template { get; set; }