From cb0d17dabdeea8bb66688ebf6856a6fe8fda89a8 Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Fri, 29 May 2026 07:59:56 -0400 Subject: [PATCH] refactor(browse): rename OPC-UA browse service + dialog to protocol-agnostic IOpcUaBrowseService/OpcUaBrowseService -> IBrowseService/BrowseService, OpcUaBrowserDialog -> NodeBrowserDialog, and neutralize 'Browse OPC UA' UI strings to 'Browse'. Updates DI, InstanceConfigure, TestBindingsDialog, TreeRow, BindingTester, and tests. 574 CentralUI tests green. --- .../{OpcUaBrowserDialog.razor => NodeBrowserDialog.razor} | 4 ++-- .../Components/Dialogs/TestBindingsDialog.razor | 2 +- .../Components/Dialogs/TreeRow.razor | 6 +++--- .../Components/Pages/Deployment/InstanceConfigure.razor | 8 ++++---- .../ServiceCollectionExtensions.cs | 2 +- .../Services/BindingTester.cs | 2 +- .../Services/{OpcUaBrowseService.cs => BrowseService.cs} | 8 ++++---- .../Services/IBindingTester.cs | 2 +- .../{IOpcUaBrowseService.cs => IBrowseService.cs} | 2 +- .../Deployment/InstanceConfigureAuditDrillinTests.cs | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) rename src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/{OpcUaBrowserDialog.razor => NodeBrowserDialog.razor} (98%) rename src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/{OpcUaBrowseService.cs => BrowseService.cs} (91%) rename src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/{IOpcUaBrowseService.cs => IBrowseService.cs} (98%) diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/OpcUaBrowserDialog.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor similarity index 98% rename from src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/OpcUaBrowserDialog.razor rename to src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor index d1556d41..04b07728 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/OpcUaBrowserDialog.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor @@ -1,7 +1,7 @@ @using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Protocol @using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management @using ZB.MOM.WW.ScadaBridge.CentralUI.Services -@inject IOpcUaBrowseService BrowseService +@inject IBrowseService BrowseService @if (_isVisible) { @@ -9,7 +9,7 @@
-
Browse OPC UA — @ConnectionName
+
Browse — @ConnectionName
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor index d5a2d43f..2da15c86 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor @@ -143,7 +143,7 @@ /// /// Opens the dialog and triggers an immediate one-shot read. Method-arg - /// pattern (mirroring OpcUaBrowserDialog.ShowAsync) — Razor + /// pattern (mirroring NodeBrowserDialog.ShowAsync) — Razor /// parameter binding would propagate on the next render and race the /// LoadAsync below. /// diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor index 5ae9038b..a2dd3eff 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor @@ -46,8 +46,8 @@ @code { - [Parameter] public OpcUaBrowserDialog.TreeNode Node { get; set; } = default!; - [Parameter] public EventCallback OnToggle { get; set; } - [Parameter] public EventCallback OnSelect { get; set; } + [Parameter] public NodeBrowserDialog.TreeNode Node { get; set; } = default!; + [Parameter] public EventCallback OnToggle { get; set; } + [Parameter] public EventCallback OnSelect { get; set; } [Parameter] public string? SelectedNodeId { get; set; } } diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor index e2f717e7..997e0cc6 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor @@ -144,7 +144,7 @@ { @@ -367,7 +367,7 @@ @* OPC UA Tag Browser dialog (Task 18) — rendered once; OpenBrowser tracks which binding row's override input receives the picked node id. *@ - }
@@ -407,7 +407,7 @@ // OPC UA tag browser (Task 18) — single dialog rendered at page bottom; // _browserAttrInEdit tracks which row gets the picked node id on Select. - private OpcUaBrowserDialog? _browserRef; + private NodeBrowserDialog? _browserRef; private string? _browserAttrInEdit; private string _browserSiteIdentifier = ""; private string _browserConnectionName = ""; diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs index 651e6be2..aa802860 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs @@ -53,7 +53,7 @@ public static class ServiceCollectionExtensions // OPC UA Tag Browser (Task 14): facade over CommunicationService.BrowseNodeAsync // that enforces the CentralUI-side Design-role trust boundary and translates // transport failures into typed BrowseFailure results for the dialog. - services.AddScoped(); + services.AddScoped(); // Test Bindings: facade over CommunicationService.ReadTagValuesAsync — // same Design-role guard + typed-failure translation as the browse diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs index 2c19d8b1..e8e1c7d5 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs @@ -10,7 +10,7 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services; /// that enforces the /// CentralUI-side Design-role trust boundary and translates transport /// exceptions into a typed result. Mirrors -/// . +/// . /// public sealed class BindingTester : IBindingTester { diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/OpcUaBrowseService.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BrowseService.cs similarity index 91% rename from src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/OpcUaBrowseService.cs rename to src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BrowseService.cs index 8c60126a..b27f4298 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/OpcUaBrowseService.cs +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BrowseService.cs @@ -7,7 +7,7 @@ using ZB.MOM.WW.ScadaBridge.Security; namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services; /// -/// Default implementation — a thin facade over +/// Default implementation — a thin facade over /// that enforces the /// CentralUI-side Design-role trust boundary and translates transport /// exceptions into a typed result. @@ -19,17 +19,17 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services; /// ServerError so the dialog can show an inline banner while leaving the /// manual node-id paste field usable. /// -public sealed class OpcUaBrowseService : IOpcUaBrowseService +public sealed class BrowseService : IBrowseService { private readonly CommunicationService _communication; private readonly AuthenticationStateProvider _auth; /// - /// Initializes a new instance of the . + /// Initializes a new instance of the . /// /// Central-side cluster communication service. /// Authentication state provider used for the Design-role guard. - public OpcUaBrowseService(CommunicationService communication, AuthenticationStateProvider auth) + public BrowseService(CommunicationService communication, AuthenticationStateProvider auth) { _communication = communication ?? throw new ArgumentNullException(nameof(communication)); _auth = auth ?? throw new ArgumentNullException(nameof(auth)); diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs index 91a08dde..028987e8 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs @@ -16,7 +16,7 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services; /// envelope. Transport failures (timeouts, unreachable sites) are translated /// into a typed so the dialog can render an /// inline banner without crashing — same shape as -/// . +/// . /// public interface IBindingTester { diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IOpcUaBrowseService.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBrowseService.cs similarity index 98% rename from src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IOpcUaBrowseService.cs rename to src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBrowseService.cs index 47730ed3..f70f2025 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IOpcUaBrowseService.cs +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBrowseService.cs @@ -17,7 +17,7 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services; /// so the dialog can render an inline error and /// remain usable (manual node-id paste still works). /// -public interface IOpcUaBrowseService +public interface IBrowseService { /// /// Enumerates the immediate children of an OPC UA node on the live server diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs index 9e9f5287..a33eb66b 100644 --- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs +++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs @@ -44,10 +44,10 @@ public class InstanceConfigureAuditDrillinTests : BunitContext Services.AddSingleton(new InstanceService(_templateRepo, Substitute.For())); Services.AddSingleton(Substitute.For()); - // The page renders and at + // The page renders and at // the bottom; their @inject directives need a registered service even // though this test doesn't open either dialog. - Services.AddSingleton(Substitute.For()); + Services.AddSingleton(Substitute.For()); Services.AddSingleton(Substitute.For()); // Auth: a system-wide Deployment user so SiteScope grants everything.