lots of tidying up

Hyperbar.Windows.Primary/PrimaryWidget.cs

@@ -27,8 +27,8 @@ public class PrimaryWidget :
                 .AddCache<Guid, IWidgetComponentViewModel>()
                 .AddTransient<IProvider<PrimaryCommandConfiguration, IWidgetComponentViewModel?>, WidgetComponentProvider>()
                 .AddTransient<IFactory<PrimaryCommandConfiguration, IWidgetComponentViewModel?>, WidgetComponentFactory>()
-                .AddTransient<IEnumerator<IWidgetComponentViewModel>, WidgetComponentEnumerationHandler>()
                 .AddWidgetTemplate<PrimaryWidgetViewModel>()
+                .AddHandler<WidgetComponentViewModelEnumerator>()
                 .AddHandler<PrimaryWidgetConfigurationHandler>();
         });
 }

Hyperbar.Windows.Primary/PrimaryWidgetViewModel.cs

@@ -6,9 +6,8 @@ namespace Hyperbar.Windows.Primary;
 public class PrimaryWidgetViewModel(ITemplateFactory templateFactory,
     IServiceFactory serviceFactory,
     IMediator mediator,
-    IDisposer disposer,
-    IEnumerator<IWidgetComponentViewModel> enumerator) :
-    ObservableCollectionViewModel<IWidgetComponentViewModel>(serviceFactory, mediator, disposer, enumerator),
+    IDisposer disposer) :
+    ObservableCollectionViewModel<IWidgetComponentViewModel>(serviceFactory, mediator, disposer),
     IWidgetViewModel,
     ITemplatedViewModel
 {

Hyperbar.Windows.Primary/WidgetComponentViewModelEnumerator.cs

@@ -2,12 +2,13 @@
 
 namespace Hyperbar.Windows.Primary;
 
-public class WidgetComponentEnumerationHandler(PrimaryWidgetConfiguration configuration,
+public class WidgetComponentViewModelEnumerator(PrimaryWidgetConfiguration configuration,
+    IMediator mediator,
     IFactory<PrimaryCommandConfiguration, IWidgetComponentViewModel?> factory,
     ICache<(Guid ParentId, Guid Id), PrimaryCommandConfiguration> cache) :
-    IEnumerator<IWidgetComponentViewModel>
+    INotificationHandler<Enumerate<IWidgetComponentViewModel>>
 {
-    public IEnumerable<IWidgetComponentViewModel?> Get()
+    public async Task Handle(Enumerate<IWidgetComponentViewModel> notification, CancellationToken cancellationToken)
     {
         Stack<(Guid, List<PrimaryCommandConfiguration>)> stack = new();
         stack.Push((Guid.Empty, configuration.Commands));
@@ -27,7 +28,11 @@ public class WidgetComponentEnumerationHandler(PrimaryWidgetConfiguration config
 
         foreach (PrimaryCommandConfiguration item in configuration.Commands.OrderBy(x => x.Order))
         {
-            yield return factory.Create(item);
+            if (factory.Create(item) is IWidgetComponentViewModel viewModel)
+            {
+                await mediator.PublishAsync(new Created<IWidgetComponentViewModel>(viewModel), nameof(PrimaryWidgetViewModel), 
+                    cancellationToken);
+            }
         }
     }
 }