Enabled ability to order containers and the ability to insert new containers to their correct order

Bitvault.Avalonia/App.axaml.cs

@@ -49,7 +49,7 @@ public partial class App : Application
                         services.AddTransient<IKeyDeriver, KeyDeriver>();
 
                         services.AddTransient<ISecurityKeyFactory, SecurityKeyFactory>();
-                        services.AddTransient<IContainerFactory, ContainerFactory>();
+                        services.AddTransient<IContainerStorageFactory, ContainerStorageFactory>();
                         services.TryAddSingleton<IValueStore<SecurityKey>, ValueStore<SecurityKey>>();
                         services.TryAddSingleton<IValueStore<ContainerConnection>, ValueStore<ContainerConnection>>();
 
@@ -93,7 +93,7 @@ public partial class App : Application
                     });
                 })!);
 
-                services.AddTransient<IContainerComponentFactory,  ContainerComponentFactory>();
+                services.AddTransient<IContainerFactory,  ContainerFactory>();
                 services.AddHandler<CreateContainerHandler>();
 
                 services.AddSingleton<IContainerHostCollection, ContainerHostCollection>();

Bitvault/ContainerActivatedHandler.cs

@@ -1,22 +1,29 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public record ContainerActivatedHandler(IPublisher publisher) : 
+public class ContainerActivatedHandler(IContainerHostCollection containers,
+    IPublisher publisher) : 
     INotificationHandler<Activated<IComponentHost>>
 {
     public async Task Handle(Activated<IComponentHost> args, CancellationToken cancellationToken = default)
     {
         if (args.Value is IComponentHost container)
         {
+            List<IComponentHost> sortedContainers = [.. containers, container];
+            sortedContainers = [.. sortedContainers.OrderBy(x => x.GetConfiguration< ContainerConfiguration>() is ContainerConfiguration configuration ? configuration.Name : null)];
+
+            int index = sortedContainers.IndexOf(container);
+
             if (container.Services.GetRequiredService<ContainerConfiguration>() is ContainerConfiguration configuration)
             {
                 if (container.Services.GetRequiredService<IServiceFactory>() is IServiceFactory factory)
                 {
                     if (factory.Create<ContainerNavigationViewModel>(configuration.Name) is ContainerNavigationViewModel viewModel)
                     {
-                        await publisher.Publish(new Create<IMainNavigationViewModel>(viewModel),
+                        await publisher.Publish(new Insert<IMainNavigationViewModel>(index, viewModel),
                             nameof(MainViewModel), cancellationToken);
                     }
                 }

Bitvault/ContainerComponentFactory.cs

@@ -1,18 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public class ContainerComponentFactory(IComponentFactory componentFactory) : 
-    IContainerComponentFactory
-{
-    public IComponentHost? Create(string name)
-    {
-        if (componentFactory.Create<IContainerComponent, ContainerConfiguration>($"Vault:{name}", 
-            new ContainerConfiguration { Name = name }) is IComponentHost host)
-        {
-            return host;
-        }
-
-        return default;
-    }
-}

Bitvault/ContainerFactory.cs

@@ -1,41 +1,18 @@
-using Bitvault.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Toolkit.Foundation;
+using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class ContainerFactory(IValueStore<ContainerConnection> connection,
-    IHostEnvironment environment,
-    IServiceProvider provider) :
+public class ContainerFactory(IComponentFactory componentFactory) : 
     IContainerFactory
 {
-    public async Task<bool> Create(string name, 
-        SecurityKey key)
+    public IComponentHost? Create(string name)
     {
-        connection.Set(new ContainerConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
-            $".vault;Mode=ReadWriteCreate;Pooling=false;Password={Convert.ToBase64String(key.DecryptedKey)}"));
-
-        IDbContextFactory<ContainerDbContext> dbContextFactory = provider.GetRequiredService<IDbContextFactory<ContainerDbContext>>();
-        using ContainerDbContext context = await dbContextFactory.CreateDbContextAsync();
-
-        try
+        if (componentFactory.Create<IContainerComponent, ContainerConfiguration>($"Vault:{name}", 
+            new ContainerConfiguration { Name = name }) is IComponentHost host)
         {
-            await Task.Run(async () =>
-            {
-                await context.Database.EnsureCreatedAsync().ConfigureAwait(false);
-                await context.Database.CloseConnectionAsync().ConfigureAwait(false);
-
-                context.Database.SetConnectionString(null);
-
-            }).ConfigureAwait(false);
-        }
-        catch
-        {
-            return false;
+            return host;
         }
 
-        return true;
+        return default;
     }
 }

Bitvault/ContainerStorageFactory.cs

@@ -0,0 +1,41 @@
+using Bitvault.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class ContainerStorageFactory(IValueStore<ContainerConnection> connection,
+    IHostEnvironment environment,
+    IServiceProvider provider) :
+    IContainerStorageFactory
+{
+    public async Task<bool> Create(string name, 
+        SecurityKey key)
+    {
+        connection.Set(new ContainerConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
+            $".vault;Mode=ReadWriteCreate;Pooling=false;Password={Convert.ToBase64String(key.DecryptedKey)}"));
+
+        IDbContextFactory<ContainerDbContext> dbContextFactory = provider.GetRequiredService<IDbContextFactory<ContainerDbContext>>();
+        using ContainerDbContext context = await dbContextFactory.CreateDbContextAsync();
+
+        try
+        {
+            await Task.Run(async () =>
+            {
+                await context.Database.EnsureCreatedAsync().ConfigureAwait(false);
+                await context.Database.CloseConnectionAsync().ConfigureAwait(false);
+
+                context.Database.SetConnectionString(null);
+
+            }).ConfigureAwait(false);
+        }
+        catch
+        {
+            return false;
+        }
+
+        return true;
+    }
+}

Bitvault/CreateContainerHandler.cs

@@ -5,7 +5,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class CreateContainerHandler(IContainerComponentFactory componentFactory,
+public class CreateContainerHandler(IContainerFactory componentFactory,
     IPublisher publisher) :
     IHandler<Create<Container>, bool>
 {
@@ -19,7 +19,7 @@ public class CreateContainerHandler(IContainerComponentFactory componentFactory,
             {
                 ISecurityKeyFactory keyVaultFactory = host.Services.GetRequiredService<ISecurityKeyFactory>();
                 IValueStore<SecurityKey> secureKeyStore = host.Services.GetRequiredService<IValueStore<SecurityKey>>();
-                IContainerFactory containerFactory = host.Services.GetRequiredService<IContainerFactory>();
+                IContainerStorageFactory containerFactory = host.Services.GetRequiredService<IContainerStorageFactory>();
 
                 if (keyVaultFactory.Create(Encoding.UTF8.GetBytes(password)) is SecurityKey key)
                 {

Bitvault/IContainerComponentFactory.cs

@@ -1,9 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault
-{
-    public interface IContainerComponentFactory
-    {
-        IComponentHost? Create(string name);
-    }
-}

Bitvault/IContainerFactory.cs

@@ -1,6 +1,9 @@
-namespace Bitvault;
+using Toolkit.Foundation;
 
-public interface IContainerFactory
+namespace Bitvault
 {
-    Task<bool> Create(string name, SecurityKey key);
+    public interface IContainerFactory
+    {
+        IComponentHost? Create(string name);
+    }
 }

Bitvault/IContainerStorageFactory.cs

@@ -0,0 +1,6 @@
+namespace Bitvault;
+
+public interface IContainerStorageFactory
+{
+    Task<bool> Create(string name, SecurityKey key);
+}

Bitvault/MainViewModelHandler.cs

@@ -10,7 +10,8 @@ public class MainViewModelHandler(IPublisher publisher,
     public async Task Handle(Enumerate<IMainNavigationViewModel> args,
         CancellationToken cancellationToken = default)
     {
-        foreach (IComponentHost container in containers)
+        foreach (IComponentHost container in containers.OrderBy(x => x.GetConfiguration<ContainerConfiguration>() 
+            is ContainerConfiguration configuration ? configuration.Name : null))
         {
             if (container.Services.GetRequiredService<ContainerConfiguration>() is ContainerConfiguration configuration)
             {

Bitvault/OpenContainerHandler.cs

@@ -5,7 +5,7 @@ namespace Bitvault;
 
 public class OpenContainerHandler(ContainerConfiguration configuration,
     ISecurityKeyFactory keyVaultFactory,
-    IContainerFactory vaultStorage) :
+    IContainerStorageFactory vaultStorage) :
     IHandler<Open<Container>, bool>
 {
     public async Task<bool> Handle(Open<Container> args,