From 78a39a1095d847a428249cab82d662421a93e64f Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Fri, 13 Nov 2026 21:43:30 -0500 Subject: [PATCH] Standardize administrative page and table grammar --- .../evidence/ot06-admin/README.md | 7 +++ .../evidence/ot06-admin/build.log | 44 +++++++++++++++++++ .../evidence/ot06-admin/source-freeze.json | 44 +++++++++++++++++++ .../Components/Pages/Account.razor | 9 ++-- .../Components/Pages/ApiKeys.razor | 32 ++++++++------ .../Components/Pages/Certificates.razor | 22 +++++----- .../Components/Pages/Login.razor | 2 + .../Components/Pages/Reservations.razor | 18 ++++---- .../Components/Pages/RoleGrants.razor | 20 +++++---- 9 files changed, 153 insertions(+), 45 deletions(-) create mode 100644 docs/ui-consistency/evidence/ot06-admin/README.md create mode 100644 docs/ui-consistency/evidence/ot06-admin/build.log create mode 100644 docs/ui-consistency/evidence/ot06-admin/source-freeze.json diff --git a/docs/ui-consistency/evidence/ot06-admin/README.md b/docs/ui-consistency/evidence/ot06-admin/README.md new file mode 100644 index 000000000..5d9a1e1e8 --- /dev/null +++ b/docs/ui-consistency/evidence/ot06-admin/README.md @@ -0,0 +1,7 @@ +# Page grammar source checkpoint + +Account, API keys, certificates, reservations, role grants and additive Login page title. Shared compact primary heading/qualified title, semantic section/column headings and named local table scroll regions follow the first runtime-page pilot. C# business bodies, binding/event expressions and route/rendermode/policy attributes are byte-for-byte unchanged; source-freeze.json records exact files/hashes. Release AdminUI build has zero warnings/errors. + +This is a source/build checkpoint, not rendered coverage for every administrative/cluster route. Actual populated/empty/loading/error and narrow/keyboard cases remain explicit OT14 gates. Login retains anonymous static form POST, antiforgery and original return-url semantics; only its PageTitle is added. ClusterOverview separately gates existing authoring destinations via the existing ConfigEditor policy, with real authorization engine4-role regressions retained in ot05-cluster-actions; no endpoint or query changes. + +Parent owns Home/navigation/retired Namespace compatibility scope. No database, LDAP, actor/fleet operations or deployment. diff --git a/docs/ui-consistency/evidence/ot06-admin/build.log b/docs/ui-consistency/evidence/ot06-admin/build.log new file mode 100644 index 000000000..931615b50 --- /dev/null +++ b/docs/ui-consistency/evidence/ot06-admin/build.log @@ -0,0 +1,44 @@ + + ZB.MOM.WW.OtOpcUa.Analyzers -> /Users/dohertj2/Desktop/OtOpcUa/src/Tooling/ZB.MOM.WW.OtOpcUa.Analyzers/bin/Release/netstandard2.0/ZB.MOM.WW.OtOpcUa.Analyzers.dll + ZB.MOM.WW.OtOpcUa.Driver.Calculation.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Calculation.Contracts/bin/Release/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/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing.dll + ZB.MOM.WW.OtOpcUa.Core.Abstractions -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Core.Abstractions.dll + ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts.dll + ZB.MOM.WW.OtOpcUa.Core.Scripting.Abstractions -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting.Abstractions/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Core.Scripting.Abstractions.dll + ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.MTConnect.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.MTConnect.Contracts/bin/Release/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/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts.dll + ZB.MOM.WW.OtOpcUa.Commons -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Commons/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Commons.dll + ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.dll + ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Heidenhain.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Heidenhain.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Heidenhain.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Sql.Dialect -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Sql.Dialect/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Sql.Dialect.dll + ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts.dll + ZB.MOM.WW.OtOpcUa.Cluster -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Cluster/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Cluster.dll + ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Transport -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Transport/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Transport.dll + ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts.dll + ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Browser/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Mqtt.Browser.dll + ZB.MOM.WW.OtOpcUa.Driver.Sql.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Sql.Browser/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.Sql.Browser.dll + ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Session -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Session/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Session.dll + ZB.MOM.WW.OtOpcUa.Core.Scripting -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Core.Scripting.dll + ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Browser/bin/Release/net10.0/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Browser.dll + ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browser -> /Users/dohertj2/Desktop/OtOpcUa/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browser/bin/Release/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/Release/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/Release/net10.0/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.dll + ZB.MOM.WW.OtOpcUa.Configuration -> /Users/dohertj2/Desktop/OtOpcUa/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/bin/Release/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/Release/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/Release/net10.0/ZB.MOM.WW.OtOpcUa.Security.dll + ZB.MOM.WW.OtOpcUa.ControlPlane -> /Users/dohertj2/Desktop/OtOpcUa/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/bin/Release/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/Release/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/Release/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/Release/net10.0/ZB.MOM.WW.OtOpcUa.AdminUI.dll + +Build succeeded. + 0 Warning(s) + 0 Error(s) + +Time Elapsed 00:00:05.56 diff --git a/docs/ui-consistency/evidence/ot06-admin/source-freeze.json b/docs/ui-consistency/evidence/ot06-admin/source-freeze.json new file mode 100644 index 000000000..3ddbde6fd --- /dev/null +++ b/docs/ui-consistency/evidence/ot06-admin/source-freeze.json @@ -0,0 +1,44 @@ +[ + { + "path": "src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Account.razor", + "sha256": "f6ee133eb3391dc34fea4d50d2591b5033f7dfe98fc0d6ca89812f9d91075c14", + "businessBodyByteEqual": true, + "eventBindingExpressionsEqual": true, + "routeAttributesEqual": true + }, + { + "path": "src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/ApiKeys.razor", + "sha256": "5764d66d1a7dce20511a84cb49820350554c001b05afe5bafe5100a38094d95f", + "businessBodyByteEqual": true, + "eventBindingExpressionsEqual": true, + "routeAttributesEqual": true + }, + { + "path": "src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Certificates.razor", + "sha256": "88ec74f3558b89a33f1cac840598532692722c5a94836440cdbcb61a07a48153", + "businessBodyByteEqual": true, + "eventBindingExpressionsEqual": true, + "routeAttributesEqual": true + }, + { + "path": "src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Reservations.razor", + "sha256": "8d77f25d24389fc2dd7c31c1b09f66c05452eaa2243d61aa2908d5bb90e771f9", + "businessBodyByteEqual": true, + "eventBindingExpressionsEqual": true, + "routeAttributesEqual": true + }, + { + "path": "src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/RoleGrants.razor", + "sha256": "06e64fec6d7cf77766e4fe891fd3aa21eac15ebfd1a54fdb29f35a06ecdfd8b6", + "businessBodyByteEqual": true, + "eventBindingExpressionsEqual": true, + "routeAttributesEqual": true + }, + { + "path": "src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Login.razor", + "sha256": "9955a27e69a9da79bfdfd2d380ac4c9be9522e06d4bde1a68a61b232ee4e8373", + "businessBodyByteEqual": true, + "eventBindingExpressionsEqual": true, + "routeAttributesEqual": true + } +] diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Account.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Account.razor index da2a4ffda..347714564 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Account.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Account.razor @@ -6,8 +6,9 @@ @attribute [Authorize(Policy = AdminUiPolicies.AuthenticatedRead)] @using System.Security.Claims -
-

