Add support for self scope

Bitvault.Avalonia/AddItemActionView.axaml

@@ -15,7 +15,10 @@
         ToolTip.Tip="Add item">
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-                <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddItem" />
+                <NavigateAction
+                    Context="{Binding Named, StringFormat='{}{0}:Content'}"
+                    Route="AddItem"
+                    Scope="self" />
             </EventTriggerBehavior>
         </Interaction.Behaviors>
     </Button>

Bitvault.Avalonia/AddItemView.axaml

@@ -6,7 +6,10 @@
     x:DataType="vm:AddItemViewModel">
     <Interaction.Behaviors>
         <EventTriggerBehavior EventName="Loaded">
-            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}" Route="AddVaultContentCommandHeader" />
+            <NavigateAction
+                Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
+                Route="AddVaultContentCommandHeader"
+                Scope="self" />
         </EventTriggerBehavior>
     </Interaction.Behaviors>
     <ScrollViewer Padding="12,12,12,0">

Bitvault.Avalonia/App.axaml.cs

@@ -49,12 +49,12 @@ public partial class App : Application
                         services.AddTransient<ISecurityKeyFactory, SecurityKeyFactory>();
                         services.AddTransient<IContainer, ContainerFactory>();
                         services.TryAddSingleton<IContainer<SecurityKey>, Container<SecurityKey>>();
