feat(cli+templateengine+deploymanager): resolve follow-ups #4/#5/#6/#8 — CLI ergonomics + structured deploy validation error

Closes the four remaining items in the 2026-06-24 template-inheritance/CLI follow-up tracker. #4 — CLI `instance set-bindings` can now set DataSourceReferenceOverride. `--bindings` accepts an optional 3rd element per entry: [attributeName, dataConnectionId, dataSourceReferenceOverride]. A string sets the override; a JSON null or an omitted 3rd element leaves it unset (template default). TryParseBindings accepts 2- or 3-element entries and rejects a non-string/non-null 3rd element or 4+ elements with a clean error. Previously the CLI sent the override as null and silently wiped any existing one (only a raw POST /management could set it). #5 — `template update` is partial, not full-replace (fixed server-side so all clients benefit). UpdateTemplateAsync now uses leave-unchanged semantics: a null description keeps the stored value (pass "" to clear); a null parentTemplateId keeps the existing parent. Parent stays immutable — a non-null differing value is still rejected — but omitting --parent-id is now a no-op instead of failing every derived-template update. #6 — compact `template list`/`get` table output + `--detail`. Table output is now id/name/description/parent/derived + member counts (#attrs/#alarms/ #scripts/#comps/#nativeAlarms) via TemplateTableProjection, fed through a new optional tableProjector seam on CommandHelpers. `--detail` restores the full dump. JSON output is left untouched (always full) so machine consumers are unaffected — the projector only runs on the table path. #8 — structured deploy-time validation error. New ValidationResult.SummarizeErrors() (Commons) returns a grouped, capped summary: leading total count, one line per ValidationCategory, and a per-module rollup (canonical name up to its last dot) with counts + "... and N more module(s)" caps. DeploymentService uses it for the "Pre-deployment validation failed" message and logs the full per-entry list via LogWarning. Replaces the flat semicolon-joined dump that became a wall of text for instances with 50-194 unbound attributes. Tests: +8 Commons (SummarizeErrors), +8 CLI (4 binding 3-element / 4 table projection), +2 net TemplateEngine (partial-update). Affected suites green: Commons 587, CLI 341, TemplateEngine 447, DeploymentManager 101, ManagementService 230, CentralUI 866; full solution builds 0/0. Docs: Component-DeploymentManager.md "Validation Error Reporting"; CLI README (set-bindings 3-element form, template update leave-unchanged, list/get --detail); UpdateTemplateCommand doc; known-issues tracker #4/#5/#6/#8 resolved (all 8 items now closed).
2026-06-24 18:27:42 -04:00
parent 2b5949320c
commit cdd65beb6c
15 changed files with 745 additions and 54 deletions
@@ -0,0 +1,112 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+namespace ZB.MOM.WW.ScadaBridge.CLI.Commands;
+
+/// <summary>
+/// Compact table projection for <c>template list</c> / <c>template get</c> (followup #6).
+/// The management API returns full <c>Template</c> entities — every attribute, alarm,
+/// script, and composition inline — which the generic table renderer dumps as one giant
+/// cell per template (~171 KB for a real catalogue, unusable in a terminal). This
+/// projector reduces each template to id / name / description / parent / derived plus
+/// member <em>counts</em>, leaving JSON output untouched (callers pass this only on the
+/// table path) and the full dump available via the command's <c>--detail</c> flag.
+/// </summary>
+internal static class TemplateTableProjection
+{
+    /// <summary>
+    /// Projects a templates JSON response (an array from <c>list</c> or a single object
+    /// from <c>get</c>) to its compact summary form. Returns the input unchanged when it
+    /// is not JSON or not the expected shape, so the generic renderer's own fallbacks
+    /// still apply.
+    /// </summary>
+    /// <param name="json">The raw success JSON body from the management API.</param>
+    /// <returns>Compact JSON (same array/object shape) suitable for table rendering.</returns>
+    internal static string ProjectSummary(string json)
+    {
+        JsonDocument doc;
+        try
+        {
+            doc = JsonDocument.Parse(json);
+        }
+        catch (JsonException)
+        {
+            // Not JSON (e.g. a proxy error page) — let the renderer print it verbatim.
+            return json;
+        }
+
+        using (doc)
+        {
+            var root = doc.RootElement;
+            if (root.ValueKind == JsonValueKind.Array)
+            {
+                var arr = new JsonArray();
+                foreach (var item in root.EnumerateArray())
+                    arr.Add(ProjectElement(item));
+                return arr.ToJsonString();
+            }
+            if (root.ValueKind == JsonValueKind.Object)
+            {
+                return ProjectElement(root).ToJsonString();
+            }
+            return json;
+        }
+    }
+
+    /// <summary>Projects a single template object to its compact summary node.</summary>
+    private static JsonNode ProjectElement(JsonElement element)
+    {
+        if (element.ValueKind != JsonValueKind.Object)
+            return JsonValue.Create(element.ToString())!;
+
+        // JsonObject preserves insertion order, fixing the column order for the table.
+        return new JsonObject
+        {
+            ["id"] = Int(element, "id"),
+            ["name"] = Str(element, "name"),
+            ["description"] = Str(element, "description"),
+            ["parentTemplateId"] = Int(element, "parentTemplateId"),
+            ["isDerived"] = Bool(element, "isDerived"),
+            ["#attrs"] = Count(element, "attributes"),
+            ["#alarms"] = Count(element, "alarms"),
+            ["#scripts"] = Count(element, "scripts"),
+            ["#comps"] = Count(element, "compositions"),
+            ["#nativeAlarms"] = Count(element, "nativeAlarmSources"),
+        };
+    }
+
+    private static bool TryGetPropertyCI(JsonElement obj, string name, out JsonElement value)
+    {
+        foreach (var prop in obj.EnumerateObject())
+        {
+            if (string.Equals(prop.Name, name, StringComparison.OrdinalIgnoreCase))
+            {
+                value = prop.Value;
+                return true;
+            }
+        }
+        value = default;
+        return false;
+    }
+
+    private static JsonNode? Str(JsonElement obj, string name)
+        => TryGetPropertyCI(obj, name, out var v) && v.ValueKind == JsonValueKind.String
+            ? JsonValue.Create(v.GetString())
+            : null;
+
+    private static JsonNode? Int(JsonElement obj, string name)
+        => TryGetPropertyCI(obj, name, out var v) && v.ValueKind == JsonValueKind.Number && v.TryGetInt32(out var n)
+            ? JsonValue.Create(n)
+            : null;
+
+    private static JsonNode? Bool(JsonElement obj, string name)
+        => TryGetPropertyCI(obj, name, out var v) && (v.ValueKind == JsonValueKind.True || v.ValueKind == JsonValueKind.False)
+            ? JsonValue.Create(v.GetBoolean())
+            : null;
+
+    private static JsonNode Count(JsonElement obj, string name)
+        => JsonValue.Create(
+            TryGetPropertyCI(obj, name, out var v) && v.ValueKind == JsonValueKind.Array
+                ? v.GetArrayLength()
+                : 0);
+}