Parameter improvements

Bitvault/AddItemContentNavigationViewModel.cs

@@ -1,17 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public partial class AddItemContentNavigationViewModel : Observable,
-    IItemEntryViewModel
-{
-    public AddItemContentNavigationViewModel(IServiceProvider provider,
-        IServiceFactory factory,
-        IMediator mediator, 
-        IPublisher publisher, 
-        ISubscription subscriber, 
-        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
-    {
-
-    }
-}

Bitvault/AddItemNavigationViewModel.cs

@@ -0,0 +1,11 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class AddItemNavigationViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscription subscriber,
+    IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer),
+    IItemEntryViewModel;

Bitvault/AggerateContainerCategoryViewModelHandler.cs

@@ -0,0 +1,21 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class AggerateContainerCategoryViewModelHandler(IServiceFactory serviceFactory,
+    IPublisher publisher) :
+    INotificationHandler<AggerateEventArgs<ItemNavigationViewModel,
+        ContainerViewModelConfiguration>>
+{
+    public Task Handle(AggerateEventArgs<ItemNavigationViewModel,
+    ContainerViewModelConfiguration> args)
+    {
+        if (serviceFactory.Create<ItemNavigationViewModel>() 
+            is ItemNavigationViewModel viewModel)
+        {
+            publisher.Publish(Create.As(viewModel), nameof(ContainerCategoryCollectionViewModel));
+        }
+
+        return Task.CompletedTask;
+    }
+}

Bitvault/AggerateContainerItemViewModelHandler.cs

