From ab6e3432bd3f066eac867555c58117ae2fdf0bae Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Fri, 21 Aug 2026 06:07:12 -0400 Subject: [PATCH] =?UTF-8?q?feat(centralui):=20NodeBrowserDialog.Selectable?= =?UTF-8?q?NodeClasses=20=E2=80=94=20opt-in=20Object=20node=20selection=20?= =?UTF-8?q?(default=20unchanged)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Claude-Session: https://claude.ai/code/session_01G2GHPnbbKGvyyfbr2XBRVH --- .../Dialogs/NodeBrowserDialog.razor | 43 ++++++++++++++---- .../Components/Dialogs/TreeRow.razor | 14 +++++- .../NodeBrowserDialogSelectionTests.cs | 44 +++++++++++++++++++ 3 files changed, 90 insertions(+), 11 deletions(-) diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor index 60b442d6..d6263749 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor @@ -56,12 +56,24 @@ @* A button, not an href="javascript:void(0)" anchor: this selects a node rather than navigating, and the pseudo-href was a CSP/a11y smell. Matches the tree - label in TreeRow.razor. *@ - + label in TreeRow.razor. A node class the caller does + not accept renders as plain text — nothing to click. *@ + @if (IsSelectable(node.NodeClass)) + { + + @if (node.NodeClass == BrowseNodeClass.Object) + { + object + } + } + else + { + @node.DisplayName + } @if (!string.IsNullOrEmpty(node.DataType)) { @node.DataType @@ -90,7 +102,7 @@ } @@ -113,6 +125,10 @@ }
+ @if (SelectableNodeClasses.Contains(BrowseNodeClass.Object)) + { + Select an object or tag + } Selected: @(_selectedNodeId ?? "(none)")
@@ -147,6 +163,15 @@ /// always fail. Default true preserves OPC UA behaviour. [Parameter] public bool ShowSearch { get; set; } = true; + /// + /// Additive: node classes the picker accepts. Default Variable-only (every + /// existing caller). The create page passes Object+Variable so a module's + /// container can be chosen (design 2026-08-21). + /// + [Parameter] public IReadOnlyCollection SelectableNodeClasses { get; set; } = new[] { BrowseNodeClass.Variable }; + + private bool IsSelectable(BrowseNodeClass nodeClass) => SelectableNodeClasses.Contains(nodeClass); + private bool _isVisible; private string? _selectedNodeId; private BrowseNode? _selectedNode; @@ -355,7 +380,7 @@ // Select button confirms and OnSelected fires with this node id. private void SelectBrowseNode(BrowseNode node) { - if (node.NodeClass != BrowseNodeClass.Variable) return; + if (!IsSelectable(node.NodeClass)) return; _selectedNodeId = node.NodeId; _manualNodeId = node.NodeId; _selectedNode = node; @@ -363,7 +388,7 @@ private void Select(TreeNode node) { - if (node.NodeClass != BrowseNodeClass.Variable) return; + if (!IsSelectable(node.NodeClass)) return; _selectedNodeId = node.NodeId; _manualNodeId = node.NodeId; _selectedNode = node.Source; 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 43ecc1fe..99dd4b1c 100644 --- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor +++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor @@ -11,7 +11,7 @@ } - @if (Node.NodeClass == BrowseNodeClass.Variable) + @if (IsSelectable) { @* Display name (+ type badge) on the first line, the node id clipped beneath it: an OPC UA node id runs 60–120 characters and inline it @@ -49,7 +49,7 @@
    @foreach (var child in Node.Children) { - + } @if (!string.IsNullOrEmpty(Node.ContinuationToken)) { @@ -74,4 +74,14 @@ [Parameter] public EventCallback OnSelect { get; set; } [Parameter] public EventCallback OnLoadMore { get; set; } [Parameter] public string? SelectedNodeId { get; set; } + + /// + /// Additive: which node classes the picker accepts, supplied by + /// . Null keeps the historical + /// Variable-only behaviour. The expand toggle renders regardless, so a selectable + /// Object node can still be drilled into. + /// + [Parameter] public Func? Selectable { get; set; } + + private bool IsSelectable => Selectable?.Invoke(Node.NodeClass) ?? Node.NodeClass == BrowseNodeClass.Variable; } diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Components/NodeBrowserDialogSelectionTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Components/NodeBrowserDialogSelectionTests.cs index ec7b6a67..481df833 100644 --- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Components/NodeBrowserDialogSelectionTests.cs +++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Components/NodeBrowserDialogSelectionTests.cs @@ -29,6 +29,9 @@ public class NodeBrowserDialogSelectionTests : BunitContext new AddressSpaceMatch( new BrowseNode("ns=2;s=Pump1.Speed", "Speed", BrowseNodeClass.Variable, HasChildren: false, DataType: "Double"), Path: "Devices/Pump1/Speed"), + new AddressSpaceMatch( + new BrowseNode("ns=2;s=Pump1", "Pump1", BrowseNodeClass.Object, HasChildren: true), + Path: "Devices/Pump1"), }, CapReached: false, Failure: null)); } @@ -100,4 +103,45 @@ public class NodeBrowserDialogSelectionTests : BunitContext Assert.Equal("Area1.Pump.Speed", captured!.NodeId); Assert.Equal("Float", captured.DataType); } + + // SelectableNodeClasses (design 2026-08-21): the create page needs to pick a + // module's CONTAINER object, not just a leaf tag. Default stays Variable-only + // so every existing caller is unaffected. + [Fact] + public void Object_node_is_not_selectable_by_default() + { + var cut = Render(p => p + .Add(c => c.SiteId, "plant-a") + .Add(c => c.ConnectionName, "PLC-OPC")); + cut.InvokeAsync(() => cut.Instance.ShowAsync("plant-a", "PLC-OPC", null)); + cut.Render(); + cut.Find("[data-test=node-search-input]").Input("Pump1"); + cut.Find("[data-test=node-search-button]").Click(); + + // Only the Variable renders a select button; the Object is plain text. + Assert.Single(cut.FindAll("[data-test=node-search-result] button.btn-link")); + } + + [Fact] + public void Object_node_is_selectable_when_listed() + { + BrowseNode? captured = null; + var cut = Render(p => p + .Add(c => c.SiteId, "plant-a") + .Add(c => c.ConnectionName, "PLC-OPC") + .Add(c => c.SelectableNodeClasses, (IReadOnlyCollection)new[] { BrowseNodeClass.Object, BrowseNodeClass.Variable }) + .Add(c => c.OnNodeSelected, EventCallback.Factory.Create(this, n => captured = n))); + cut.InvokeAsync(() => cut.Instance.ShowAsync("plant-a", "PLC-OPC", null)); + cut.Render(); + cut.Find("[data-test=node-search-input]").Input("Pump1"); + cut.Find("[data-test=node-search-button]").Click(); + + var buttons = cut.FindAll("[data-test=node-search-result] button.btn-link"); + Assert.Equal(2, buttons.Count); + buttons.First(b => b.TextContent.Trim() == "Pump1").Click(); + cut.Find(".modal-footer .btn-primary").Click(); + + Assert.Equal("ns=2;s=Pump1", captured!.NodeId); + Assert.Equal(BrowseNodeClass.Object, captured.NodeClass); + } }