844f93f64f
Extract the 8 typed driver pages into embeddable <Driver>DriverForm bodies (channel/protocol config) and add per-driver <Driver>DeviceForm bodies (connection endpoint -> Device.DeviceConfig, v3 endpoint split). New DriverConfigModal + DeviceModal dispatch by DriverType (DriverTypeNames) for the /raw tree; Test-connect inside DeviceModal builds the merged Driver+Device config transiently via DriverDeviceConfigMerger. Routed pages now host the form bodies and keep working. Round-trip + enum-serialization guard tests for the Modbus driver form + Modbus device model; retargeted the existing page-form serialization tests + the _jsonOpts converter guard to the forms. Claude-Session: https://claude.ai/code/session_01LVneM3eh1UtJxEisFXgmox
215 lines
9.0 KiB
Plaintext
215 lines
9.0 KiB
Plaintext
@page "/clusters/{ClusterId}/drivers/new/twincat"
|
|
@attribute [Authorize(Policy = AdminUiPolicies.ConfigEditor)]
|
|
@rendermode RenderMode.InteractiveServer
|
|
@using Microsoft.AspNetCore.Components.Forms
|
|
@using Microsoft.EntityFrameworkCore
|
|
@using ZB.MOM.WW.OtOpcUa.AdminUI.Clients
|
|
@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers
|
|
@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers.Forms
|
|
@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers.Pickers
|
|
@using ZB.MOM.WW.OtOpcUa.Configuration
|
|
@using ZB.MOM.WW.OtOpcUa.Configuration.Entities
|
|
@inject IDbContextFactory<OtOpcUaConfigDbContext> DbFactory
|
|
@inject NavigationManager Nav
|
|
|
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
|
<h4 class="mb-0">@(IsNew ? "New Beckhoff TwinCAT driver" : "Edit Beckhoff TwinCAT driver") · <span class="mono">@ClusterId</span></h4>
|
|
<a href="/clusters/@ClusterId/drivers" class="btn btn-outline-secondary btn-sm">Cancel</a>
|
|
</div>
|
|
<ClusterNav ClusterId="@ClusterId" ActiveTab="drivers" />
|
|
|
|
@if (!_loaded)
|
|
{
|
|
<p>Loading…</p>
|
|
}
|
|
else if (!IsNew && _existing is null)
|
|
{
|
|
<section class="panel notice rise" style="animation-delay:.02s">
|
|
Driver instance <span class="mono">@DriverInstanceId</span> was not found in cluster <span class="mono">@ClusterId</span>.
|
|
</section>
|
|
}
|
|
else
|
|
{
|
|
<EditForm Model="_identityModel" OnValidSubmit="SubmitAsync" FormName="twincatDriverEdit">
|
|
<DataAnnotationsValidator />
|
|
<DriverFormShell IsNew="IsNew" Busy="_busy" Error="@_error"
|
|
CancelHref="@($"/clusters/{ClusterId}/drivers")"
|
|
OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
|
|
|
|
<DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
|
|
|
|
@if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
|
|
{
|
|
<DriverStatusPanel DriverInstanceId="@DriverInstanceId" Enabled="@_identityModel.Enabled" />
|
|
}
|
|
|
|
<div class="mt-2 mb-3">
|
|
<DriverTestConnectButton DriverType="@DriverTypeKey" GetConfigJson="@(() => _driverConfigJson)" />
|
|
<button type="button" class="btn btn-sm btn-outline-secondary mt-2"
|
|
@onclick="@(() => _showPicker = true)">
|
|
Pick address
|
|
</button>
|
|
</div>
|
|
|
|
<DriverTagPicker @bind-Visible="_showPicker"
|
|
Title="TwinCAT address"
|
|
CurrentAddress="@_pickedAddress"
|
|
OnPickAddress="@OnAddressPicked">
|
|
<TwinCATAddressPickerBody CurrentAddress="@_pickedAddress"
|
|
CurrentAddressChanged="@((s) => _pickedAddress = s)"
|
|
GetConfigJson="@(() => _driverConfigJson)" />
|
|
</DriverTagPicker>
|
|
|
|
<section class="panel notice rise mt-3" style="animation-delay:.04s">
|
|
<div class="panel-head">Connection endpoint</div>
|
|
<div style="padding:1rem" class="text-muted">
|
|
Device host addresses (AMS Net Id:port) now live on the driver's <strong>devices</strong>
|
|
(v3 endpoint→DeviceConfig split). Author them from the Raw tree (<strong>/raw</strong>) device modal.
|
|
</div>
|
|
</section>
|
|
|
|
<TwinCATDriverForm @bind-DriverConfigJson="_driverConfigJson"
|
|
@bind-ResilienceConfig="_resilienceConfig" />
|
|
|
|
<section class="panel notice rise mt-3" style="animation-delay:.18s">
|
|
<div class="panel-head">Tags</div>
|
|
<div style="padding:1rem" class="text-muted">
|
|
Tag authoring moves to the Raw tree (<strong>/raw</strong>) in v3 Batch 2.
|
|
Pre-declared driver tags have been retired.
|
|
</div>
|
|
</section>
|
|
</DriverFormShell>
|
|
</EditForm>
|
|
}
|
|
|
|
@code {
|
|
[Parameter] public string ClusterId { get; set; } = "";
|
|
[Parameter] public string? DriverInstanceId { get; set; }
|
|
|
|
private const string DriverTypeKey = "TwinCat";
|
|
|
|
private bool IsNew => string.IsNullOrEmpty(DriverInstanceId);
|
|
|
|
private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
|
|
private string _driverConfigJson = "{}";
|
|
private string? _resilienceConfig;
|
|
private byte[] _rowVersion = [];
|
|
private DriverInstance? _existing;
|
|
private bool _loaded;
|
|
private bool _busy;
|
|
private string? _error;
|
|
|
|
// Address picker state
|
|
private bool _showPicker;
|
|
private string _pickedAddress = "";
|
|
|
|
private void OnAddressPicked(string address) => _pickedAddress = address;
|
|
|
|
protected override async Task OnInitializedAsync()
|
|
{
|
|
await using var db = await DbFactory.CreateDbContextAsync();
|
|
|
|
if (IsNew)
|
|
{
|
|
_identityModel = new()
|
|
{
|
|
DriverInstanceId = "",
|
|
Name = "",
|
|
DriverType = DriverTypeKey,
|
|
Enabled = true,
|
|
};
|
|
_driverConfigJson = "{}";
|
|
}
|
|
else
|
|
{
|
|
_existing = await db.DriverInstances.AsNoTracking()
|
|
.FirstOrDefaultAsync(d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
|
|
if (_existing is not null)
|
|
{
|
|
_identityModel = new()
|
|
{
|
|
DriverInstanceId = _existing.DriverInstanceId,
|
|
Name = _existing.Name,
|
|
DriverType = _existing.DriverType,
|
|
Enabled = _existing.Enabled,
|
|
};
|
|
_driverConfigJson = string.IsNullOrWhiteSpace(_existing.DriverConfig) ? "{}" : _existing.DriverConfig;
|
|
_resilienceConfig = _existing.ResilienceConfig;
|
|
_rowVersion = _existing.RowVersion;
|
|
}
|
|
}
|
|
_loaded = true;
|
|
}
|
|
|
|
private async Task SubmitAsync()
|
|
{
|
|
_busy = true; _error = null;
|
|
try
|
|
{
|
|
await using var db = await DbFactory.CreateDbContextAsync();
|
|
if (IsNew)
|
|
{
|
|
if (await db.DriverInstances.AnyAsync(d => d.DriverInstanceId == _identityModel.DriverInstanceId))
|
|
{
|
|
_error = $"Driver instance '{_identityModel.DriverInstanceId}' already exists."; return;
|
|
}
|
|
db.DriverInstances.Add(new DriverInstance
|
|
{
|
|
DriverInstanceId = _identityModel.DriverInstanceId,
|
|
ClusterId = ClusterId,
|
|
Name = _identityModel.Name,
|
|
DriverType = DriverTypeKey,
|
|
Enabled = _identityModel.Enabled,
|
|
DriverConfig = _driverConfigJson,
|
|
ResilienceConfig = string.IsNullOrWhiteSpace(_resilienceConfig) ? null : _resilienceConfig,
|
|
});
|
|
}
|
|
else
|
|
{
|
|
var entity = await db.DriverInstances.FirstOrDefaultAsync(
|
|
d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
|
|
if (entity is null) { _error = "Row no longer exists."; return; }
|
|
db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _rowVersion;
|
|
entity.Name = _identityModel.Name;
|
|
entity.Enabled = _identityModel.Enabled;
|
|
entity.DriverConfig = _driverConfigJson;
|
|
entity.ResilienceConfig = string.IsNullOrWhiteSpace(_resilienceConfig) ? null : _resilienceConfig;
|
|
}
|
|
await db.SaveChangesAsync();
|
|
Nav.NavigateTo($"/clusters/{ClusterId}/drivers");
|
|
}
|
|
catch (DbUpdateConcurrencyException)
|
|
{
|
|
_error = "Another user changed this driver instance while you were editing. Reload to see the latest values, then re-apply your changes.";
|
|
}
|
|
catch (Exception ex) { _error = ex.Message; }
|
|
finally { _busy = false; }
|
|
}
|
|
|
|
private async Task DeleteAsync()
|
|
{
|
|
if (IsNew) return;
|
|
_busy = true; _error = null;
|
|
try
|
|
{
|
|
await using var db = await DbFactory.CreateDbContextAsync();
|
|
var entity = await db.DriverInstances.FirstOrDefaultAsync(
|
|
d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
|
|
if (entity is null) { Nav.NavigateTo($"/clusters/{ClusterId}/drivers"); return; }
|
|
db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _rowVersion;
|
|
db.DriverInstances.Remove(entity);
|
|
await db.SaveChangesAsync();
|
|
Nav.NavigateTo($"/clusters/{ClusterId}/drivers");
|
|
}
|
|
catch (DbUpdateConcurrencyException)
|
|
{
|
|
_error = "Another user changed this driver instance while you were viewing it. Reload before deleting.";
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_error = $"Delete failed: {ex.Message}. (Likely because equipment/tags still reference this driver — remove them first.)";
|
|
}
|
|
finally { _busy = false; }
|
|
}
|
|
}
|