45740578c9
v2-ci / build (push) Failing after 52s
v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped
v2-ci / integration (push) Has been skipped
Same single-page edit-or-create pattern as batch 1, applied to the
foundational topology entities. After this batch the whole hierarchy
(cluster → nodes → UNS areas → UNS lines → namespaces → drivers) is
fully editable through the UI.
- ClusterEdit.razor /clusters/{id}/edit
Update + delete for an existing cluster. NodeCount stays coupled to
RedundancyMode (None→1, Warm/Hot→2). ModifiedBy taken from
AuthenticationStateProvider.
- NodeEdit.razor /clusters/{id}/nodes/{new|nodeId}
Full ClusterNode CRUD. ApplicationUri uniqueness is enforced by EF
index; ServiceLevelBase defaults to 200 (primary preference) on
create; per-node DriverConfigOverridesJson validated as JSON.
- UnsAreaEdit.razor /clusters/{id}/uns/areas/{new|id}
- UnsLineEdit.razor /clusters/{id}/uns/lines/{new|id}
UNS structure CRUD; Lines pick their parent Area from a select that
loads the cluster's areas.
List pages updated:
- ClusterOverview now shows an "Edit cluster" button + a "New node"
action on the nodes panel + per-row Edit buttons.
- ClusterUns gains New/Edit affordances for both Areas and Lines.
All 9 integration tests still green; no regressions.
140 lines
5.8 KiB
Plaintext
140 lines
5.8 KiB
Plaintext
@page "/clusters/{ClusterId}"
|
|
@attribute [Microsoft.AspNetCore.Authorization.Authorize]
|
|
@rendermode RenderMode.InteractiveServer
|
|
@using Microsoft.EntityFrameworkCore
|
|
@using ZB.MOM.WW.OtOpcUa.Configuration
|
|
@using ZB.MOM.WW.OtOpcUa.Configuration.Entities
|
|
@inject IDbContextFactory<OtOpcUaConfigDbContext> DbFactory
|
|
@inject NavigationManager Nav
|
|
|
|
@if (!_loaded)
|
|
{
|
|
<p>Loading…</p>
|
|
}
|
|
else if (_cluster is null)
|
|
{
|
|
<section class="panel notice rise" style="animation-delay:.02s">
|
|
Cluster <span class="mono">@ClusterId</span> was not found.
|
|
<a class="ms-2" href="/clusters">Back to list</a>.
|
|
</section>
|
|
}
|
|
else
|
|
{
|
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
|
<div>
|
|
<h4 class="mb-0">@_cluster.Name</h4>
|
|
<span class="mono text-muted">@_cluster.ClusterId</span>
|
|
@if (!_cluster.Enabled) { <span class="chip chip-idle ms-2">Disabled</span> }
|
|
</div>
|
|
<div class="d-flex gap-2">
|
|
<a href="/clusters/@ClusterId/edit" class="btn btn-outline-secondary btn-sm">Edit cluster</a>
|
|
<a href="/deployments" class="btn btn-outline-primary btn-sm">Deployments</a>
|
|
</div>
|
|
</div>
|
|
|
|
<ClusterNav ClusterId="@ClusterId" ActiveTab="overview" />
|
|
|
|
<section class="card-grid rise" style="animation-delay:.08s">
|
|
<div class="metric-card">
|
|
<div class="panel-head">Cluster details</div>
|
|
<div class="kv"><span class="k">Enterprise / Site</span><span class="v">@_cluster.Enterprise / @_cluster.Site</span></div>
|
|
<div class="kv"><span class="k">Redundancy</span><span class="v">@_cluster.RedundancyMode (@_cluster.NodeCount node@(_cluster.NodeCount == 1 ? "" : "s"))</span></div>
|
|
<div class="kv"><span class="k">Created</span><span class="v">@_cluster.CreatedAt.ToString("u") by @_cluster.CreatedBy</span></div>
|
|
@if (_cluster.ModifiedAt is not null)
|
|
{
|
|
<div class="kv"><span class="k">Modified</span><span class="v">@_cluster.ModifiedAt?.ToString("u") by @(_cluster.ModifiedBy ?? "—")</span></div>
|
|
}
|
|
@if (!string.IsNullOrWhiteSpace(_cluster.Notes))
|
|
{
|
|
<div class="kv"><span class="k">Notes</span><span class="v">@_cluster.Notes</span></div>
|
|
}
|
|
</div>
|
|
|
|
<div class="metric-card">
|
|
<div class="panel-head">Last deployment</div>
|
|
@if (_lastDeployment is null)
|
|
{
|
|
<div class="kv"><span class="k">Status</span><span class="v text-muted">none — cluster has never been deployed</span></div>
|
|
}
|
|
else
|
|
{
|
|
<div class="kv"><span class="k">Revision</span><span class="v mono">@_lastDeployment.RevisionHash[..16]…</span></div>
|
|
<div class="kv"><span class="k">Status</span><span class="v">@_lastDeployment.Status</span></div>
|
|
<div class="kv"><span class="k">Created</span><span class="v">@_lastDeployment.CreatedAtUtc.ToString("u")</span></div>
|
|
@if (_lastDeployment.SealedAtUtc is not null)
|
|
{
|
|
<div class="kv"><span class="k">Sealed</span><span class="v">@_lastDeployment.SealedAtUtc?.ToString("u")</span></div>
|
|
}
|
|
}
|
|
</div>
|
|
</section>
|
|
|
|
<section class="panel rise mt-3" style="animation-delay:.14s">
|
|
<div class="panel-head d-flex align-items-center">
|
|
<span>Nodes</span>
|
|
<a href="/clusters/@ClusterId/nodes/new" class="btn btn-sm btn-outline-primary ms-auto">New node</a>
|
|
</div>
|
|
@if (_nodes is null || _nodes.Count == 0)
|
|
{
|
|
<div style="padding:1rem" class="text-muted">No nodes registered.</div>
|
|
}
|
|
else
|
|
{
|
|
<div class="table-wrap">
|
|
<table class="data-table">
|
|
<thead>
|
|
<tr>
|
|
<th>Node ID</th>
|
|
<th>Host</th>
|
|
<th>OPC UA port</th>
|
|
<th>ApplicationUri</th>
|
|
<th class="num">ServiceLevel base</th>
|
|
<th></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
@foreach (var n in _nodes)
|
|
{
|
|
<tr>
|
|
<td><span class="mono">@n.NodeId</span></td>
|
|
<td>@n.Host</td>
|
|
<td class="num">@n.OpcUaPort</td>
|
|
<td><span class="mono small">@n.ApplicationUri</span></td>
|
|
<td class="num">@n.ServiceLevelBase</td>
|
|
<td><a href="/clusters/@ClusterId/nodes/@n.NodeId" class="btn btn-sm btn-outline-primary">Edit</a></td>
|
|
</tr>
|
|
}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
}
|
|
</section>
|
|
}
|
|
|
|
@code {
|
|
[Parameter] public string ClusterId { get; set; } = "";
|
|
|
|
private bool _loaded;
|
|
private ServerCluster? _cluster;
|
|
private List<ClusterNode>? _nodes;
|
|
private Deployment? _lastDeployment;
|
|
|
|
protected override async Task OnInitializedAsync()
|
|
{
|
|
await using var db = await DbFactory.CreateDbContextAsync();
|
|
_cluster = await db.ServerClusters.AsNoTracking()
|
|
.FirstOrDefaultAsync(c => c.ClusterId == ClusterId);
|
|
if (_cluster is not null)
|
|
{
|
|
_nodes = await db.ClusterNodes.AsNoTracking()
|
|
.Where(n => n.ClusterId == ClusterId)
|
|
.OrderBy(n => n.NodeId)
|
|
.ToListAsync();
|
|
_lastDeployment = await db.Deployments.AsNoTracking()
|
|
.OrderByDescending(d => d.CreatedAtUtc)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
_loaded = true;
|
|
}
|
|
}
|