fix(adminui): preserve edited alarm fields on Galaxy address re-pick
This commit is contained in:
@@ -336,14 +336,12 @@
|
||||
private void OnGalaxyAddressPicked(string address)
|
||||
{
|
||||
_galaxyAddress = address;
|
||||
// A fresh {FullName} blob would drop any tag-level historize the operator already set on this
|
||||
// edit; re-merge it so re-picking a Galaxy address never silently clears "Historize this tag".
|
||||
var config = TagHistorizeConfig.Set(
|
||||
JsonSerializer.Serialize(new { FullName = address }),
|
||||
_historizeState.IsHistorized,
|
||||
_historizeState.HistorianTagname);
|
||||
// Re-merge any array intent for the same reason — a fresh {FullName} blob would otherwise drop it.
|
||||
config = TagArrayConfig.Set(config, _arrayState.IsArray, _arrayState.ArrayLength);
|
||||
// Re-picking a Galaxy address owns ONLY the address-derived FullName key — apply it over the EXISTING
|
||||
// TagConfig so every other user-edited field survives verbatim. This preserves a hand-authored `alarm`
|
||||
// object (FB-4: a re-pick must never clobber edited alarm fields) as well as the root history/array
|
||||
// intent and any driver/unknown keys. TagConfigJson.SetFullName uses the same preserve-unknown idiom
|
||||
// as the historize/array merge seams.
|
||||
var config = TagConfigJson.SetFullName(_form.TagConfig, address);
|
||||
_form.TagConfig = _galaxyPickedIsAlarm
|
||||
? NativeAlarmModel.SeedDefaultAlarm(config)
|
||||
: config;
|
||||
|
||||
Reference in New Issue
Block a user