My account

+
+

My account

+
@@ -26,13 +27,13 @@
-
Identity
+

Identity

Username@username
Display name@displayName
-
Fleet roles
+

Fleet roles

Resolved roles diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/ApiKeys.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/ApiKeys.razor index de3d3cf07..7216ba0b7 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/ApiKeys.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/ApiKeys.razor @@ -9,8 +9,10 @@ @inject IApiKeyGalaxyAckIdentityService AckIdentities -
-

OPC UA API keys

+OPC UA API keys · OtOpcUa +
+

OPC UA API keys

+
@if (_created is not null) @@ -28,7 +30,7 @@ }
-
Create a key
+

Create a key

@@ -55,7 +57,7 @@ @if (_ackEditKeyId is not null) {
-
Galaxy alarm-ack identity — key @_ackEditKeyId
+

Galaxy alarm-ack identity — key @_ackEditKeyId

Native Galaxy alarm acknowledges from sessions using this key authenticate as this Galaxy account, and @@ -92,7 +94,7 @@ }
-
Keys
+

Keys

@if (_keys is null) {
Loading…
@@ -105,17 +107,18 @@ } else { - +
+
- - - - - - - - + + + + + + + + @@ -167,6 +170,7 @@ }
NamePrincipalKey idStatusGalaxy ack identityCreated (UTC)Expires (UTC)NamePrincipalKey idStatusGalaxy ack identityCreated (UTC)Expires (UTC)Actions
+
}
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Certificates.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Certificates.razor index a05898fe4..ccd8c0a4e 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Certificates.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Certificates.razor @@ -12,8 +12,10 @@ @implements IDisposable -
-

