diff --git a/docs/ui-consistency/ot13-root-fields/ModbusTagConfigEditor-source-inventory.json b/docs/ui-consistency/ot13-root-fields/ModbusTagConfigEditor-source-inventory.json new file mode 100644 index 000000000..c571aa547 --- /dev/null +++ b/docs/ui-consistency/ot13-root-fields/ModbusTagConfigEditor-source-inventory.json @@ -0,0 +1,56 @@ +[ + { + "tag": "input", + "key": "field-01", + "labelsAdded": [ + "Address (text, optional)" + ] + }, + { + "tag": "select", + "key": "field-02", + "labelsAdded": [ + "Region" + ] + }, + { + "tag": "input", + "key": "field-03", + "labelsAdded": [ + "Address" + ] + }, + { + "tag": "select", + "key": "field-04", + "labelsAdded": [ + "Data type" + ] + }, + { + "tag": "select", + "key": "field-05", + "labelsAdded": [ + "Byte order" + ] + }, + { + "tag": "input", + "key": "field-06", + "labelsAdded": [ + "Bit index" + ] + }, + { + "tag": "input", + "key": "field-07", + "labelsAdded": [ + "String len" + ] + }, + { + "tag": "input", + "key": "modbus-writable", + "labelsAdded": [] + } +] \ No newline at end of file diff --git a/docs/ui-consistency/ot13-root-fields/MqttTagConfigEditor-source-inventory.json b/docs/ui-consistency/ot13-root-fields/MqttTagConfigEditor-source-inventory.json new file mode 100644 index 000000000..f111eb313 --- /dev/null +++ b/docs/ui-consistency/ot13-root-fields/MqttTagConfigEditor-source-inventory.json @@ -0,0 +1,77 @@ +[ + { + "tag": "select", + "key": "mqtt-mode", + "labelsAdded": [] + }, + { + "tag": "input", + "key": "mqtt-topic", + "labelsAdded": [] + }, + { + "tag": "input", + "key": "mqtt-write-topic", + "labelsAdded": [] + }, + { + "tag": "select", + "key": "mqtt-payload-format", + "labelsAdded": [] + }, + { + "tag": "input", + "key": "mqtt-json-path", + "labelsAdded": [] + }, + { + "tag": "select", + "key": "mqtt-data-type", + "labelsAdded": [] + }, + { + "tag": "select", + "key": "mqtt-qos", + "labelsAdded": [] + }, + { + "tag": "select", + "key": "mqtt-retain-seed", + "labelsAdded": [] + }, + { + "tag": "input", + "key": "mqtt-sp-group", + "labelsAdded": [] + }, + { + "tag": "input", + "key": "mqtt-sp-node", + "labelsAdded": [] + }, + { + "tag": "input", + "key": "mqtt-sp-device", + "labelsAdded": [] + }, + { + "tag": "input", + "key": "mqtt-sp-metric", + "labelsAdded": [] + }, + { + "tag": "select", + "key": "mqtt-sp-data-type", + "labelsAdded": [] + }, + { + "tag": "select", + "key": "mqtt-sp-qos", + "labelsAdded": [] + }, + { + "tag": "select", + "key": "mqtt-sp-retain-seed", + "labelsAdded": [] + } +] \ No newline at end of file diff --git a/docs/ui-consistency/ot13-root-fields/OpcUaClientTagConfigEditor-source-inventory.json b/docs/ui-consistency/ot13-root-fields/OpcUaClientTagConfigEditor-source-inventory.json new file mode 100644 index 000000000..134321850 --- /dev/null +++ b/docs/ui-consistency/ot13-root-fields/OpcUaClientTagConfigEditor-source-inventory.json @@ -0,0 +1,9 @@ +[ + { + "tag": "input", + "key": "field-01", + "labelsAdded": [ + "Upstream node reference (NodeId)" + ] + } +] \ No newline at end of file diff --git a/docs/ui-consistency/ot13-root-fields/tagbatch2-contract.log b/docs/ui-consistency/ot13-root-fields/tagbatch2-contract.log new file mode 100644 index 000000000..94fabad95 --- /dev/null +++ b/docs/ui-consistency/ot13-root-fields/tagbatch2-contract.log @@ -0,0 +1,52 @@ + + ZB.MOM.WW.OtOpcUa.Analyzers -> /Users/dohertj2/Desktop/OtOpcUa/src/Tooling/ZB.MOM.WW.OtOpcUa.Analyzers/bin/Debug/netstandard2.0/ZB.MOM.WW.OtOpcUa.Analyzers.dll + ZB.MOM.WW.OtOpcUa.Core.Abstractions -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Core.Abstractions.dll + ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Calculation.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Calculation.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Calculation.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing.dll + ZB.MOM.WW.OtOpcUa.Driver.Ab.Transport -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Ab.Transport/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Ab.Transport.dll + ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.dll + ZB.MOM.WW.OtOpcUa.Driver.Heidenhain.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Heidenhain.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Heidenhain.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts.dll + ZB.MOM.WW.OtOpcUa.Commons -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Commons/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Commons.dll + ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts.dll + ZB.MOM.WW.OtOpcUa.Core.Scripting.Abstractions -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting.Abstractions/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Core.Scripting.Abstractions.dll + ZB.MOM.WW.OtOpcUa.Driver.MTConnect.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.MTConnect.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.MTConnect.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Session -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Session/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Session.dll + ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts.dll + ZB.MOM.WW.OtOpcUa.Cluster -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Cluster/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Cluster.dll + ZB.MOM.WW.OtOpcUa.Core.Scripting -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Core.Scripting.dll + ZB.MOM.WW.OtOpcUa.Driver.Sql.Dialect -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Sql.Dialect/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Sql.Dialect.dll + ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Transport -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Transport/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Transport.dll + ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.dll + ZB.MOM.WW.OtOpcUa.Driver.Sql.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Sql.Browser/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Sql.Browser.dll + ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browser/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browser.dll + ZB.MOM.WW.OtOpcUa.Core.VirtualTags -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Core.VirtualTags.dll + ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Browser/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Browser.dll + ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Browser/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Browser.dll + ZB.MOM.WW.OtOpcUa.Configuration -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Configuration.dll + ZB.MOM.WW.OtOpcUa.Core -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Core.dll + ZB.MOM.WW.OtOpcUa.Security -> /Users/dohertj2/Desktop/OtOpcUa/src/Server/ZB.MOM.WW.OtOpcUa.Security/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Security.dll + ZB.MOM.WW.OtOpcUa.Driver.FOCAS -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.dll + ZB.MOM.WW.OtOpcUa.Driver.Heidenhain -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Heidenhain/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Heidenhain.dll + ZB.MOM.WW.OtOpcUa.Driver.Sql -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Sql/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Sql.dll + ZB.MOM.WW.OtOpcUa.Driver.AbLegacy -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.dll + ZB.MOM.WW.OtOpcUa.Driver.MTConnect -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.MTConnect/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.MTConnect.dll + ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.dll + ZB.MOM.WW.OtOpcUa.Driver.Galaxy -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.dll + ZB.MOM.WW.OtOpcUa.Driver.AbCip -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Driver.AbCip.dll + ZB.MOM.WW.OtOpcUa.ControlPlane -> /Users/dohertj2/Desktop/OtOpcUa/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.ControlPlane.dll + ZB.MOM.WW.OtOpcUa.OpcUaServer -> /Users/dohertj2/Desktop/OtOpcUa/src/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.OpcUaServer.dll + ZB.MOM.WW.OtOpcUa.Runtime -> /Users/dohertj2/Desktop/OtOpcUa/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.Runtime.dll + ZB.MOM.WW.OtOpcUa.AdminUI -> /Users/dohertj2/Desktop/OtOpcUa/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.AdminUI.dll + ZB.MOM.WW.OtOpcUa.AdminUI.Tests -> /Users/dohertj2/Desktop/OtOpcUa/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.AdminUI.Tests.dll +Test run for /Users/dohertj2/Desktop/OtOpcUa/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/bin/Debug/net10.0/ZB.MOM.WW.OtOpcUa.AdminUI.Tests.dll (.NETCoreApp,Version=v10.0) +A total of 1 test files matched the specified pattern. + +Passed! - Failed: 0, Passed: 170, Skipped: 0, Total: 170, Duration: 182 ms - ZB.MOM.WW.OtOpcUa.AdminUI.Tests.dll (net10.0) diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/ModbusTagConfigEditor.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/ModbusTagConfigEditor.razor index 40ac37eaa..8b70d7e9b 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/ModbusTagConfigEditor.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/ModbusTagConfigEditor.razor @@ -4,12 +4,13 @@ @using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers.Pickers
-
- +
+
@if (_addressError is not null) {
@_addressError
@@ -40,33 +41,34 @@ {
This tag names no address yet: set a field below or resolve an address string. The driver refuses it until then.
} -
- @foreach (var v in Enum.GetValues()) { }
-
-
-
-
+
+
-
- @foreach (var v in Enum.GetValues()) { }
-
-
-
-
+
+
+
+
- - +
@@ -83,6 +85,9 @@ } @code { + private readonly string _fieldScope = "modbus-tag-config-editor-" + Guid.NewGuid().ToString("N"); + private string FieldId(string name) => $"{_fieldScope}-{name}"; + [Parameter] public string? ConfigJson { get; set; } [Parameter] public EventCallback ConfigJsonChanged { get; set; } /// DriverType of the selected driver — lets browse-capable pickers open a universal session. diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/MqttTagConfigEditor.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/MqttTagConfigEditor.razor index 39ecb1e09..e67abe81e 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/MqttTagConfigEditor.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/MqttTagConfigEditor.razor @@ -14,8 +14,8 @@
- - @foreach (var v in Enum.GetValues()) { } @@ -24,18 +24,18 @@ @if (_m.Mode == MqttMode.Plain) {
- - Topic + -
Concrete topic — MQTT wildcards (+ / #) are not valid for a tag.
+
Concrete topic — MQTT wildcards (+ / #) are not valid for a tag.
- - Write topic (optional) + -
+
Where a write is published. Deliberately separate from the read topic — a tag commonly reads …/state and writes …/set. Leave blank for a read-only tag: a write is then refused (BadNotWritable) rather than published @@ -43,8 +43,8 @@
- - @foreach (var v in Enum.GetValues()) { } @@ -52,25 +52,25 @@ @if (_m.PayloadFormat == MqttPayloadFormat.Json) {
- - JSON path + -
Use $ for the whole document.
+
Use $ for the whole document.
}
- + @* The driver's own DriverDataType members — authoring anything outside this set produces a blob the driver's strict parser rejects at deploy (there is no 'Double'; it is Float64). *@ -
- - @@ -79,8 +79,8 @@
- - @@ -92,47 +92,47 @@ else {
- - Group ID + -
The driver subscribes spBv1.0/@(string.IsNullOrEmpty(_m.GroupId) ? "{GroupId}" : _m.GroupId)/#. No /, +, or #.
+
The driver subscribes spBv1.0/@(string.IsNullOrEmpty(_m.GroupId) ? "{GroupId}" : _m.GroupId)/#. No /, +, or #.
- - Edge node ID + -
The publishing edge node's id.
+
The publishing edge node's id.
- - Device ID (optional) + -
Leave blank for a metric published by the edge node itself.
+
Leave blank for a metric published by the edge node itself.
- - Metric name + -
The metric's stable name from the birth certificate — unlike the ids above, this MAY contain / (e.g. Properties/Hardware Make).
+
The metric's stable name from the birth certificate — unlike the ids above, this MAY contain / (e.g. Properties/Hardware Make).
- + @* Same DriverDataType set as Plain's field — the factory reads a Sparkplug 'dataType' key as a DriverDataType override, not the raw wire SparkplugDataType. Absent ⇒ take whatever type the birth certificate declares (the driver's UntilStable discovery). *@ -
- - @@ -141,8 +141,8 @@
- - @@ -159,6 +159,10 @@
@code { + private readonly string _fieldScope = "mqtt-tag-config-editor-" + Guid.NewGuid().ToString("N"); + private string FieldIds(params string[] names) => string.Join(" ", names.Select(FieldId)); + private string FieldId(string name) => $"{_fieldScope}-{name}"; + /// The tag's TagConfig JSON, owned by the host modal. [Parameter] public string? ConfigJson { get; set; } /// Raised with the re-serialised TagConfig JSON after every field edit. diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor index c8b378c7d..abd8df4ea 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor @@ -1,14 +1,18 @@ @using ZB.MOM.WW.OtOpcUa.AdminUI.Uns.TagEditors
-
- + -
The remote OPC UA NodeId the driver reads/writes/subscribes against. Use the browse picker on the driver page to find it.
+
The remote OPC UA NodeId the driver reads/writes/subscribes against. Use the browse picker on the driver page to find it.
@code { + private readonly string _fieldScope = "opc-ua-client-tag-config-editor-" + Guid.NewGuid().ToString("N"); + private string FieldIds(params string[] names) => string.Join(" ", names.Select(FieldId)); + private string FieldId(string name) => $"{_fieldScope}-{name}"; + [Parameter] public string? ConfigJson { get; set; } [Parameter] public EventCallback ConfigJsonChanged { get; set; } /// DriverType of the selected driver — lets browse-capable pickers open a universal session.