-                        services.TryAddSingleton<IContainer<ContaienrConnection>, Container<ContaienrConnection>>();
+                        services.TryAddSingleton<IContainer<ContainerConnection>, Container<ContainerConnection>>();
 
                         services.AddDbContextFactory<VaultDbContext>((provider, args) =>
                         {
-                            if (provider.GetRequiredService<IContainer<ContaienrConnection>>() 
-                                is IContainer<ContaienrConnection> connection)
+                            if (provider.GetRequiredService<IContainer<ContainerConnection>>() 
+                                is IContainer<ContainerConnection> connection)
                             {
                                 args.UseSqlite($"{connection.Value}");
                             }
@@ -78,12 +78,12 @@ public partial class App : Application
                         services.AddTemplate<AddItemActionViewModel, AddItemActionView>();
 
                         services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
-                        services.AddTemplate<ItemViewModel, ItemView>("AddItem");
+                        services.AddTemplate<ItemViewModel, ItemView>("Item");
 
-                        services.AddTemplate<AddItemViewModel, AddItemView>("AddAddItem");
+                        services.AddTemplate<AddItemViewModel, AddItemView>("AddItem");
                         services.AddTemplate<AddItemCommandHeaderViewModel, AddItemCommandHeaderView>("AddVaultContentCommandHeader");
 
-                        services.AddTemplate<ConfirmItemActionViewModel, ConfirmVaultContentActionView>();
+                        services.AddTemplate<ConfirmItemActionViewModel, ConfirmItemActionView>();
                         services.AddTemplate<DismissItemActionViewModel, DismissItemActionView>();
 
                         services.AddTemplate<ItemHeaderViewModel, ItemHeaderView>();

Bitvault.Avalonia/Bitvault.Avalonia.csproj

@@ -49,6 +49,9 @@
 	  <Compile Update="AddItemView.axaml.cs">
 	    <DependentUpon>AddItemView.axaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="ConfirmItemActionView.axaml.cs">
+	    <DependentUpon>ConfirmItemActionView.axaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="CreateContainerNavigationView.axaml.cs">
 	    <DependentUpon>CreateContainerNavigationView.axaml</DependentUpon>
 	  </Compile>

Bitvault.Avalonia/ConfirmItemActionView.axaml

@@ -1,11 +1,14 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ConfirmVaultContentActionView"
+    x:Class="Bitvault.Avalonia.ConfirmItemActionView"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:ConfirmItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
         Height="{StaticResource ButtonHeight}"
         VerticalAlignment="Center"
+        Command="{Binding InvokeCommand}"
         Foreground="{DynamicResource IconForegroundBrush}"
         ToolTip.Tip="Save">
         <TextBlock

Bitvault.Avalonia/ConfirmItemActionView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ConfirmItemActionView : UserControl
+{
+    public ConfirmItemActionView() => InitializeComponent();
+}

Bitvault.Avalonia/ConfirmVaultContentActionView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class ConfirmVaultContentActionView : UserControl
-{
-    public ConfirmVaultContentActionView() => InitializeComponent();
-}

Bitvault.Avalonia/ItemNavigationView.axaml

@@ -8,7 +8,7 @@
     x:DataType="vm:ItemNavigationViewModel">
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
-            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddItem" />
+            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="Item" />
         </DataTriggerBehavior>
     </Interaction.Behaviors>
     <Grid ColumnDefinitions="Auto,*">

Bitvault/AddItemActionViewModel.cs

@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
 namespace Bitvault;
@@ -14,4 +15,7 @@ public partial class AddItemActionViewModel(IServiceProvider provider,
 
     [ObservableProperty]
     private string named = $"{named}";
+
+    [RelayCommand]
+    public async Task Invoke() => await Publisher.Publish(new Test());
 }

Bitvault/AddItemViewModel.cs

@@ -4,7 +4,8 @@ using Toolkit.Foundation;
 namespace Bitvault;
 
 public partial class AddItemViewModel : 
-    ObservableCollectionViewModel<IItemViewModel>
+    ObservableCollectionViewModel<IItemViewModel>,
+    INotificationHandler<Test>
 {
     [ObservableProperty]
     private string named;
@@ -36,4 +37,9 @@ public partial class AddItemViewModel :
 
         return Task.FromResult(true);
     }
+
+    public Task Handle(Test args, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
 }

Bitvault/ConfirmItemActionViewModel.cs

@@ -1,10 +1,17 @@
-using Toolkit.Foundation;
+using CommunityToolkit.Mvvm.Input;
+using Toolkit.Foundation;
 
 namespace Bitvault;
 
+public record Test;
+
 public partial class ConfirmItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     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(new Test());
+}

Bitvault/ContainerConnection.cs

@@ -1,6 +1,6 @@
 namespace Bitvault;
 
-public class ContaienrConnection(string connection)
+public class ContainerConnection(string connection)
 {
     private readonly string connection = connection;
 

Bitvault/ContainerFactory.cs

@@ -6,7 +6,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class ContainerFactory(IContainer<ContaienrConnection> connection,
+public class ContainerFactory(IContainer<ContainerConnection> connection,
     IHostEnvironment environment,
     IServiceProvider provider) :
     IContainer
@@ -14,7 +14,7 @@ public class ContainerFactory(IContainer<ContaienrConnection> connection,
     public async Task<bool> Create(string name, 
         SecurityKey key)
     {
-        connection.Set(new ContaienrConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
+        connection.Set(new ContainerConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
             $".vault;Mode=ReadWriteCreate;Pooling=false;Password={Convert.ToBase64String(key.DecryptedKey)}"));
 
         IDbContextFactory<VaultDbContext> dbContextFactory = provider.GetRequiredService<IDbContextFactory<VaultDbContext>>();

Bitvault/ContainerHeaderViewModel.cs

@@ -15,7 +15,7 @@ public partial class ContainerHeaderViewModel : ObservableCollectionViewModel<st
     {
         Template = template;
 
-        Add<AddItemActionViewModel>();
+        Add<AddItemActionViewModel>(scope: true);
     }
 
     public IContentTemplate Template { get; set; }

Bitvault/ItemNavigationViewModel.cs

@@ -13,7 +13,8 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     NamedComponent named,
     string name,
     string description) :
-    ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
+    ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
+    INotificationHandler<Test>
 {
     [ObservableProperty]
     private string? description = description;
@@ -27,4 +28,9 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     [ObservableProperty]
     private bool selected;
     public IContentTemplate Template { get; set; } = template;
+
+    public Task Handle(Test args, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
 }