0687bb2e2d
Adds the draft-editor tab + page surface for authoring Phase 7 virtual tags and scripted alarms, plus the /alarms/historian operator diagnostics page. Monaco loads from CDN via a progressive-enhancement JS shim — the textarea works immediately so the page is functional even if the CDN is unreachable. ## New services (Admin) - ScriptService — CRUD for Script entity. SHA-256 SourceHash recomputed on save so Core.Scripting's CompiledScriptCache hits on re-publish of unchanged source + misses when the source actually changes. - VirtualTagService — CRUD for VirtualTag, with Enabled toggle. - ScriptedAlarmService — CRUD for ScriptedAlarm + lookup of persistent ScriptedAlarmState (logical-id-keyed per plan decision #14). - ScriptTestHarnessService — pre-publish dry-run. Enforces plan decision #22: only inputs the DependencyExtractor identifies can be supplied. Missing / extra synthetic inputs surface as dedicated outcomes. Captures SetVirtualTag writes + Serilog events from the script so the operator can see both the output + the log output before publishing. - HistorianDiagnosticsService — surfaces the local-process IAlarmHistorianSink state on /alarms/historian. Null sink reports Disabled + swallows retry. Live SqliteStoreAndForwardSink reports real queue depth + last-error + drain state and routes the Retry-dead-lettered button through. ## New UI - ScriptsTab.razor (inside DraftEditor tabs) — list + create/edit/delete scripts with Monaco editor + dependency preview + test-harness run panel showing output + writes + log emissions. - ScriptEditor.razor — reusable Monaco-backed textarea. Loads editor from CDN via wwwroot/js/monaco-loader.js. Textarea stays authoritative for Blazor binding; Monaco mirrors into it on every keystroke. - AlarmsHistorian.razor (/alarms/historian) — queue depth + dead-letter depth + drain state badge + last-error banner + Retry-dead-lettered button. - DraftEditor.razor — new "Scripts" tab. ## DI wiring All five services registered in Program.cs. Null historian sink bound at Admin composition time (real SqliteStoreAndForwardSink lives in the Server process). ## Tests — 13/13 Phase7ServicesTests covers: - ScriptService: Add generates logical id + hash, Update recomputes hash on source change, Update same-source keeps hash (cache-hit preservation), Delete is idempotent - VirtualTagService: round-trips trigger flags, Enabled toggle works - ScriptedAlarmService: HistorizeToAveva defaults true per plan decision #15 - ScriptTestHarness: successful run captures output + writes, rejects missing / extra inputs, rejects non-literal paths, compile errors surface as Threw - HistorianDiagnosticsService: null sink reports Disabled + retry returns 0
80 lines
2.7 KiB
Plaintext
80 lines
2.7 KiB
Plaintext
@page "/alarms/historian"
|
|
@using ZB.MOM.WW.OtOpcUa.Admin.Services
|
|
@using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian
|
|
@inject HistorianDiagnosticsService Diag
|
|
|
|
<h1>Alarm historian</h1>
|
|
<p class="text-muted">Local store-and-forward queue that ships alarm events to Aveva Historian via Galaxy.Host.</p>
|
|
|
|
<div class="card mb-3">
|
|
<div class="card-body">
|
|
<div class="row">
|
|
<div class="col-md-3">
|
|
<small class="text-muted">Drain state</small>
|
|
<h4><span class="badge @BadgeFor(_status.DrainState)">@_status.DrainState</span></h4>
|
|
</div>
|
|
<div class="col-md-3">
|
|
<small class="text-muted">Queue depth</small>
|
|
<h4>@_status.QueueDepth.ToString("N0")</h4>
|
|
</div>
|
|
<div class="col-md-3">
|
|
<small class="text-muted">Dead-letter depth</small>
|
|
<h4 class="@(_status.DeadLetterDepth > 0 ? "text-warning" : "")">@_status.DeadLetterDepth.ToString("N0")</h4>
|
|
</div>
|
|
<div class="col-md-3">
|
|
<small class="text-muted">Last success</small>
|
|
<h4>@(_status.LastSuccessUtc?.ToString("u") ?? "—")</h4>
|
|
</div>
|
|
</div>
|
|
|
|
@if (!string.IsNullOrEmpty(_status.LastError))
|
|
{
|
|
<div class="alert alert-warning mt-3 mb-0">
|
|
<strong>Last error:</strong> @_status.LastError
|
|
</div>
|
|
}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="d-flex gap-2">
|
|
<button class="btn btn-outline-secondary" @onclick="RefreshAsync">Refresh</button>
|
|
<button class="btn btn-warning" disabled="@(_status.DeadLetterDepth == 0)" @onclick="RetryDeadLetteredAsync">
|
|
Retry dead-lettered (@_status.DeadLetterDepth)
|
|
</button>
|
|
</div>
|
|
|
|
@if (_retryResult is not null)
|
|
{
|
|
<div class="alert alert-success mt-3">Requeued @_retryResult row(s) for retry.</div>
|
|
}
|
|
|
|
@code {
|
|
private HistorianSinkStatus _status = new(0, 0, null, null, null, HistorianDrainState.Disabled);
|
|
private int? _retryResult;
|
|
|
|
protected override void OnInitialized() => _status = Diag.GetStatus();
|
|
|
|
private Task RefreshAsync()
|
|
{
|
|
_status = Diag.GetStatus();
|
|
_retryResult = null;
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
private Task RetryDeadLetteredAsync()
|
|
{
|
|
_retryResult = Diag.TryRetryDeadLettered();
|
|
_status = Diag.GetStatus();
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
private static string BadgeFor(HistorianDrainState s) => s switch
|
|
{
|
|
HistorianDrainState.Idle => "bg-success",
|
|
HistorianDrainState.Draining => "bg-info",
|
|
HistorianDrainState.BackingOff => "bg-warning text-dark",
|
|
HistorianDrainState.Disabled => "bg-secondary",
|
|
_ => "bg-secondary",
|
|
};
|
|
}
|