v3(b1-wp4b): make AdminUI compile against greenfield schema behind Batch-2/3 stubs

Namespace entity + NamespaceKind retired; DriverInstance dropped NamespaceId; Tag is raw-only (no EquipmentId/DriverInstanceId/FullName/FolderPath); driver options replaced pre-declared Tags with RawTags. Stub the retired surfaces so the AdminUI + Host build green; real Raw/UNS authoring arrives in v3 Batch 2/3. - ClusterNamespaces/NamespaceEdit: bodies replaced with 'Namespaces retired' banner - DriverIdentitySection: dropped Namespace dropdown + NamespaceId model field - 8 driver pages: dropped Namespace binding; retired the pre-declared Tags editor (replaced with a '/raw Batch 2' note); multi-device pages keep their Devices editor - UnsTreeService: equipment-tag counts/list -> empty; Create/UpdateTag -> failure result ('Tag authoring moved to the Raw tree (/raw) in v3 Batch 2'); Namespace/ driver-binding queries removed - IScriptTagCatalog: project surviving Tag columns only (path from TagConfig FullName, else Name) - OpcUaClientTagConfigEditor: rebind stale FullName -> model's NodeId - ClusterDrivers: drop retired NamespaceId column AdminUI + Host build 0/0. AdminUI.Tests / Host.IntegrationTests remain red (WP6).
2026-07-15 21:09:04 -04:00
parent 604928b29d
commit 11576460a7
15 changed files with 155 additions and 1147 deletions
@@ -37,7 +37,7 @@ else
                         CancelHref="@($"/clusters/{ClusterId}/drivers")"
                         OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">

-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />

            @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
            {
@@ -140,37 +140,13 @@ else
            </CollectionEditor>

            @* Tags *@
-            <CollectionEditor TRow="AbLegacyTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                              AnimationDelay=".12s"
-                              NewRow="@(() => new AbLegacyTagRow())" Clone="@(r => r.Clone())"
-                              Validate="AbLegacyTagRow.ValidateRow">
-                <HeaderTemplate>
-                    <tr><th>Name</th><th>Device</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
-                </HeaderTemplate>
-                <RowTemplate Context="t">
-                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
-                    <td class="mono">@t.Address</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-                </RowTemplate>
-                <EditTemplate Context="t">
-                    <div class="row g-3">
-                        <div class="col-md-6"><label class="form-label">Name</label>
-                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
-                        <div class="col-md-6"><label class="form-label">Device host address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
-                                   placeholder="10.0.0.10" /></div>
-                        <div class="col-md-6"><label class="form-label">Address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.Address"
-                                   placeholder="e.g. N7:0, F8:0, B3:0/0" /></div>
-                        <div class="col-md-3"><label class="form-label">Data type</label>
-                            <select class="form-select form-select-sm" @bind="t.DataType">
-                                @foreach (var e in Enum.GetValues<AbLegacyDataType>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><div class="form-check form-switch mt-4">
-                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
-                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
-                    </div>
-                </EditTemplate>
-            </CollectionEditor>
+            <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>

            <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
        </DriverFormShell>
@@ -196,7 +172,6 @@ else
    private FormModel _form = new();
    private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
    private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
    private bool _loaded;
    private bool _busy;
    private string? _error;
@@ -209,15 +184,10 @@ else

    // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
    private List<AbLegacyDeviceRow> _devices = [];
-    private List<AbLegacyTagRow> _tags = [];

    protected override async Task OnInitializedAsync()
    {
        await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId)
-            .ToListAsync();

        if (IsNew)
        {
@@ -226,7 +196,6 @@ else
                DriverInstanceId = "",
                Name = "",
                DriverType = DriverTypeKey,
-                NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "",
                Enabled = true,
            };
            _form = new FormModel();
@@ -242,7 +211,6 @@ else
                    DriverInstanceId = _existing.DriverInstanceId,
                    Name = _existing.Name,
                    DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                    Enabled = _existing.Enabled,
                };
                var opts = TryDeserialize(_existing.DriverConfig) ?? new AbLegacyDriverOptions();
@@ -250,7 +218,6 @@ else
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
                _devices = opts.Devices.Select(AbLegacyDeviceRow.FromDefinition).ToList();
-                _tags = opts.Tags.Select(AbLegacyTagRow.FromDefinition).ToList();
            }
        }
        _loaded = true;
