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>
96 lines
3.6 KiB
C#
96 lines
3.6 KiB
C#
using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Server.Dashboard;
|
|
|
|
/// <summary>
|
|
/// One node in the dashboard Browse hierarchy tree. Wraps a Galaxy object
|
|
/// and its child objects; the object's attributes are the leaf "tags" the
|
|
/// operator can right-click and add to the subscription panel.
|
|
/// </summary>
|
|
public sealed class DashboardBrowseNode
|
|
{
|
|
/// <summary>The underlying Galaxy object for this node.</summary>
|
|
public required GalaxyObject Object { get; init; }
|
|
|
|
/// <summary>Child objects contained by this object, sorted areas-first then by name.</summary>
|
|
public List<DashboardBrowseNode> Children { get; } = [];
|
|
|
|
/// <summary>The label shown for this node in the tree.</summary>
|
|
public string DisplayName =>
|
|
!string.IsNullOrWhiteSpace(Object.BrowseName) ? Object.BrowseName
|
|
: !string.IsNullOrWhiteSpace(Object.ContainedName) ? Object.ContainedName
|
|
: Object.TagName;
|
|
|
|
/// <summary>True when this node is a Galaxy area rather than an instance object.</summary>
|
|
public bool IsArea => Object.IsArea;
|
|
|
|
/// <summary>The object's attributes — the browsable tags.</summary>
|
|
public IReadOnlyList<GalaxyAttribute> Attributes => Object.Attributes;
|
|
|
|
/// <summary>True when the node has child objects or attributes to expand.</summary>
|
|
public bool HasChildren => Children.Count > 0 || Object.Attributes.Count > 0;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds the dashboard Browse tree from the flat Galaxy object list held
|
|
/// by <c>IGalaxyHierarchyCache</c>. Pure and side-effect free so the
|
|
/// parent/child linkage and ordering rules are unit-testable.
|
|
/// </summary>
|
|
public static class DashboardBrowseTreeBuilder
|
|
{
|
|
/// <summary>Builds the root nodes of the Browse tree.</summary>
|
|
/// <param name="objects">The flat Galaxy object list.</param>
|
|
/// <returns>The root nodes, sorted areas-first then alphabetically.</returns>
|
|
public static IReadOnlyList<DashboardBrowseNode> Build(IReadOnlyList<GalaxyObject> objects)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(objects);
|
|
|
|
Dictionary<int, DashboardBrowseNode> nodes = new(objects.Count);
|
|
foreach (GalaxyObject galaxyObject in objects)
|
|
{
|
|
// Last write wins on a duplicate gobject id — Galaxy ids are unique
|
|
// in practice, but guard so the dictionary build never throws.
|
|
nodes[galaxyObject.GobjectId] = new DashboardBrowseNode { Object = galaxyObject };
|
|
}
|
|
|
|
List<DashboardBrowseNode> roots = [];
|
|
foreach (DashboardBrowseNode node in nodes.Values)
|
|
{
|
|
int parentId = node.Object.ParentGobjectId;
|
|
if (parentId != 0
|
|
&& parentId != node.Object.GobjectId
|
|
&& nodes.TryGetValue(parentId, out DashboardBrowseNode? parent))
|
|
{
|
|
parent.Children.Add(node);
|
|
}
|
|
else
|
|
{
|
|
roots.Add(node);
|
|
}
|
|
}
|
|
|
|
SortRecursive(roots);
|
|
return roots;
|
|
}
|
|
|
|
private static void SortRecursive(List<DashboardBrowseNode> nodes)
|
|
{
|
|
nodes.Sort(CompareNodes);
|
|
foreach (DashboardBrowseNode node in nodes)
|
|
{
|
|
SortRecursive(node.Children);
|
|
}
|
|
}
|
|
|
|
// Areas sort before instance objects; within a group, by display name.
|
|
private static int CompareNodes(DashboardBrowseNode left, DashboardBrowseNode right)
|
|
{
|
|
if (left.IsArea != right.IsArea)
|
|
{
|
|
return left.IsArea ? -1 : 1;
|
|
}
|
|
|
|
return string.Compare(left.DisplayName, right.DisplayName, StringComparison.OrdinalIgnoreCase);
|
|
}
|
|
}
|