feat(historian): carry isHistorized + historianTagname through EquipmentTagPlan (byte-parity)

2026-06-14 18:55:04 -04:00
parent fb906f26ac
commit 440929c82a
4 changed files with 271 additions and 3 deletions
@@ -446,7 +446,9 @@ public static class DeploymentArtifact
                DataType: dataType ?? "BaseDataType",
                FullName: ExtractTagFullName(tagConfig),
                Writable: writable,
-                Alarm: ExtractTagAlarm(tagConfig)));
+                Alarm: ExtractTagAlarm(tagConfig),
+                IsHistorized: ExtractTagHistorize(tagConfig).IsHistorized,
+                HistorianTagname: ExtractTagHistorize(tagConfig).HistorianTagname));
        }

        result.Sort((a, b) =>
@@ -672,6 +674,34 @@ public static class DeploymentArtifact
        catch (JsonException) { return null; }
    }

+    /// <summary>Parses the optional server-side HistoryRead intent from a tag's <c>TagConfig</c> JSON:
+    /// the <c>isHistorized</c> bool (absent / not a bool / non-object root / blank / malformed ⇒
+    /// <c>false</c>) and the optional <c>historianTagname</c> string override (absent / not a string /
+    /// whitespace-or-empty ⇒ <c>null</c>, meaning the historian tagname defaults to the tag's FullName,
+    /// resolved later). The raw string value is used — not trimmed. Never throws. The live-edit side
+    /// (<c>Phase7Composer.ExtractTagHistorize</c>) MUST parse identically (byte-parity).</summary>
+    private static (bool IsHistorized, string? HistorianTagname) ExtractTagHistorize(string? tagConfig)
+    {
+        if (string.IsNullOrWhiteSpace(tagConfig)) return (false, null);
+        try
+        {
+            using var doc = JsonDocument.Parse(tagConfig);
+            if (doc.RootElement.ValueKind != JsonValueKind.Object) return (false, null);
+            var isHistorized = doc.RootElement.TryGetProperty("isHistorized", out var hEl)
+                && (hEl.ValueKind == JsonValueKind.True || hEl.ValueKind == JsonValueKind.False)
+                && hEl.GetBoolean();
+            string? tagname = null;
+            if (doc.RootElement.TryGetProperty("historianTagname", out var nEl)
+                && nEl.ValueKind == JsonValueKind.String)
+            {
+                var raw = nEl.GetString();
+                if (!string.IsNullOrWhiteSpace(raw)) tagname = raw;
+            }
+            return (isHistorized, tagname);
+        }
+        catch (JsonException) { return (false, null); }
+    }
+
    private static IReadOnlyList<T> ReadArray<T>(JsonElement root, string propertyName, Func<JsonElement, T?> reader)
        where T : class
    {