UI vertical-slice migration with hexagonal Common/ ports

src/EventLogExpert.Components/BannerHost.razor.cs

@@ -2,9 +2,11 @@
 // // Licensed under the MIT License.
 
 using EventLogExpert.Eventing.Logging;
-using EventLogExpert.UI.Interfaces;
-using EventLogExpert.UI.Models;
-using EventLogExpert.UI.Services;
+using EventLogExpert.UI.Banner;
+using EventLogExpert.UI.Common.Clipboard;
+using EventLogExpert.UI.Common.Restart;
+using EventLogExpert.UI.Database;
+using EventLogExpert.UI.Menu;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 
@@ -140,9 +142,9 @@ private void OnCyclePrev()
 
     private void OnDismissAttention() => BannerService.DismissAttention();
 
-    private void OnDismissError(Guid id) => BannerService.DismissError(id);
+    private void OnDismissError(BannerId id) => BannerService.DismissError(id);
 
-    private void OnDismissInfo(Guid id) => BannerService.DismissInfoBanner(id);
+    private void OnDismissInfo(BannerId id) => BannerService.DismissInfoBanner(id);
 
     private async Task OnErrorActionClickedAsync(Func<Task> action)
     {
@@ -178,7 +180,7 @@ private async Task OnOpenSettingsClickedAsync()
         {
             TraceLogger.Error($"{nameof(BannerHost)}.{nameof(OnOpenSettingsClickedAsync)}: open settings threw: {ex}");
 
-            Guid errorId = BannerService.ReportError("Settings", $"Failed to open settings: {ex.Message}");
+            BannerId errorId = BannerService.ReportError("Settings", $"Failed to open settings: {ex.Message}");
             _selectedItem = new BannerCycleItem(BannerView.Error, 0, errorId);
 
             return;
@@ -188,7 +190,7 @@ private async Task OnOpenSettingsClickedAsync()
         {
             TraceLogger.Error($"{nameof(BannerHost)}.{nameof(OnOpenSettingsClickedAsync)}: open settings returned false");
 
-            Guid errorId = BannerService.ReportError("Settings", "Failed to open settings; try again from the menu.");
+            BannerId errorId = BannerService.ReportError("Settings", "Failed to open settings; try again from the menu.");
             _selectedItem = new BannerCycleItem(BannerView.Error, 0, errorId);
         }
     }

src/EventLogExpert.Components/Base/InputComponent.cs

@@ -1,7 +1,7 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.UI.Models;
+using EventLogExpert.UI.Common.Display;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.Components.Base;

src/EventLogExpert.Components/Base/ModalBase.cs

@@ -1,7 +1,8 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.UI.Interfaces;
+using EventLogExpert.UI.Alerts;
+using EventLogExpert.UI.Modal;
 using Fluxor.Blazor.Web.Components;
 using Microsoft.AspNetCore.Components;
 
@@ -18,6 +19,8 @@ public abstract class ModalBase<TResult> : FluxorComponent, IInlineAlertHost
     private InlineAlertEntry? _activeInlineAlert;
     private long _modalId;
 
+    [Inject] internal IInlineAlertHostBroker InlineAlertHostBroker { get; init; } = null!;
+
     [Inject] internal IModalService ModalService { get; init; } = null!;
 
     /// <summary>Bound by concrete modals via <c>@ref</c> on their <see cref="ModalChrome" />.</summary>
@@ -66,17 +69,6 @@ public Task<InlineAlertResult> ShowInlineAlertAsync(InlineAlertRequest request,
         return tcs.Task;
     }
 
-    // Route Esc/native-close through OnCancelAsync so all close paths share the same pipeline.
-    // Protected so derived modals' .razor markup can wire OnDialogClosedByUser="HandleDialogClosedByUserAsync"
-    // even when the derived class lives in a different assembly than ModalBase.
-    protected Task HandleDialogClosedByUserAsync() => OnCancelAsync();
-
-    protected Task HandleInlineAlertResolvedAsync(InlineAlertResult result)
-    {
-        TryClearInlineAlert(null, result, false);
-        return Task.CompletedTask;
-    }
-
     protected async Task CompleteAsync(TResult? result)
     {
         await OnClosingAsync();
@@ -105,7 +97,7 @@ protected override async ValueTask DisposeAsyncCore(bool disposing)
             pending?.CancellationRegistration.Dispose();
             pending?.Tcs.TrySetCanceled();
 
-            ModalService.UnregisterActiveAlertHost(_modalId);
+            InlineAlertHostBroker.Unregister(_modalId);
 
             // Defensive: complete the task if we were torn down without an explicit close path.
             // Stale ids are ignored, so this is a no-op when Complete already ran.
@@ -115,6 +107,18 @@ protected override async ValueTask DisposeAsyncCore(bool disposing)
         await base.DisposeAsyncCore(disposing);
     }
 
+    // Route Esc/native-close through OnCancelAsync so all close paths share the same pipeline.
+    // Protected so derived modals' .razor markup can wire OnDialogClosedByUser="HandleDialogClosedByUserAsync"
+    // even when the derived class lives in a different assembly than ModalBase.
+    protected Task HandleDialogClosedByUserAsync() => OnCancelAsync();
+
+    protected Task HandleInlineAlertResolvedAsync(InlineAlertResult result)
+    {
+        TryClearInlineAlert(null, result, false);
+
+        return Task.CompletedTask;
+    }
+
     protected virtual Task OnAcceptAsync() => CompleteAsync(default);
 
     protected virtual Task OnCancelAsync() => CompleteAsync(default);
@@ -130,7 +134,7 @@ protected override void OnInitialized()
     {
         // Capture the active id so a stale modal can never complete a successor's task.
         _modalId = ModalService.ActiveModalId;
-        ModalService.RegisterActiveAlertHost(_modalId, this);
+        InlineAlertHostBroker.Register(_modalId, this);
         base.OnInitialized();
     }
 

src/EventLogExpert.Components/Base/ModalChrome.razor.cs

@@ -1,7 +1,7 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.UI.Interfaces;
+using EventLogExpert.UI.Alerts;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 
@@ -174,17 +174,6 @@ private async Task FocusInlineAlertElementAsync()
         }
     }
 
