wip

Bitvault.Avalonia/App.axaml.cs

@@ -23,8 +23,8 @@ public partial class App : Application
                 services.AddAvalonia();
                 services.AddHandler<AppHandler>();
 
-                //services.AddTransient<IVaultComponent, VaultComponent>();
-                //services.AddInitializer<VaultComponentsCollectionInitializer>();
+                services.AddTransient<IVaultComponent, VaultComponent>();
+                services.AddInitializer<VaultComponentsInitializer>();
 
                 if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime)
                 {
@@ -42,9 +42,7 @@ public partial class App : Application
 
                 services.AddTemplate<VaultViewModel, VaultView>("Vault");
 
-                services.AddConfiguration<VaultConfiguration>(args => args.Name = "foo1", $"{nameof(VaultConfiguration)}:Personal");
-                services.AddConfiguration<VaultConfiguration>(args => args.Name = "foo2", $"{nameof(VaultConfiguration)}:Test");
-
+                services.AddConfiguration<VaultConfiguration>($"{nameof(VaultConfiguration)}:Personal");
             })
         .Build();
 

Bitvault/VaultComponentsCollectionInitializer.cs

@@ -1,50 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public class VaultComponentsCollectionInitializer(IServiceProvider provider,
-    IProxyServiceCollection<IComponentBuilder> proxy,
-    VaultConfigurationCollection configurations) : IInitializer
-{
-    public Task Initialize()
-    {
-        //for (int index = 0; index < configurations.Count; index++)
-        //{
-        //    VaultConfiguration configuration = configurations[index];
-        //    if (provider.GetRequiredService<IVaultComponent>() is IVaultComponent component)
-        //    {
-        //        IComponentBuilder builder = component.Create();
-        //        builder.AddServices(services =>
-        //        {
-        //            services.AddTransient(_ =>
-        //                provider.GetRequiredService<IProxyService<IPublisher>>());
-
-        //            services.AddTransient(_ =>
-        //                provider.GetRequiredService<IProxyService<IComponentHostCollection>>());
-
-        //            services.AddScoped(_ =>
-        //                provider.GetRequiredService<INavigationContextCollection>());
-
-        //            services.AddScoped(_ =>
-        //                provider.GetRequiredService<INavigationContextProvider>());
-
-        //            services.AddScoped(_ =>
-        //                provider.GetRequiredService<IComponentScopeCollection>());
-
-        //            services.AddTransient(_ =>
-        //                provider.GetRequiredService<IComponentScopeProvider>());
-
-        //            services.AddRange(proxy.Services);
-        //        });
-
-        //        builder.AddConfiguration<VaultConfiguration>(name: $"{nameof(VaultConfigurationCollection)}:{configuration.Name}");
-
-        //        IComponentHost host = builder.Build();
-        //        host.StartAsync();
-        //    }
-        //}
-
-        return Task.CompletedTask;
-    }
-}

Bitvault/VaultComponentsInitializer.cs

@@ -0,0 +1,49 @@
+using Microsoft.Extensions.DependencyInjection;
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class VaultComponentsInitializer(IServiceProvider provider,
+    IProxyServiceCollection<IComponentBuilder> proxy,
+    IEnumerable<IConfiguration<VaultConfiguration>> configurations) : IInitializer
+{
+    public Task Initialize()
+    {
+        foreach (IConfiguration<VaultConfiguration> configuration in configurations)
+        {
+            if (provider.GetRequiredService<IVaultComponent>() is IVaultComponent component)
+            {
+                IComponentBuilder builder = component.Create();
+                builder.AddServices(services =>
+                {
+                    services.AddTransient(_ =>
+                        provider.GetRequiredService<IProxyService<IPublisher>>());
+
+                    services.AddTransient(_ =>
+                        provider.GetRequiredService<IProxyService<IComponentHostCollection>>());
+
+                    services.AddScoped(_ =>
+                        provider.GetRequiredService<INavigationContextCollection>());
+
+                    services.AddScoped(_ =>
+                        provider.GetRequiredService<INavigationContextProvider>());
+
+                    services.AddScoped(_ =>
+                        provider.GetRequiredService<IComponentScopeCollection>());
+
+                    services.AddTransient(_ =>
+                        provider.GetRequiredService<IComponentScopeProvider>());
+
+                    services.AddRange(proxy.Services);
+                });
+
+                builder.AddConfiguration<VaultConfiguration>(configuration.Section);
+
+                IComponentHost host = builder.Build();
+                host.StartAsync();
+            }
+        }
+
+        return Task.CompletedTask;
+    }
+}

Bitvault/VaultConfiguration.cs

@@ -5,5 +5,5 @@ namespace Bitvault;
 
 public record VaultConfiguration : ComponentConfiguration
 {
-    public string? Name { get; set; }
+
 }

Bitvault/VaultConfigurationCollection.cs

@@ -1,5 +0,0 @@
-using System.Dynamic;
-
-namespace Bitvault;
-
-public class VaultConfigurationCollection : DynamicObject;