feat(native-alarms): per-binding IsMesReportable on native alarm source bindings (ScadaBridge#59)
TemplateNativeAlarmSource.IsMesReportable + tri-state InstanceNativeAlarmSourceOverride .IsMesReportableOverride flatten onto ResolvedNativeAlarmSource; NativeAlarmActor stamps every mirrored condition and InstanceActor the quiet-binding placeholder, so ScriptAlarm, Alarms.MesReportableAsync() and the #60 wire fields carry it. Additive to the 900-999 severity band. Migration AddNativeAlarmSourceMesReportable. Management commands, CLI --mes-reportable, Central UI (template dialog checkbox, instance override select), Transport DTOs/importer/diff and the revision hash (true-only, so existing hashes are unchanged) carry it. Claude-Session: https://claude.ai/code/session_01GT67AEHd2Acv1YPwGfXEoV
This commit is contained in:
@@ -503,7 +503,8 @@ public sealed class ArtifactDiff
|
||||
i => i.SourceCanonicalName,
|
||||
(e, i) => e.ConnectionNameOverride == i.ConnectionNameOverride
|
||||
&& e.SourceReferenceOverride == i.SourceReferenceOverride
|
||||
&& e.ConditionFilterOverride == i.ConditionFilterOverride,
|
||||
&& e.ConditionFilterOverride == i.ConditionFilterOverride
|
||||
&& e.IsMesReportableOverride == i.IsMesReportableOverride,
|
||||
"NativeAlarmSourceOverrides",
|
||||
changes);
|
||||
|
||||
|
||||
@@ -2610,6 +2610,7 @@ public sealed class BundleImporter : IBundleImporter
|
||||
ConnectionName = n.ConnectionName,
|
||||
SourceReference = n.SourceReference,
|
||||
ConditionFilter = n.ConditionFilter,
|
||||
IsMesReportable = n.IsMesReportable,
|
||||
IsLocked = n.IsLocked,
|
||||
IsInherited = n.IsInherited,
|
||||
LockedInDerived = n.LockedInDerived,
|
||||
@@ -3020,6 +3021,7 @@ public sealed class BundleImporter : IBundleImporter
|
||||
current.ConnectionName = srcDto.ConnectionName;
|
||||
current.SourceReference = srcDto.SourceReference;
|
||||
current.ConditionFilter = srcDto.ConditionFilter;
|
||||
current.IsMesReportable = srcDto.IsMesReportable;
|
||||
current.IsLocked = srcDto.IsLocked;
|
||||
current.IsInherited = srcDto.IsInherited;
|
||||
current.LockedInDerived = srcDto.LockedInDerived;
|
||||
@@ -3038,6 +3040,7 @@ public sealed class BundleImporter : IBundleImporter
|
||||
current.ConnectionName,
|
||||
current.SourceReference,
|
||||
current.ConditionFilter,
|
||||
current.IsMesReportable,
|
||||
current.IsLocked,
|
||||
current.IsInherited,
|
||||
current.LockedInDerived,
|
||||
@@ -3052,6 +3055,7 @@ public sealed class BundleImporter : IBundleImporter
|
||||
ConnectionName = srcDto.ConnectionName,
|
||||
SourceReference = srcDto.SourceReference,
|
||||
ConditionFilter = srcDto.ConditionFilter,
|
||||
IsMesReportable = srcDto.IsMesReportable,
|
||||
IsLocked = srcDto.IsLocked,
|
||||
IsInherited = srcDto.IsInherited,
|
||||
LockedInDerived = srcDto.LockedInDerived,
|
||||
@@ -3071,6 +3075,7 @@ public sealed class BundleImporter : IBundleImporter
|
||||
newSource.ConnectionName,
|
||||
newSource.SourceReference,
|
||||
newSource.ConditionFilter,
|
||||
newSource.IsMesReportable,
|
||||
newSource.IsLocked,
|
||||
newSource.IsInherited,
|
||||
newSource.LockedInDerived,
|
||||
@@ -4962,6 +4967,7 @@ public sealed class BundleImporter : IBundleImporter
|
||||
o.ConnectionNameOverride, sourceSiteIdentifier, connectionMaps),
|
||||
SourceReferenceOverride = o.SourceReferenceOverride,
|
||||
ConditionFilterOverride = o.ConditionFilterOverride,
|
||||
IsMesReportableOverride = o.IsMesReportableOverride,
|
||||
});
|
||||
}
|
||||
foreach (var b in dto.ConnectionBindings)
|
||||
|
||||
@@ -96,6 +96,7 @@ internal static class TemplateChildEquality
|
||||
&& e.ConnectionName == i.ConnectionName
|
||||
&& e.SourceReference == i.SourceReference
|
||||
&& e.ConditionFilter == i.ConditionFilter
|
||||
&& e.IsMesReportable == i.IsMesReportable
|
||||
&& e.IsLocked == i.IsLocked
|
||||
&& e.IsInherited == i.IsInherited
|
||||
&& e.LockedInDerived == i.LockedInDerived;
|
||||
|
||||
@@ -192,7 +192,9 @@ public sealed record TemplateNativeAlarmSourceDto(
|
||||
string? ConditionFilter,
|
||||
bool IsLocked,
|
||||
bool IsInherited,
|
||||
bool LockedInDerived);
|
||||
bool LockedInDerived,
|
||||
// Additive trailing field: false on bundles written before it existed.
|
||||
bool IsMesReportable = false);
|
||||
|
||||
public sealed record TemplateAttributeDto(
|
||||
string Name,
|
||||
@@ -407,7 +409,9 @@ public sealed record InstanceNativeAlarmSourceOverrideDto(
|
||||
string SourceCanonicalName,
|
||||
string? ConnectionNameOverride,
|
||||
string? SourceReferenceOverride,
|
||||
string? ConditionFilterOverride);
|
||||
string? ConditionFilterOverride,
|
||||
// Additive trailing field: null ("keep inherited") on bundles written before it existed.
|
||||
bool? IsMesReportableOverride = null);
|
||||
|
||||
public sealed record InstanceConnectionBindingDto(
|
||||
string AttributeName,
|
||||
|
||||
@@ -104,7 +104,8 @@ public sealed class EntitySerializer
|
||||
ConditionFilter: n.ConditionFilter,
|
||||
IsLocked: n.IsLocked,
|
||||
IsInherited: n.IsInherited,
|
||||
LockedInDerived: n.LockedInDerived)).ToList(),
|
||||
LockedInDerived: n.LockedInDerived,
|
||||
IsMesReportable: n.IsMesReportable)).ToList(),
|
||||
};
|
||||
}).ToList(),
|
||||
SharedScripts: aggregate.SharedScripts.Select(s => new SharedScriptDto(
|
||||
@@ -292,7 +293,8 @@ public sealed class EntitySerializer
|
||||
SourceCanonicalName: o.SourceCanonicalName,
|
||||
ConnectionNameOverride: o.ConnectionNameOverride,
|
||||
SourceReferenceOverride: o.SourceReferenceOverride,
|
||||
ConditionFilterOverride: o.ConditionFilterOverride)).ToList(),
|
||||
ConditionFilterOverride: o.ConditionFilterOverride,
|
||||
IsMesReportableOverride: o.IsMesReportableOverride)).ToList(),
|
||||
// Connection bindings reference their DataConnection by NAME — the
|
||||
// numeric DataConnectionId FK can't survive a cross-environment
|
||||
// bundle, so the importer resolves ConnectionName→target FK at
|
||||
@@ -386,6 +388,7 @@ public sealed class EntitySerializer
|
||||
IsLocked = n.IsLocked,
|
||||
IsInherited = n.IsInherited,
|
||||
LockedInDerived = n.LockedInDerived,
|
||||
IsMesReportable = n.IsMesReportable,
|
||||
});
|
||||
}
|
||||
return t;
|
||||
@@ -621,6 +624,7 @@ public sealed class EntitySerializer
|
||||
ConnectionNameOverride = o.ConnectionNameOverride,
|
||||
SourceReferenceOverride = o.SourceReferenceOverride,
|
||||
ConditionFilterOverride = o.ConditionFilterOverride,
|
||||
IsMesReportableOverride = o.IsMesReportableOverride,
|
||||
});
|
||||
}
|
||||
foreach (var b in dto.ConnectionBindings)
|
||||
|
||||
Reference in New Issue
Block a user