-    private void ResetInlineAlertPromptValueIfChanged()
-    {
-        if (ReferenceEquals(_inlineAlertInitializedFor, InlineAlert)) { return; }
-
-        _inlineAlertInitializedFor = InlineAlert;
-
-        _inlineAlertPromptValue = InlineAlert is { IsPrompt: true }
-            ? InlineAlert.PromptInitialValue ?? string.Empty
-            : string.Empty;
-    }
-
     private Task HandleAcceptAsync() => OnAccept.InvokeAsync();
 
     private Task HandleCancelButtonAsync() => OnCancel.InvokeAsync();
@@ -243,4 +232,15 @@ private Task HandleInlineAlertCancelAsync() =>
         OnInlineAlertResolved.InvokeAsync(new InlineAlertResult(false, null));
 
     private Task HandleSaveAsync() => OnSave.InvokeAsync();
+
+    private void ResetInlineAlertPromptValueIfChanged()
+    {
+        if (ReferenceEquals(_inlineAlertInitializedFor, InlineAlert)) { return; }
+
+        _inlineAlertInitializedFor = InlineAlert;
+
+        _inlineAlertPromptValue = InlineAlert is { IsPrompt: true }
+            ? InlineAlert.PromptInitialValue ?? string.Empty
+            : string.Empty;
+    }
 }

src/EventLogExpert.Components/Database/DatabaseEntryRow.razor.cs