@@ -263,8 +230,7 @@ else
        {
            var configJson = System.Text.Json.JsonSerializer.Serialize(
                _form.ToOptions(
-                    _devices.Select(r => r.ToDefinition()).ToList(),
-                    _tags.Select(r => r.ToDefinition()).ToList()),
+                    _devices.Select(r => r.ToDefinition()).ToList()),
                _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
@@ -278,7 +244,6 @@ else
                {
                    DriverInstanceId = _identityModel.DriverInstanceId,
                    ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                    Name = _identityModel.Name,
                    DriverType = DriverTypeKey,
                    Enabled = _identityModel.Enabled,
@@ -292,7 +257,6 @@ else
                    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 = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                entity.Name = _identityModel.Name;
                entity.Enabled = _identityModel.Enabled;
                entity.DriverConfig = configJson;
@@ -338,8 +302,7 @@ else
    private string SerializeCurrentConfig()
        => System.Text.Json.JsonSerializer.Serialize(
            _form.ToOptions(
-                _devices.Select(r => r.ToDefinition()).ToList(),
-                _tags.Select(r => r.ToDefinition()).ToList()),
+                _devices.Select(r => r.ToDefinition()).ToList()),
            _jsonOpts);

    private static AbLegacyDriverOptions? TryDeserialize(string json)
@@ -388,51 +351,6 @@ else
        }
    }

-    // Mutable VM for the modal editor — AbLegacyTagDefinition is an immutable record.
-    public sealed class AbLegacyTagRow
-    {
-        public string Name { get; set; } = "";
-        public string DeviceHostAddress { get; set; } = "";
-        public string Address { get; set; } = "";
-        public AbLegacyDataType DataType { get; set; } = AbLegacyDataType.Int;
-        public bool Writable { get; set; } = true;
-
-        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
-        // (WriteIdempotent) across a load→save.
-        private AbLegacyTagDefinition? _source;
-
-        public AbLegacyTagRow Clone() => (AbLegacyTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
-
-        public static AbLegacyTagRow FromDefinition(AbLegacyTagDefinition d) => new()
-        {
-            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, Address = d.Address,
-            DataType = d.DataType, Writable = d.Writable,
-            _source = d,
-        };
-
-        public AbLegacyTagDefinition ToDefinition()
-        {
-            var baseDef = _source ?? new AbLegacyTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), Address.Trim(), DataType);
-            return baseDef with
-            {
-                Name = Name.Trim(),
-                DeviceHostAddress = DeviceHostAddress.Trim(),
-                Address = Address.Trim(),
-                DataType = DataType,
-                Writable = Writable,
-            };
-        }
-
-        public static string? ValidateRow(AbLegacyTagRow row, IReadOnlyList<AbLegacyTagRow> all, int? editIndex)
-        {
-            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
-            for (var i = 0; i < all.Count; i++)
-                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
-                    return $"Duplicate tag name '{row.Name}'.";
-            return null;
-        }
-    }
-
    // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
    // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
    public sealed class FormModel
@@ -464,11 +382,9 @@ else
        };

        public AbLegacyDriverOptions ToOptions(
-            IReadOnlyList<AbLegacyDeviceOptions> devices,
-            IReadOnlyList<AbLegacyTagDefinition> tags) => new()
+            IReadOnlyList<AbLegacyDeviceOptions> devices) => new()
        {
            Devices = devices,
-            Tags = tags,
            Probe = new AbLegacyProbeOptions
            {
                Enabled = ProbeEnabled,