Joseph Doherty
dc9c0c950c
Apply the ZB.MOM.WW. prefix to all gateway-side projects, folders,
.csproj/.sln contents, C# namespaces, using directives, generated proto
C# (csharp_namespace + checked-in generated files), InternalsVisibleTo
attributes, project-name string literals (LoadProject, .sln lookups,
worker exe paths, staticwebassets manifest), and the install/script/doc
references that point at any of the above. Migrate the solution from
.sln to .slnx via `dotnet sln migrate` and delete the old file.
External-runtime identifiers are intentionally NOT prefixed so external
configuration keeps working:
- GatewayMetrics.cs MeterName ("MxGateway.Server")
- DashboardAuthenticationDefaults Scheme/Policy ("MxGateway.Dashboard")
- GatewayRequestLoggingMiddleware logger category ("MxGateway.Request")
- StaRuntime thread name ("MxGateway.Worker.STA")
- appsettings.json root section "MxGateway" + env-var prefix
MxGateway__... and secret-name MxGateway:ApiKeyPepper
- C:\ProgramData\MxGateway\ data dir paths
Also fixes two tests that were not rename-related but became visible
while validating the rename:
- WorkerLiveMxAccessSmokeTests.ShutDownAsync: cancellation that the
gateway service correctly maps to RpcException(Cancelled) per gRPC
convention was being misclassified as a stream fault. Added a sibling
catch on RpcException with StatusCode.Cancelled.
- IntegrationTestEnvironment.ResolveRepositoryRoot: extracted IsRepositoryRoot
and made it accept either a .git marker OR a .sln/.slnx next to src/
so the worker-exe walker works in non-git working copies.
clients/proto/proto-inputs.json's protoRoot updated to point at
src/ZB.MOM.WW.MxGateway.Contracts/Protos.
Verified by `dotnet build` and a full `dotnet test` of the .slnx with
MXGATEWAY_RUN_LIVE_{MXACCESS,LDAP,GALAXY}_TESTS=1:
Tests: 472/472 pass
Worker.Tests: 280/280 pass (4 dev-rig [Fact(Skip=...)] skipped)
IntegrationTests: 18/18 pass
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
64 lines
2.5 KiB
C#
64 lines
2.5 KiB
C#
using ZB.MOM.WW.MxGateway.Contracts.Proto;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Server.Dashboard;
|
|
|
|
/// <summary>
|
|
/// One active-alarm row as shown on the dashboard Alarms tab. Projected
|
|
/// from an <see cref="ActiveAlarmSnapshot"/> so the Razor component never
|
|
/// touches protobuf types directly.
|
|
/// </summary>
|
|
public sealed record DashboardActiveAlarm(
|
|
string Reference,
|
|
string Provider,
|
|
string Area,
|
|
string Source,
|
|
string AlarmType,
|
|
int Severity,
|
|
AlarmConditionState State,
|
|
DateTimeOffset? LastTransition,
|
|
string OperatorUser,
|
|
string OperatorComment,
|
|
string Description)
|
|
{
|
|
/// <summary>Projects a worker active-alarm snapshot into a dashboard alarm row.</summary>
|
|
/// <param name="snapshot">The snapshot returned by <c>QueryActiveAlarms</c>.</param>
|
|
/// <returns>The projected dashboard alarm.</returns>
|
|
public static DashboardActiveAlarm FromSnapshot(ActiveAlarmSnapshot snapshot)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(snapshot);
|
|
|
|
string provider = string.Empty;
|
|
string reference = snapshot.AlarmFullReference ?? string.Empty;
|
|
int bang = reference.IndexOf('!', StringComparison.Ordinal);
|
|
if (bang > 0)
|
|
{
|
|
provider = reference[..bang];
|
|
}
|
|
|
|
return new DashboardActiveAlarm(
|
|
Reference: reference,
|
|
Provider: provider,
|
|
Area: snapshot.Category ?? string.Empty,
|
|
Source: snapshot.SourceObjectReference ?? string.Empty,
|
|
AlarmType: snapshot.AlarmTypeName ?? string.Empty,
|
|
Severity: snapshot.Severity,
|
|
State: snapshot.CurrentState,
|
|
LastTransition: snapshot.LastTransitionTimestamp?.ToDateTimeOffset(),
|
|
OperatorUser: snapshot.OperatorUser ?? string.Empty,
|
|
OperatorComment: snapshot.OperatorComment ?? string.Empty,
|
|
Description: snapshot.Description ?? string.Empty);
|
|
}
|
|
|
|
/// <summary>True when this alarm is active and not yet acknowledged.</summary>
|
|
public bool IsUnacknowledged => State == AlarmConditionState.Active;
|
|
}
|
|
|
|
/// <summary>Result of a dashboard active-alarm query.</summary>
|
|
/// <param name="Alarms">The active alarms, or an empty list on error.</param>
|
|
/// <param name="Error">A diagnostic message when the query failed; otherwise null.</param>
|
|
/// <param name="WorkerProcessId">The worker process id backing the dashboard session, when available.</param>
|
|
public sealed record DashboardAlarmQueryResult(
|
|
IReadOnlyList<DashboardActiveAlarm> Alarms,
|
|
string? Error,
|
|
int? WorkerProcessId);
|