@@ -1,19 +1,18 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.UI;
-using EventLogExpert.UI.Models;
+using EventLogExpert.UI.Database;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.Components.Database;
 
 public sealed partial class DatabaseEntryRow : ComponentBase
 {
     /// <summary>
-    ///     Click-driven reveal flag for the trash strip on the left of the row. Set true when the
-    ///     name button is clicked, cleared when the cursor leaves the row -- so re-entering the row
-    ///     without re-clicking does not re-open the slide, even though the name button may still
-    ///     hold DOM focus. Keyboard navigation drives the reveal via :focus-visible in CSS instead.
+    ///     Click-driven reveal flag for the trash strip on the left of the row. Set true when the name button is clicked,
+    ///     cleared when the cursor leaves the row -- so re-entering the row without re-clicking does not re-open the slide,
+    ///     even though the name button may still hold DOM focus. Keyboard navigation drives the reveal via :focus-visible in
+    ///     CSS instead.
     /// </summary>
     private bool _isMouseRevealed;
 

src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor

@@ -1,4 +1,3 @@
-@using EventLogExpert.Components.Base
 @if (!_isDismissed && _entries.Count > 0)
 {
     <ModalChrome AcceptLabel="Apply"

src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor.cs

@@ -3,8 +3,8 @@
 
 using EventLogExpert.Components.Base;
 using EventLogExpert.Eventing.Logging;
-using EventLogExpert.UI.Interfaces;
-using EventLogExpert.UI.Models;
+using EventLogExpert.UI.Banner;
+using EventLogExpert.UI.Database;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.Components.Database;

src/EventLogExpert.Components/Database/DatabaseRecoveryHost.razor.cs

@@ -2,8 +2,8 @@
 // // Licensed under the MIT License.
 
 using EventLogExpert.Eventing.Logging;
-using EventLogExpert.UI.Interfaces;
-using EventLogExpert.UI.Models;
+using EventLogExpert.UI.Banner;
+using EventLogExpert.UI.Database;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.Components.Database;
@@ -13,7 +13,7 @@ public sealed partial class DatabaseRecoveryHost : ComponentBase, IDisposable
     private bool _dialogOpen;
     private bool _disposed;
     private HashSet<string> _promptedFor = new(StringComparer.OrdinalIgnoreCase);
-    private Guid? _recoveryBannerId;
+    private BannerId? _recoveryBannerId;
 
     [Inject] private IBannerService BannerService { get; init; } = null!;
 
@@ -43,6 +43,14 @@ protected override void OnInitialized()
         EvaluateState();
     }
 
+    private void DismissCurrentBannerIfAny()
+    {
+        if (_recoveryBannerId is not { } activeId) { return; }
+
+        BannerService.DismissError(activeId);
+        _recoveryBannerId = null;
+    }
+
     private void EvaluateState()
     {
         if (_disposed) { return; }
@@ -68,14 +76,6 @@ private void EvaluateState()
         _promptedFor = currentBackupSet;
     }
 
-    private void DismissCurrentBannerIfAny()
-    {
-        if (_recoveryBannerId is not { } activeId) { return; }
-
-        BannerService.DismissError(activeId);
-        _recoveryBannerId = null;
-    }
-
     private void HandleBannerStateChanged()
     {
         if (_disposed) { return; }
@@ -112,7 +112,7 @@ private Task OpenRecoveryDialogAsync()
         });
     }
 
-    private Guid ReportRecoveryBanner(int count)
+    private BannerId ReportRecoveryBanner(int count)
     {
         string message = count == 1
             ? "1 database needs recovery from interrupted upgrade."

src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor.cs

@@ -2,8 +2,7 @@
 // // Licensed under the MIT License.
 
 using EventLogExpert.Eventing.Logging;
-using EventLogExpert.UI.Interfaces;
-using EventLogExpert.UI.Models;
+using EventLogExpert.UI.Banner;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.Components.Database;

src/EventLogExpert.Components/Filters/AdvancedFilterRow.razor.cs

@@ -2,8 +2,8 @@
 // // Licensed under the MIT License.
 
 using EventLogExpert.Components.Filters.Base;
-using EventLogExpert.UI.Models;
-using EventLogExpert.UI.Store.FilterPane;
+using EventLogExpert.UI.Filter;
+using EventLogExpert.UI.FilterPane;
 
 namespace EventLogExpert.Components.Filters;
 
@@ -13,15 +13,15 @@ protected override void DispatchRemoveFilter()
     {
         if (Value is not { } savedFilter) { return; }
 
-        Dispatcher.Dispatch(new FilterPaneAction.RemoveFilter(savedFilter.Id));
+        Dispatcher.Dispatch(new RemoveFilterAction(savedFilter.Id));
     }
 
-    protected override void DispatchSetFilter(FilterModel filter) =>
-        Dispatcher.Dispatch(new FilterPaneAction.SetFilter(filter));
+    protected override void DispatchSetFilter(SavedFilter filter) =>
+        Dispatcher.Dispatch(new SetFilterAction(filter));
 
     protected override void DispatchToggleEnabled(FilterId id) =>
-        Dispatcher.Dispatch(new FilterPaneAction.ToggleFilterEnabled(id));
+        Dispatcher.Dispatch(new ToggleFilterEnabledAction(id));
 
     protected override void DispatchToggleExclusion(FilterId id) =>
-        Dispatcher.Dispatch(new FilterPaneAction.ToggleFilterExcluded(id));
+        Dispatcher.Dispatch(new ToggleFilterExcludedAction(id));
 }