From d29e2190a953c7ce3432f5e705ad1459668e70bc Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Tue, 9 Jun 2026 10:00:28 -0400
Subject: [PATCH] fix(uns): reset TagConfig when the operator switches drivers
 (F-uns-1 integration review)

---
 .../Components/Shared/Uns/TagModal.razor                   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagModal.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagModal.razor
index c88e68c6..b03337fd 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagModal.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagModal.razor
@@ -42,7 +42,7 @@
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label" for="tag-driver">Driver instance</label>
-                                <InputSelect id="tag-driver" @bind-Value="_form.DriverInstanceId" class="form-select form-select-sm">
+                                <InputSelect id="tag-driver" @bind-Value="_form.DriverInstanceId" @bind-Value:after="OnDriverChanged" class="form-select form-select-sm">
                                     <option value="">— pick a driver —</option>
                                     @foreach (var (id, display, _) in Drivers)
                                     {
@@ -156,6 +156,11 @@
     private string? SelectedDriverType =>
         Drivers.FirstOrDefault(d => d.Id == _form.DriverInstanceId).DriverType;
 
+    // When the operator switches drivers, the previous driver's TagConfig schema no longer applies —
+    // reset it so the newly-dispatched typed editor starts clean (no stale/leaked keys from the old
+    // driver). Fires only on a user dropdown change (@bind-Value:after), not on the initial edit-load.
+    private void OnDriverChanged() => _form.TagConfig = "{}";
+
     private IDictionary<string, object> BuildEditorParameters() => new Dictionary<string, object>
     {
         ["ConfigJson"] = _form.TagConfig,