@@ -3,11 +3,12 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class AggerateContainerViewModelHandler(IMediator mediator,
+public class AggerateContainerItemViewModelHandler(IMediator mediator,
     IServiceProvider serviceProvider,
     ICache<Item> cache,
     IPublisher publisher) :
-    INotificationHandler<AggerateEventArgs<ItemNavigationViewModel, ContainerViewModelConfiguration>>
+    INotificationHandler<AggerateEventArgs<ItemNavigationViewModel, 
+        ContainerViewModelConfiguration>>
 {
     public async Task Handle(AggerateEventArgs<ItemNavigationViewModel,
         ContainerViewModelConfiguration> args)
@@ -15,7 +16,6 @@ public class AggerateContainerViewModelHandler(IMediator mediator,
         if (args.Options is ContainerViewModelConfiguration configuration)
         {
             cache.Clear();
-            var dd = cache;
             bool selected = true;
 
             if (await mediator.Handle<RequestEventArgs<QueryContainerConfiguration>,
@@ -37,7 +37,7 @@ public class AggerateContainerViewModelHandler(IMediator mediator,
                         valueStore.Set(item);
 
                         cache.Add(item);
-                        publisher.Publish(Create.As(viewModel), nameof(ContainerViewModel));
+                        publisher.Publish(Create.As(viewModel), nameof(ContainerItemCollectionViewModel));
                     }
 
                     selected = false;

Bitvault/CommandCollection.cs

@@ -2,10 +2,7 @@
 
 namespace Bitvault;
 
-public class CommandCollection :
-    ReadOnlyCollection<IDisposable>
+public class CommandCollection(IList<IDisposable> list) :
+    ReadOnlyCollection<IDisposable>(list)
 {
-    public CommandCollection(IList<IDisposable> list) : base(list)
-    {
-    }
 }

Bitvault/ContainerCategoryCollectionViewModel.cs

@@ -0,0 +1,18 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+[Aggerate(nameof(ContainerCategoryCollectionViewModel))]
+public partial class ContainerCategoryCollectionViewModel :
+    ObservableCollection<ItemNavigationViewModel>
+{
+    public ContainerCategoryCollectionViewModel(IServiceProvider provider, 
+        IServiceFactory factory,
+        IMediator mediator,
+        IPublisher publisher,
+        ISubscription subscriber, 
+        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
+    {
+
+    }
+}

Bitvault/ContainerItemCollectionViewModel.cs

@@ -0,0 +1,54 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+[Aggerate(nameof(ContainerItemCollectionViewModel))]
+public partial class ContainerItemCollectionViewModel :
+    ObservableCollection<ItemNavigationViewModel>,
+    INotificationHandler<NotifyEventArgs<Filter>>,
+    INotificationHandler<NotifyEventArgs<Search>>
+{
+    private ContainerViewModelConfiguration configuration;
+
+    public ContainerItemCollectionViewModel(IServiceProvider provider,
+        IServiceFactory factory,
+        IMediator mediator,
+        IPublisher publisher,
+        ISubscription subscriber,
+        IDisposer disposer,
+        IContentTemplate template,
+        ContainerViewModelConfiguration configuration,
+        string? filter = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
+    {
+        Template = template;
+        this.configuration = configuration with { Filter = filter };
+    }
+
+    public IContentTemplate Template { get; set; }
+
+    public Task Handle(NotifyEventArgs<Filter> args)
+    {
+        if (args.Value is Filter filter)
+        {
+            configuration = configuration with { Filter = filter.Value };
+            BeginAggregation();
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public Task Handle(NotifyEventArgs<Search> args)
+    {
+        if (args.Value is Search search)
+        {
+            configuration = configuration with { Query = search.Value };
+            BeginAggregation();
+        }
+
+        return Task.CompletedTask;
+    }
+
+    protected override IAggerate OnPrepareAggregation(object? key) =>
+        Aggerate.With<ItemNavigationViewModel, ContainerViewModelConfiguration>(configuration)
+            with { Key = key };
+}

Bitvault/ContainerViewModel.cs

@@ -3,55 +3,25 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-[Aggerate(nameof(ContainerViewModel))]
-public partial class ContainerViewModel : ObservableCollection<ItemNavigationViewModel>,
-    INotificationHandler<NotifyEventArgs<Filter>>,
-    INotificationHandler<NotifyEventArgs<Search>>
+public partial class ContainerViewModel :
+    Observable
 {
     [ObservableProperty]
     private string named;
 
+    [ObservableProperty]
+    private string filter;
     public ContainerViewModel(IServiceProvider provider,
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
         ISubscription subscriber,
         IDisposer disposer,
-        IContentTemplate template,
-        ContainerViewModelConfiguration configuration,
         NamedComponent named,
-        string? filter = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
+        string filter) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-        Template = template;
         Named = $"{named}";
-
-        this.configuration = configuration with { Filter = filter };
-    }
-
-    private ContainerViewModelConfiguration configuration;
-
-    public IContentTemplate Template { get; set; }
-
-    public Task Handle(NotifyEventArgs<Filter> args)
-    {
-        if (args.Value is Filter filter)
-        {
-            configuration = configuration with { Filter = filter.Value };
-            BeginAggregation();
-        }
-
-        return Task.CompletedTask;
-    }
-
-    public Task Handle(NotifyEventArgs<Search> args)
-    {
-        if (args.Value is Search search)
-        {
-            configuration = configuration with { Query = search.Value };
-            BeginAggregation();
-        }
-
-        return Task.CompletedTask;
+        Filter = filter;
     }
 
     public override async Task OnActivated()
@@ -65,6 +35,4 @@ public partial class ContainerViewModel : ObservableCollection<ItemNavigationVie
         Publisher.Publish(Deactivated.As<Container>());
         await base.OnDeactivated();
     }
-    protected override IAggerate OnPrepareAggregation(object? key) =>
-        Aggerate.With<ItemNavigationViewModel, ContainerViewModelConfiguration>(configuration) with { Key = key };
 }

Bitvault/FilterContainerNavigationViewModel.cs

@@ -37,5 +37,5 @@ public partial class FilterContainerNavigationViewModel : Observable,
 
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Notify.As(new Filter(Filter)),
-        nameof(ContainerViewModel));
+        nameof(ContainerItemCollectionViewModel));
 }

Bitvault/ItemContentViewModel.cs

@@ -18,7 +18,7 @@ public partial class ItemContentViewModel :
 
         if (!immutable)
         {
-            Insert<AddItemContentNavigationViewModel>();
+            Insert<AddItemNavigationViewModel>();
         }
     }
 

Bitvault/ItemHeaderViewModel.cs

@@ -15,13 +15,13 @@ public partial class ItemHeaderViewModel : Observable<string, string>,
     private bool immutable;
 
     public ItemHeaderViewModel(IServiceProvider provider,
-    IServiceFactory factory,
-    IMediator mediator,
-    IPublisher publisher,
-    ISubscription subscriber,
-    IDisposer disposer,
-    bool immutable,
-    string? value = null) : base(provider, factory, mediator, publisher, subscriber, disposer, value)
+        IServiceFactory factory,
+        IMediator mediator,
+        IPublisher publisher,
+        ISubscription subscriber,
+        IDisposer disposer,
+        bool immutable,
+        string? value = null) : base(provider, factory, mediator, publisher, subscriber, disposer, value)
     {
         Immutable = immutable;
         Value = value;

Bitvault/SearchContainerActionViewModel.cs

@@ -17,5 +17,5 @@ public partial class SearchContainerActionViewModel(IServiceProvider provider,
 
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Notify.As(new Search(Value)),
-        nameof(ContainerViewModel));
+        nameof(ContainerItemCollectionViewModel));
 }