Associate S7 SQL and TwinCAT driver fields and diagnostics

This commit is contained in:
Joseph Doherty
2026-11-13 20:42:31 -05:00
parent eed546d96d
commit 7b7fdf0eb7
9 changed files with 394 additions and 80 deletions
@@ -9,3 +9,5 @@ Batch1: AbCip, AbLegacy and Focas driver forms now have scoped label/control IDs
Batch2: Galaxy, Heidenhain and Modbus driver forms:30focused field/parser/standalone and existing model/parity tests pass. Protocol C# bodies and existing event/bind expressions remain byte-for-byte unchanged across the35-file owned inventory; check-protocol-boundaries.py verifies that boundary independently of rendered field tests. Conditional aggregate model errors retain their original scope, rather than being attributed to unrelated controls.
Batch3: MQTT, MTConnect and OPC UA Client driver fields:98focused checks passed. Existing number parser messages now use the visible human field label through DisplayName across the nine migrated drivers; all nine field/standalone/parser groups plus existing page serialization/map tests pass188/188. No default, emitted JSON, callback or protocol-body change.
Batch4: S7, SQL and TwinCAT driver fields:115focused/serialization/parity cases pass. The named-queries textarea was the one remaining rendered name failure after initial association; its existing visible panel heading now supplies the name, and existing connection-ref/queries errors have persistent correctly scoped feedback targets. Raw initial failure is retained. Protocol C# and existing event/bind expressions remain unchanged.
@@ -0,0 +1,47 @@
[
{
"tag": "InputNumber",
"key": "s7TimeoutSec",
"labelsAdded": []
},
{
"tag": "InputSelect",
"key": "s7CpuType",
"labelsAdded": []
},
{
"tag": "InputSelect",
"key": "s7ConnType",
"labelsAdded": []
},
{
"tag": "InputText",
"key": "s7LocalTsap",
"labelsAdded": []
},
{
"tag": "InputText",
"key": "s7RemoteTsap",
"labelsAdded": []
},
{
"tag": "InputCheckbox",
"key": "s7ProbeEnabled",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "s7ProbeIntervalSec",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "s7ProbeTimeoutSec",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "s7AdminProbeTimeout",
"labelsAdded": []
}
]
@@ -0,0 +1,59 @@
[
{
"tag": "InputSelect",
"key": "field-01",
"labelsAdded": [
"Provider"
]
},
{
"tag": "InputText",
"key": "field-02",
"labelsAdded": [
"Connection string ref *"
]
},
{
"tag": "InputNumber",
"key": "field-03",
"labelsAdded": [
"Default poll interval (s)"
]
},
{
"tag": "InputNumber",
"key": "field-04",
"labelsAdded": [
"Operation timeout (s)"
]
},
{
"tag": "InputNumber",
"key": "field-05",
"labelsAdded": [
"Command timeout (s)"
]
},
{
"tag": "InputNumber",
"key": "field-06",
"labelsAdded": [
"Max concurrent groups"
]
},
{
"tag": "InputCheckbox",
"key": "sqlNullIsBad",
"labelsAdded": []
},
{
"tag": "InputCheckbox",
"key": "sqlAllowWrites",
"labelsAdded": []
},
{
"tag": "textarea",
"key": "field-09",
"labelsAdded": []
}
]
@@ -0,0 +1,57 @@
[
{
"tag": "InputNumber",
"key": "tcTimeoutSec",
"labelsAdded": []
},
{
"tag": "InputCheckbox",
"key": "tcNativeNotif",
"labelsAdded": []
},
{
"tag": "InputCheckbox",
"key": "tcControllerBrowse",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "tcNotifDelay",
"labelsAdded": []
},
{
"tag": "InputCheckbox",
"key": "tcSumRead",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "tcSumReadMax",
"labelsAdded": []
},
{
"tag": "InputCheckbox",
"key": "tcDiagnostics",
"labelsAdded": []
},
{
"tag": "InputCheckbox",
"key": "tcProbeEnabled",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "tcProbeInterval",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "tcProbeTimeout",
"labelsAdded": []
},
{
"tag": "InputNumber",
"key": "tcAdminProbe",
"labelsAdded": []
}
]
@@ -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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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: 115, Skipped: 0, Total: 115, Duration: 262 ms - ZB.MOM.WW.OtOpcUa.AdminUI.Tests.dll (net10.0)
@@ -0,0 +1,64 @@
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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.
[xUnit.net 00:00:01.24] ZB.MOM.WW.OtOpcUa.AdminUI.Tests.Pages.ProtocolFormAccessibilityTests.ProtocolFields_TwoInstancesHaveUniqueNamesAndResolvedDescriptions(type: typeof(ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers.Forms.SqlDriverForm)) [FAIL]
Failed ZB.MOM.WW.OtOpcUa.AdminUI.Tests.Pages.ProtocolFormAccessibilityTests.ProtocolFields_TwoInstancesHaveUniqueNamesAndResolvedDescriptions(type: typeof(ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers.Forms.SqlDriverForm)) [26 ms]
Error Message:
Shouldly.ShouldAssertException : label (null)
should not be null or white space
Additional Info:
SqlDriverForm: <textarea aria-describedby="sql-driver-form-80677986e91c45989dc41cd3d8b3bee3-field-09-hint" id="sql-driver-form-80677986e91c45989dc41cd3d8b3bee3-field-09" class="form-control form-control-sm mono" rows="6" value="" placeholder="{ &quot;activeBatch&quot;: { &quot;sql&quot;: &quot;SELECT line, speed, ts FROM dbo.LineStatus WHERE active = @active&quot;, &quot;params&quot;: { &quot;active&quot;: true } } }" blazor:onchange="1"></textarea>
Stack Trace:
at ZB.MOM.WW.OtOpcUa.AdminUI.Tests.Pages.ProtocolFormAccessibilityTests.ProtocolFields_TwoInstancesHaveUniqueNamesAndResolvedDescriptions(Type type) in /Users/dohertj2/Desktop/OtOpcUa/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Pages/ProtocolFormAccessibilityTests.cs:line 100
at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
Failed! - Failed: 1, Passed: 114, Skipped: 0, Total: 115, Duration: 281 ms - ZB.MOM.WW.OtOpcUa.AdminUI.Tests.dll (net10.0)
@@ -14,26 +14,27 @@
<div style="padding:1rem">
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label" for="s7TimeoutSec">Timeout (seconds)</label>
<InputNumber id="s7TimeoutSec" @bind-Value="_form.TimeoutSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7TimeoutSec")">Timeout (seconds)</label>
<InputNumber DisplayName="Timeout (seconds)" aria-describedby="@FieldId("s7TimeoutSec-error")" id="@FieldId("s7TimeoutSec")" @bind-Value="_form.TimeoutSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div id="@FieldId("s7TimeoutSec-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.TimeoutSeconds)" /> }</div>
</div>
<div class="col-md-4 mb-3">
<label class="form-label" for="s7CpuType">CPU type</label>
<InputSelect id="s7CpuType" @bind-Value="_form.CpuType" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7CpuType")">CPU type</label>
<InputSelect aria-describedby="@FieldIds("s7CpuType-hint")" id="@FieldId("s7CpuType")" @bind-Value="_form.CpuType" @bind-Value:after="EmitAsync"
class="form-select form-select-sm">
@foreach (var v in Enum.GetValues<S7CpuType>())
{
<option value="@v">@v</option>
}
</InputSelect>
<div class="form-text">Controls ISO-TSAP slot byte during handshake.</div>
<div id="@FieldId("s7CpuType-hint")" class="form-text">Controls ISO-TSAP slot byte during handshake.</div>
</div>
</div>
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label" for="s7ConnType">Connection type</label>
<InputSelect id="s7ConnType" @bind-Value="_form.ConnectionTypeText" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7ConnType")">Connection type</label>
<InputSelect aria-describedby="@FieldIds("s7ConnType-hint")" id="@FieldId("s7ConnType")" @bind-Value="_form.ConnectionTypeText" @bind-Value:after="EmitAsync"
class="form-select form-select-sm">
<option value="">Default (slot-derived)</option>
@foreach (var v in Enum.GetValues<S7ConnectionType>())
@@ -41,19 +42,19 @@
<option value="@v">@v</option>
}
</InputSelect>
<div class="form-text">First byte of the remote TSAP. Leave on default unless the CPU needs a PG/OP resource.</div>
<div id="@FieldId("s7ConnType-hint")" class="form-text">First byte of the remote TSAP. Leave on default unless the CPU needs a PG/OP resource.</div>
</div>
<div class="col-md-4 mb-3">
<label class="form-label" for="s7LocalTsap">Local TSAP</label>
<InputText id="s7LocalTsap" @bind-Value="_form.LocalTsap" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7LocalTsap")">Local TSAP</label>
<InputText aria-describedby="@FieldIds("s7LocalTsap-hint")" id="@FieldId("s7LocalTsap")" @bind-Value="_form.LocalTsap" @bind-Value:after="EmitAsync"
class="form-control form-control-sm mono" placeholder="01.00" />
<div class="form-text">Optional hex override, e.g. <code>01.00</code>.</div>
<div id="@FieldId("s7LocalTsap-hint")" class="form-text">Optional hex override, e.g. <code>01.00</code>.</div>
</div>
<div class="col-md-4 mb-3">
<label class="form-label" for="s7RemoteTsap">Remote TSAP</label>
<InputText id="s7RemoteTsap" @bind-Value="_form.RemoteTsap" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7RemoteTsap")">Remote TSAP</label>
<InputText aria-describedby="@FieldIds("s7RemoteTsap-hint")" id="@FieldId("s7RemoteTsap")" @bind-Value="_form.RemoteTsap" @bind-Value:after="EmitAsync"
class="form-control form-control-sm mono" placeholder="03.01" />
<div class="form-text">Optional hex override, e.g. <code>03.01</code>. Not combinable with Connection type.</div>
<div id="@FieldId("s7RemoteTsap-hint")" class="form-text">Optional hex override, e.g. <code>03.01</code>. Not combinable with Connection type.</div>
</div>
</div>
@if (_form.TsapConflictError() is { } tsapError)
@@ -70,26 +71,29 @@
<div class="row">
<div class="col-md-3 mb-3">
<div class="form-check form-switch mt-2">
<InputCheckbox id="s7ProbeEnabled" @bind-Value="_form.ProbeEnabled" @bind-Value:after="EmitAsync"
<InputCheckbox id="@FieldId("s7ProbeEnabled")" @bind-Value="_form.ProbeEnabled" @bind-Value:after="EmitAsync"
class="form-check-input" />
<label class="form-check-label" for="s7ProbeEnabled">Probe enabled</label>
<label class="form-check-label" for="@FieldId("s7ProbeEnabled")">Probe enabled</label>
</div>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="s7ProbeIntervalSec">Probe interval (s)</label>
<InputNumber id="s7ProbeIntervalSec" @bind-Value="_form.ProbeIntervalSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7ProbeIntervalSec")">Probe interval (s)</label>
<InputNumber DisplayName="Probe interval (s)" aria-describedby="@FieldId("s7ProbeIntervalSec-error")" id="@FieldId("s7ProbeIntervalSec")" @bind-Value="_form.ProbeIntervalSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div id="@FieldId("s7ProbeIntervalSec-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.ProbeIntervalSeconds)" /> }</div>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="s7ProbeTimeoutSec">Probe timeout (s)</label>
<InputNumber id="s7ProbeTimeoutSec" @bind-Value="_form.ProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7ProbeTimeoutSec")">Probe timeout (s)</label>
<InputNumber DisplayName="Probe timeout (s)" aria-describedby="@FieldId("s7ProbeTimeoutSec-error")" id="@FieldId("s7ProbeTimeoutSec")" @bind-Value="_form.ProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div id="@FieldId("s7ProbeTimeoutSec-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.ProbeTimeoutSeconds)" /> }</div>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="s7AdminProbeTimeout">Admin probe timeout (s)</label>
<InputNumber id="s7AdminProbeTimeout" @bind-Value="_form.AdminProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("s7AdminProbeTimeout")">Admin probe timeout (s)</label>
<InputNumber DisplayName="Admin probe timeout (s)" aria-describedby="@FieldIds("s7AdminProbeTimeout-error", "s7AdminProbeTimeout-hint")" id="@FieldId("s7AdminProbeTimeout")" @bind-Value="_form.AdminProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div class="form-text">Test Connect timeout (1–60 s).</div>
<div id="@FieldId("s7AdminProbeTimeout-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.AdminProbeTimeoutSeconds)" /> }</div>
<div id="@FieldId("s7AdminProbeTimeout-hint")" class="form-text">Test Connect timeout (1–60 s).</div>
</div>
</div>
</div>
@@ -98,6 +102,11 @@
<DriverResilienceSection ResilienceConfig="@ResilienceConfig" ResilienceConfigChanged="OnResilienceChanged" />
@code {
private readonly string _fieldScope = "s7-driver-form-" + Guid.NewGuid().ToString("N");
private string FieldIds(params string[] names) => string.Join(" ", names.Select(FieldId));
private string FieldId(string name) => $"{_fieldScope}-{name}";
[CascadingParameter] private Microsoft.AspNetCore.Components.Forms.EditContext? _fieldEditContext { get; set; }
/// <summary>The driver-level DriverConfig JSON (protocol; endpoint lives in the device).</summary>
[Parameter] public string DriverConfigJson { get; set; } = "{}";
/// <summary>Fired (camelCase-serialized) whenever a protocol field changes — enables @bind-DriverConfigJson.</summary>
@@ -16,8 +16,8 @@
<div style="padding:1rem">
<div class="row g-3">
<div class="col-md-4">
<label class="form-label">Provider</label>
<InputSelect @bind-Value="_form.Provider" @bind-Value:after="EmitAsync" class="form-select form-select-sm">
<label for="@FieldId("field-01")" class="form-label">Provider</label>
<InputSelect aria-describedby="@FieldIds("field-01-hint")" id="@FieldId("field-01")" @bind-Value="_form.Provider" @bind-Value:after="EmitAsync" class="form-select form-select-sm">
@* Every provider SqlDialects constructs. *@
<option value="@SqlProvider.SqlServer">@SqlProvider.SqlServer</option>
<option value="@SqlProvider.Postgres">@SqlProvider.Postgres</option>
@@ -25,23 +25,25 @@
<option value="@SqlProvider.MySql">@SqlProvider.MySql</option>
<option value="@SqlProvider.Odbc">@SqlProvider.Odbc</option>
</InputSelect>
<div class="form-text">
<div id="@FieldId("field-01-hint")" class="form-text">
SQL Server, PostgreSQL, Oracle and MySQL/MariaDB use managed providers. Odbc speaks ANSI SQL
(INFORMATION_SCHEMA, FETCH FIRST, positional ?) and needs the ODBC driver manager + vendor driver on every host.
</div>
</div>
<div class="col-md-8">
<label class="form-label">Connection string ref <span class="text-danger">*</span></label>
<InputText @bind-Value="_form.ConnectionStringRef" @bind-Value:after="EmitAsync" class="form-control form-control-sm mono"
<label for="@FieldId("field-02")" class="form-label">Connection string ref <span class="text-danger">*</span></label>
<InputText aria-invalid="@(string.IsNullOrWhiteSpace(_form.ConnectionStringRef) ? "true" : null)" aria-describedby="@FieldIds("field-02-hint", "field-02-error")" id="@FieldId("field-02")" @bind-Value="_form.ConnectionStringRef" @bind-Value:after="EmitAsync" class="form-control form-control-sm mono"
placeholder="MesStaging" />
<div class="form-text">
<div id="@FieldId("field-02-hint")" class="form-text">
Name of the <code>Sql__ConnectionStrings__&lt;ref&gt;</code> env var set on the driver + AdminUI hosts —
<strong>not</strong> a connection string. The credential is resolved at startup and never stored in the config.
</div>
<div id="@FieldId("field-02-error")" class="field-error" role="alert">
@if (string.IsNullOrWhiteSpace(_form.ConnectionStringRef))
{
<div class="text-danger small mt-1">Connection string ref is required.</div>
}
</div>
</div>
</div>
</div>
@@ -53,24 +55,28 @@
<div style="padding:1rem">
<div class="row g-3">
<div class="col-md-3">
<label class="form-label">Default poll interval (s)</label>
<InputNumber @bind-Value="_form.DefaultPollIntervalSeconds" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div class="form-text">Blank = factory default. Applied to groups without their own interval.</div>
<label for="@FieldId("field-03")" class="form-label">Default poll interval (s)</label>
<InputNumber DisplayName="Default poll interval (s)" aria-describedby="@FieldIds("field-03-error", "field-03-hint")" id="@FieldId("field-03")" @bind-Value="_form.DefaultPollIntervalSeconds" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div id="@FieldId("field-03-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.DefaultPollIntervalSeconds)" /> }</div>
<div id="@FieldId("field-03-hint")" class="form-text">Blank = factory default. Applied to groups without their own interval.</div>
</div>
<div class="col-md-3">
<label class="form-label">Operation timeout (s)</label>
<InputNumber @bind-Value="_form.OperationTimeoutSeconds" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div class="form-text">Client-side per-query deadline. Should exceed the command timeout.</div>
<label for="@FieldId("field-04")" class="form-label">Operation timeout (s)</label>
<InputNumber DisplayName="Operation timeout (s)" aria-describedby="@FieldIds("field-04-error", "field-04-hint")" id="@FieldId("field-04")" @bind-Value="_form.OperationTimeoutSeconds" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div id="@FieldId("field-04-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.OperationTimeoutSeconds)" /> }</div>
<div id="@FieldId("field-04-hint")" class="form-text">Client-side per-query deadline. Should exceed the command timeout.</div>
</div>
<div class="col-md-3">
<label class="form-label">Command timeout (s)</label>
<InputNumber @bind-Value="_form.CommandTimeoutSeconds" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div class="form-text">ADO.NET server-side CommandTimeout backstop.</div>
<label for="@FieldId("field-05")" class="form-label">Command timeout (s)</label>
<InputNumber DisplayName="Command timeout (s)" aria-describedby="@FieldIds("field-05-error", "field-05-hint")" id="@FieldId("field-05")" @bind-Value="_form.CommandTimeoutSeconds" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div id="@FieldId("field-05-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.CommandTimeoutSeconds)" /> }</div>
<div id="@FieldId("field-05-hint")" class="form-text">ADO.NET server-side CommandTimeout backstop.</div>
</div>
<div class="col-md-3">
<label class="form-label">Max concurrent groups</label>
<InputNumber @bind-Value="_form.MaxConcurrentGroups" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div class="form-text">Blank = factory default. Caps concurrent group queries (pool guard).</div>
<label for="@FieldId("field-06")" class="form-label">Max concurrent groups</label>
<InputNumber DisplayName="Max concurrent groups" aria-describedby="@FieldIds("field-06-error", "field-06-hint")" id="@FieldId("field-06")" @bind-Value="_form.MaxConcurrentGroups" @bind-Value:after="EmitAsync" class="form-control form-control-sm" />
<div id="@FieldId("field-06-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.MaxConcurrentGroups)" /> }</div>
<div id="@FieldId("field-06-hint")" class="form-text">Blank = factory default. Caps concurrent group queries (pool guard).</div>
</div>
</div>
</div>
@@ -83,17 +89,17 @@
<div class="row g-3">
<div class="col-md-4">
<div class="form-check form-switch mt-2">
<InputCheckbox @bind-Value="_form.NullIsBad" @bind-Value:after="EmitAsync" class="form-check-input" id="sqlNullIsBad" />
<label class="form-check-label" for="sqlNullIsBad">NULL cell publishes Bad</label>
<InputCheckbox aria-describedby="@FieldIds("sqlNullIsBad-hint")" @bind-Value="_form.NullIsBad" @bind-Value:after="EmitAsync" class="form-check-input" id="@FieldId("sqlNullIsBad")" />
<label class="form-check-label" for="@FieldId("sqlNullIsBad")">NULL cell publishes Bad</label>
</div>
<div class="form-text mt-0">Unchecked = factory default (a NULL cell publishes Uncertain).</div>
<div id="@FieldId("sqlNullIsBad-hint")" class="form-text mt-0">Unchecked = factory default (a NULL cell publishes Uncertain).</div>
</div>
<div class="col-md-4">
<div class="form-check form-switch mt-2">
<InputCheckbox @bind-Value="_form.AllowWrites" @bind-Value:after="EmitAsync" class="form-check-input" id="sqlAllowWrites" />
<label class="form-check-label" for="sqlAllowWrites">Allow writes</label>
<InputCheckbox aria-describedby="@FieldIds("sqlAllowWrites-hint")" @bind-Value="_form.AllowWrites" @bind-Value:after="EmitAsync" class="form-check-input" id="@FieldId("sqlAllowWrites")" />
<label class="form-check-label" for="@FieldId("sqlAllowWrites")">Allow writes</label>
</div>
<div class="form-text mt-0">
<div id="@FieldId("sqlAllowWrites-hint")" class="form-text mt-0">
Off = every write refused (default). On = only tags whose TagConfig says <code>writable: true</code> are
written, as a single-row parameterised <code>UPDATE</code> committed only when exactly one row matches.
Give the connecting login UPDATE on just those tables.
@@ -105,26 +111,33 @@
@* Named queries (design §5.4) — read by Query-model tags *@
<section class="panel rise mt-3" style="animation-delay:.12s">
<div class="panel-head">Named queries</div>
<div id="@FieldId("queries-heading")" class="panel-head">Named queries</div>
<div style="padding:1rem">
<textarea class="form-control form-control-sm mono" rows="6" value="@_form.QueriesJson"
<textarea aria-labelledby="@FieldId("queries-heading")" aria-invalid="@(_form.QueriesError is not null ? "true" : null)" aria-describedby="@FieldIds("field-09-hint", "field-09-error")" id="@FieldId("field-09")" class="form-control form-control-sm mono" rows="6" value="@_form.QueriesJson"
placeholder='{ "activeBatch": { "sql": "SELECT line, speed, ts FROM dbo.LineStatus WHERE active = @@active", "params": { "active": true } } }'
@onchange="@(async e => { _form.SetQueriesJson(e.Value?.ToString()); await EmitAsync(); })"></textarea>
<div class="form-text">
<div id="@FieldId("field-09-hint")" class="form-text">
JSON object: name → <code>{ "sql", "params", "maxRows" }</code>. Each statement must be a single read-only
<code>SELECT</code>/<code>WITH</code>; parameters are always bound (write the provider's marker — <code>@@name</code>,
Oracle <code>:p_name</code>, Odbc <code>?</code> in order). Queries run inside a rolled-back transaction.
</div>
<div id="@FieldId("field-09-error")" class="field-error" role="alert">
@if (_form.QueriesError is { } queriesError)
{
<div class="text-danger small mt-1">@queriesError — the last valid queries are kept until this is fixed.</div>
}
</div>
</div>
</section>
<DriverResilienceSection ResilienceConfig="@ResilienceConfig" ResilienceConfigChanged="OnResilienceChanged" />
@code {
private readonly string _fieldScope = "sql-driver-form-" + Guid.NewGuid().ToString("N");
private string FieldIds(params string[] names) => string.Join(" ", names.Select(FieldId));
private string FieldId(string name) => $"{_fieldScope}-{name}";
[CascadingParameter] private Microsoft.AspNetCore.Components.Forms.EditContext? _fieldEditContext { get; set; }
/// <summary>The driver-level DriverConfig JSON (connection/dialect; there is no device endpoint).</summary>
[Parameter] public string DriverConfigJson { get; set; } = "{}";
/// <summary>Fired (camelCase-serialized) whenever a field changes — enables @bind-DriverConfigJson.</summary>
@@ -14,56 +14,59 @@
<div style="padding:1rem">
<div class="row">
<div class="col-md-3 mb-3">
<label class="form-label" for="tcTimeoutSec">Timeout (seconds)</label>
<InputNumber id="tcTimeoutSec" @bind-Value="_form.TimeoutSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("tcTimeoutSec")">Timeout (seconds)</label>
<InputNumber DisplayName="Timeout (seconds)" aria-describedby="@FieldIds("tcTimeoutSec-error", "tcTimeoutSec-hint")" id="@FieldId("tcTimeoutSec")" @bind-Value="_form.TimeoutSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div class="form-text">Default 2 s per operation.</div>
<div id="@FieldId("tcTimeoutSec-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.TimeoutSeconds)" /> }</div>
<div id="@FieldId("tcTimeoutSec-hint")" class="form-text">Default 2 s per operation.</div>
</div>
<div class="col-md-4 mb-3">
<div class="form-check form-switch mt-4">
<InputCheckbox id="tcNativeNotif" @bind-Value="_form.UseNativeNotifications" @bind-Value:after="EmitAsync"
<InputCheckbox aria-describedby="@FieldIds("tcNativeNotif-hint")" id="@FieldId("tcNativeNotif")" @bind-Value="_form.UseNativeNotifications" @bind-Value:after="EmitAsync"
class="form-check-input" />
<label class="form-check-label" for="tcNativeNotif">Use native ADS notifications</label>
<label class="form-check-label" for="@FieldId("tcNativeNotif")">Use native ADS notifications</label>
</div>
<div class="form-text">Recommended. Disable for AMS routers with notification limits.</div>
<div id="@FieldId("tcNativeNotif-hint")" class="form-text">Recommended. Disable for AMS routers with notification limits.</div>
</div>
<div class="col-md-4 mb-3">
<div class="form-check form-switch mt-4">
<InputCheckbox id="tcControllerBrowse" @bind-Value="_form.EnableControllerBrowse" @bind-Value:after="EmitAsync"
<InputCheckbox aria-describedby="@FieldIds("tcControllerBrowse-hint")" id="@FieldId("tcControllerBrowse")" @bind-Value="_form.EnableControllerBrowse" @bind-Value:after="EmitAsync"
class="form-check-input" />
<label class="form-check-label" for="tcControllerBrowse">Enable controller browse</label>
<label class="form-check-label" for="@FieldId("tcControllerBrowse")">Enable controller browse</label>
</div>
<div class="form-text">Walks the symbol table via SymbolLoaderFactory at discovery. Default off.</div>
<div id="@FieldId("tcControllerBrowse-hint")" class="form-text">Walks the symbol table via SymbolLoaderFactory at discovery. Default off.</div>
</div>
</div>
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label" for="tcNotifDelay">Notification max delay (ms)</label>
<InputNumber id="tcNotifDelay" @bind-Value="_form.NotificationMaxDelayMs" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("tcNotifDelay")">Notification max delay (ms)</label>
<InputNumber DisplayName="Notification max delay (ms)" aria-describedby="@FieldIds("tcNotifDelay-error", "tcNotifDelay-hint")" id="@FieldId("tcNotifDelay")" @bind-Value="_form.NotificationMaxDelayMs" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div class="form-text">0 = push immediately. Increase to coalesce high-churn signals.</div>
<div id="@FieldId("tcNotifDelay-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.NotificationMaxDelayMs)" /> }</div>
<div id="@FieldId("tcNotifDelay-hint")" class="form-text">0 = push immediately. Increase to coalesce high-churn signals.</div>
</div>
<div class="col-md-4 mb-3">
<div class="form-check form-switch mt-4">
<InputCheckbox id="tcSumRead" @bind-Value="_form.UseSumRead" @bind-Value:after="EmitAsync"
<InputCheckbox aria-describedby="@FieldIds("tcSumRead-hint")" id="@FieldId("tcSumRead")" @bind-Value="_form.UseSumRead" @bind-Value:after="EmitAsync"
class="form-check-input" />
<label class="form-check-label" for="tcSumRead">Batch polled reads (ADS sum-read)</label>
<label class="form-check-label" for="@FieldId("tcSumRead")">Batch polled reads (ADS sum-read)</label>
</div>
<div class="form-text">One round-trip per chunk instead of per tag. Falls back to single reads if the target refuses it. Default off.</div>
<div id="@FieldId("tcSumRead-hint")" class="form-text">One round-trip per chunk instead of per tag. Falls back to single reads if the target refuses it. Default off.</div>
</div>
<div class="col-md-4 mb-3">
<label class="form-label" for="tcSumReadMax">Sum-read max items</label>
<InputNumber id="tcSumReadMax" @bind-Value="_form.SumReadMaxItems" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("tcSumReadMax")">Sum-read max items</label>
<InputNumber DisplayName="Sum-read max items" aria-describedby="@FieldIds("tcSumReadMax-error", "tcSumReadMax-hint")" id="@FieldId("tcSumReadMax")" @bind-Value="_form.SumReadMaxItems" @bind-Value:after="EmitAsync"
min="1" max="500" class="form-control form-control-sm" />
<div class="form-text">Symbols per sum-read command (1-500, default 200).</div>
<div id="@FieldId("tcSumReadMax-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.SumReadMaxItems)" /> }</div>
<div id="@FieldId("tcSumReadMax-hint")" class="form-text">Symbols per sum-read command (1-500, default 200).</div>
</div>
<div class="col-md-4 mb-3">
<div class="form-check form-switch mt-4">
<InputCheckbox id="tcDiagnostics" @bind-Value="_form.DiagnosticsEnabled" @bind-Value:after="EmitAsync"
<InputCheckbox aria-describedby="@FieldIds("tcDiagnostics-hint")" id="@FieldId("tcDiagnostics")" @bind-Value="_form.DiagnosticsEnabled" @bind-Value:after="EmitAsync"
class="form-check-input" />
<label class="form-check-label" for="tcDiagnostics">PLC diagnostics on /hosts</label>
<label class="form-check-label" for="@FieldId("tcDiagnostics")">PLC diagnostics on /hosts</label>
</div>
<div class="form-text">Up to 4 extra reads per device per probe tick. Default off (not yet live-gated).</div>
<div id="@FieldId("tcDiagnostics-hint")" class="form-text">Up to 4 extra reads per device per probe tick. Default off (not yet live-gated).</div>
</div>
</div>
</div>
@@ -76,26 +79,29 @@
<div class="row">
<div class="col-md-3 mb-3">
<div class="form-check form-switch mt-2">
<InputCheckbox id="tcProbeEnabled" @bind-Value="_form.ProbeEnabled" @bind-Value:after="EmitAsync"
<InputCheckbox id="@FieldId("tcProbeEnabled")" @bind-Value="_form.ProbeEnabled" @bind-Value:after="EmitAsync"
class="form-check-input" />
<label class="form-check-label" for="tcProbeEnabled">Probe enabled</label>
<label class="form-check-label" for="@FieldId("tcProbeEnabled")">Probe enabled</label>
</div>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="tcProbeInterval">Probe interval (s)</label>
<InputNumber id="tcProbeInterval" @bind-Value="_form.ProbeIntervalSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("tcProbeInterval")">Probe interval (s)</label>
<InputNumber DisplayName="Probe interval (s)" aria-describedby="@FieldId("tcProbeInterval-error")" id="@FieldId("tcProbeInterval")" @bind-Value="_form.ProbeIntervalSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div id="@FieldId("tcProbeInterval-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.ProbeIntervalSeconds)" /> }</div>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="tcProbeTimeout">Probe timeout (s)</label>
<InputNumber id="tcProbeTimeout" @bind-Value="_form.ProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("tcProbeTimeout")">Probe timeout (s)</label>
<InputNumber DisplayName="Probe timeout (s)" aria-describedby="@FieldId("tcProbeTimeout-error")" id="@FieldId("tcProbeTimeout")" @bind-Value="_form.ProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div id="@FieldId("tcProbeTimeout-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.ProbeTimeoutSeconds)" /> }</div>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="tcAdminProbe">Admin probe timeout (s)</label>
<InputNumber id="tcAdminProbe" @bind-Value="_form.AdminProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
<label class="form-label" for="@FieldId("tcAdminProbe")">Admin probe timeout (s)</label>
<InputNumber DisplayName="Admin probe timeout (s)" aria-describedby="@FieldIds("tcAdminProbe-error", "tcAdminProbe-hint")" id="@FieldId("tcAdminProbe")" @bind-Value="_form.AdminProbeTimeoutSeconds" @bind-Value:after="EmitAsync"
class="form-control form-control-sm" />
<div class="form-text">Test Connect timeout (1–60 s).</div>
<div id="@FieldId("tcAdminProbe-error")" class="field-error">@if (_fieldEditContext is not null) { <ValidationMessage For="@(() => _form.AdminProbeTimeoutSeconds)" /> }</div>
<div id="@FieldId("tcAdminProbe-hint")" class="form-text">Test Connect timeout (1–60 s).</div>
</div>
</div>
</div>
@@ -104,6 +110,11 @@
<DriverResilienceSection ResilienceConfig="@ResilienceConfig" ResilienceConfigChanged="OnResilienceChanged" />
@code {
private readonly string _fieldScope = "twin-c-a-t-driver-form-" + Guid.NewGuid().ToString("N");
private string FieldIds(params string[] names) => string.Join(" ", names.Select(FieldId));
private string FieldId(string name) => $"{_fieldScope}-{name}";
[CascadingParameter] private Microsoft.AspNetCore.Components.Forms.EditContext? _fieldEditContext { get; set; }
/// <summary>The driver-level DriverConfig JSON (protocol/channel; endpoint lives in the device).</summary>
[Parameter] public string DriverConfigJson { get; set; } = "{}";
/// <summary>Fired (camelCase-serialized) whenever a channel field changes — enables @bind-DriverConfigJson.</summary>