OPC UA certificates

+OPC UA certificates · OtOpcUa +
+

OPC UA certificates

+
@if (_rows is null) @@ -39,7 +41,7 @@ else @foreach (var store in _rows) {
-
@store.Label · @store.Certificates.Count entry@(store.Certificates.Count == 1 ? "" : "s")
+

@store.Label · @store.Certificates.Count entry@(store.Certificates.Count == 1 ? "" : "s")

@if (string.IsNullOrEmpty(store.Path)) {
No path configured.
@@ -56,18 +58,18 @@ else } else { -
+
- - - - - + + + + + @if (store.Kind is StoreKind.Trusted or StoreKind.Rejected) { - + } diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Login.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Login.razor index 84834dd0c..5cdf2c454 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Login.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Login.razor @@ -10,6 +10,8 @@ wrapper, the .panel shell, and the static form-POST (username/password/returnUrl). *@ @attribute [Microsoft.AspNetCore.Authorization.AllowAnonymous] +Sign in · OtOpcUa + diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Reservations.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Reservations.razor index 693528979..aae435988 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Reservations.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Reservations.razor @@ -7,8 +7,10 @@ @inject IDbContextFactory DbFactory -
-

External ID reservations

+External ID reservations · OtOpcUa +
+

External ID reservations

+
@if (_rows is null) @@ -18,21 +20,21 @@ else {
-
@_rows.Count reservation@(_rows.Count == 1 ? "" : "s")
+

@_rows.Count reservation@(_rows.Count == 1 ? "" : "s")

@if (_rows.Count == 0) {
No reservations yet.
} else { -
+
SubjectIssuerThumbprintNot beforeNot afterSubjectIssuerThumbprintNot beforeNot afterActionsActions
- - - - + + + + diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/RoleGrants.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/RoleGrants.razor index 6cfd84105..0ec07442a 100644 --- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/RoleGrants.razor +++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/RoleGrants.razor @@ -11,15 +11,17 @@ @inject ILdapGroupRoleMappingService RoleMappings -
-

Role grants

+Role grants · OtOpcUa +
+

Role grants

+
@if (_options is not null) {
-
LDAP binding
+

LDAP binding

Enabled@(_options.Enabled ? "yes" : "no")
Server@_options.Server:@_options.Port
Transport@_options.Transport
@@ -33,7 +35,7 @@ }
-
Group → role (database)
+

Group → role (database)

@_error
}
-
+
KindValueEquipment UUIDClusterKindValueEquipment UUIDCluster
- + @if (_rows.Count == 0) { @@ -83,7 +85,7 @@ @if (_options is not null) {
-
Fallback (appsettings) (@(_options.GroupToRole?.Count ?? 0))
+

Fallback (appsettings) (@(_options.GroupToRole?.Count ?? 0))

These Security:Ldap:GroupToRole entries apply when a group has no database row above.
@@ -93,9 +95,9 @@ } else { -
+
LDAP groupRole
LDAP groupRoleActions
- + @foreach (var kvp in _options.GroupToRole.OrderBy(k => k.Key, StringComparer.OrdinalIgnoreCase)) {
LDAP groupResolved role
LDAP groupResolved role