Joseph Doherty
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
52 lines
2.4 KiB
C#
52 lines
2.4 KiB
C#
using ZB.MOM.WW.OtOpcUa.AdminUI.Uns.TagEditors;
|
|
using ZB.MOM.WW.OtOpcUa.Driver.AbCip;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers.DeviceForms;
|
|
|
|
/// <summary>
|
|
/// Typed working model for an AB CIP <c>Device</c>'s connection endpoint (the v3 endpoint→DeviceConfig
|
|
/// split). Authors the <b>PascalCase</b> <c>HostAddress</c>/<c>PlcFamily</c> keys that
|
|
/// <c>AbCipDeviceOptions</c> binds — the exact casing the seed and runtime probe
|
|
/// (<c>PropertyNameCaseInsensitive</c>) expect. Preserves unrecognised keys across a load→save.
|
|
/// </summary>
|
|
public sealed class AbCipDeviceModel
|
|
{
|
|
/// <summary>libplctag gateway/path host address (e.g. <c>ab://gateway/1,0</c>).</summary>
|
|
public string HostAddress { get; set; } = "";
|
|
|
|
/// <summary>Allen-Bradley PLC family.</summary>
|
|
public AbCipPlcFamily PlcFamily { get; set; } = AbCipPlcFamily.ControlLogix;
|
|
|
|
private System.Text.Json.Nodes.JsonObject _bag = new();
|
|
|
|
/// <summary>Loads a model from a DeviceConfig JSON string, defaulting absent keys and retaining
|
|
/// every original key so fields this editor doesn't expose survive a load→save.</summary>
|
|
/// <param name="json">The raw DeviceConfig JSON string, or null for a new/empty device.</param>
|
|
/// <returns>The populated <see cref="AbCipDeviceModel"/>.</returns>
|
|
public static AbCipDeviceModel FromJson(string? json)
|
|
{
|
|
var o = TagConfigJson.ParseOrNew(json);
|
|
return new AbCipDeviceModel
|
|
{
|
|
HostAddress = TagConfigJson.GetString(o, "HostAddress") ?? "",
|
|
PlcFamily = TagConfigJson.GetEnum(o, "PlcFamily", AbCipPlcFamily.ControlLogix),
|
|
_bag = o,
|
|
};
|
|
}
|
|
|
|
/// <summary>Serializes this model back to a DeviceConfig JSON string, writing the PascalCase endpoint
|
|
/// keys over the preserved key bag.</summary>
|
|
/// <returns>The serialised DeviceConfig JSON string.</returns>
|
|
public string ToJson()
|
|
{
|
|
TagConfigJson.Set(_bag, "HostAddress", HostAddress);
|
|
TagConfigJson.Set(_bag, "PlcFamily", PlcFamily);
|
|
return TagConfigJson.Serialize(_bag);
|
|
}
|
|
|
|
/// <summary>Validation hook; returns an error message or null when the model is valid.</summary>
|
|
/// <returns>An error message describing the validation failure, or <c>null</c> when the model is valid.</returns>
|
|
public string? Validate()
|
|
=> string.IsNullOrWhiteSpace(HostAddress) ? "Host address is required." : null;
|
|
}
|