From 991986bb7e4ce797dd2e8d4ab3195ad3d9e35ca9 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Mon, 19 May 2025 15:32:41 -0700
Subject: [PATCH 1/7] Broken lookups in forms

---
 ehr/resources/web/ehr/DataEntryUtils.js       | 21 +++++++++++++++
 ehr/resources/web/ehr/data/StoreCollection.js | 17 ++++++++++++
 .../web/ehr/ehr_ext4_dataEntry.lib.xml        |  1 +
 ehr/resources/web/ehr/grid/Panel.js           |  9 +++++++
 ehr/resources/web/ehr/panel/DataEntryPanel.js |  1 +
 ehr/resources/web/ehr/plugin/CellEditing.js   | 26 +++++++++++++++++++
 6 files changed, 75 insertions(+)
 create mode 100644 ehr/resources/web/ehr/plugin/CellEditing.js

diff --git a/ehr/resources/web/ehr/DataEntryUtils.js b/ehr/resources/web/ehr/DataEntryUtils.js
index 180149642..f1b12c4fe 100644
--- a/ehr/resources/web/ehr/DataEntryUtils.js
+++ b/ehr/resources/web/ehr/DataEntryUtils.js
@@ -472,6 +472,21 @@ EHR.DataEntryUtils = new function(){
             return cfg;
         },
 
+        handleColInvalidLookups: function(recName, fieldName, recordStore, fieldStore) {
+            recordStore.each(rec => {
+                let recData = rec.get(recName);
+                if (recData && !recordStore.hasInvalidLookups && fieldStore.findExact(fieldName, recData) === -1) {
+                    rec.set(recName, '[' + recData + ']');
+                    recordStore.hasInvalidLookups = true;
+                    recordStore.sectionCfg.fieldConfigs.forEach(f => {
+                        if (f.name === recName) {
+                            f.hasInvalidLookups = true;
+                        }
+                    }, this);
+                }
+            })
+        },
+
         getColumnConfigFromMetadata: function(meta, grid){
             var col = {};
             col.dataIndex = meta.dataIndex || meta.name;
@@ -501,6 +516,12 @@ EHR.DataEntryUtils = new function(){
             }
 
             meta.showTooltip = EHR.DataEntryUtils.shouldShowTooltips();
+
+            if (meta.lookup && col.editor.store) {
+                col.editor.store.on('load', function(store, y, z) {
+                    EHR.DataEntryUtils.handleColInvalidLookups(col.dataIndex, col.editor.valueField, grid.store, store);
+                });
+            }
             col.renderer = LABKEY.ext4.Util.getDefaultRenderer(col, meta, grid);
 
             //HTML-encode the column header
diff --git a/ehr/resources/web/ehr/data/StoreCollection.js b/ehr/resources/web/ehr/data/StoreCollection.js
index e3612bb1b..de258c8f8 100644
--- a/ehr/resources/web/ehr/data/StoreCollection.js
+++ b/ehr/resources/web/ehr/data/StoreCollection.js
@@ -203,6 +203,23 @@ Ext4.define('EHR.data.StoreCollection', {
         console.log(arguments);
     },
 
+    normalizeInvalidLookups: function() {
+        this.clientStores.each(clientStore => {
+            if (clientStore.hasInvalidLookups) {
+                clientStore.sectionCfg.fieldConfigs.forEach(config => {
+                    if (config.hasInvalidLookups) {
+                        clientStore.each(rec => {
+                            let val = rec.get(config.name);
+                            if (val && val.startsWith('[')) {
+                                rec.set(config.name, val.slice(1, -1));
+                            }
+                        });
+                    }
+                }, this);
+            }
+        }, this);
+    },
+
     transformClientToServer: function(){
         if (EHR.debug)
             console.log('client to server');
diff --git a/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml b/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
index 60557b71e..0af16f0ee 100644
--- a/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
+++ b/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
@@ -21,6 +21,7 @@
         <script path="ehr/plugin/ResizableTextArea.js"/>
         <script path="ehr/plugin/RowEditor.js"/>
         <script path="ehr/plugin/CollapsibleDataEntryPanel.js"/>
+        <script path="ehr/plugin/CellEditing.js"/>
 
         <!--fields-->
         <script path="ehr/form/field/AnimalField.js"/>
diff --git a/ehr/resources/web/ehr/grid/Panel.js b/ehr/resources/web/ehr/grid/Panel.js
index 86d273f54..a188e83ed 100644
--- a/ehr/resources/web/ehr/grid/Panel.js
+++ b/ehr/resources/web/ehr/grid/Panel.js
@@ -11,6 +11,8 @@ Ext4.define('EHR.grid.Panel', {
     extend: 'LDK.grid.Panel',
     alias: 'widget.ehr-gridpanel',
 
+    editingPluginId: 'cellediting',
+
     initComponent: function(){
         if (!this.store){
             alert('Must provide a storeConfig');
@@ -107,6 +109,13 @@ Ext4.define('EHR.grid.Panel', {
         }
     },
 
+    getEditingPlugin: function(){
+        return Ext4.create('EHR.grid.plugin.CellEditing', {
+            pluginId: this.editingPluginId,
+            clicksToEdit: this.clicksToEdit
+        });
+    },
+
     resizeHeight: function(){
         // A bit of a hack but there are some cases where the gridview does not resize height to match its contents. Called
         // on store validation complete as this covers initial load and adding new rows scenario. Also done on cell edit
diff --git a/ehr/resources/web/ehr/panel/DataEntryPanel.js b/ehr/resources/web/ehr/panel/DataEntryPanel.js
index ea403c084..d7ea7d03e 100644
--- a/ehr/resources/web/ehr/panel/DataEntryPanel.js
+++ b/ehr/resources/web/ehr/panel/DataEntryPanel.js
@@ -605,6 +605,7 @@ Ext4.define('EHR.panel.DataEntryPanel', {
         }
 
         Ext4.Msg.wait("Saving Changes...");
+        this.storeCollection.normalizeInvalidLookups();
         this.storeCollection.transformClientToServer();
 
         //add a context flag to the request to saveRows
diff --git a/ehr/resources/web/ehr/plugin/CellEditing.js b/ehr/resources/web/ehr/plugin/CellEditing.js
new file mode 100644
index 000000000..5ff7b2060
--- /dev/null
+++ b/ehr/resources/web/ehr/plugin/CellEditing.js
@@ -0,0 +1,26 @@
+
+Ext4.define('EHR.grid.plugin.CellEditing', {
+    extend: 'LDK.grid.plugin.CellEditing',
+    alias: 'plugin.ehr-cellediting',
+
+    getEditor: function(record, column) {
+        const editor = this.callParent(arguments);
+
+        if (record.data[column.dataIndex] && editor?.field?.xtype === 'labkey-combo' && editor?.field?.store) {
+            const valid = editor.field.store.findExact("value", record.data[column.dataIndex]) !== -1
+
+            if (!valid) {
+                const plugin = Ext4.create('LDK.plugin.UserEditableCombo', {
+                    allowChooseOther: false,
+                    name: 'invalidLookup',
+                });
+
+                editor.field.plugins = editor.plugins || [];
+                editor.field.plugins.push(plugin);
+                plugin.init(editor.field);
+            }
+        }
+
+        return editor;
+    }
+});
\ No newline at end of file

From 0a01e564ac0cd7771ab90b690ef2c28731521742 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Tue, 27 May 2025 06:33:05 -0700
Subject: [PATCH 2/7] Refactor - don't update actual store

---
 ehr/resources/web/ehr/DataEntryUtils.js       | 20 -------------------
 ehr/resources/web/ehr/data/StoreCollection.js | 17 ----------------
 ehr/resources/web/ehr/panel/DataEntryPanel.js |  1 -
 ehr/resources/web/ehr/plugin/CellEditing.js   | 14 +++++++++----
 .../plugin/ClinicalObservationsCellEditing.js |  6 +++++-
 5 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/ehr/resources/web/ehr/DataEntryUtils.js b/ehr/resources/web/ehr/DataEntryUtils.js
index f1b12c4fe..241a8eaf8 100644
--- a/ehr/resources/web/ehr/DataEntryUtils.js
+++ b/ehr/resources/web/ehr/DataEntryUtils.js
@@ -472,21 +472,6 @@ EHR.DataEntryUtils = new function(){
             return cfg;
         },
 
-        handleColInvalidLookups: function(recName, fieldName, recordStore, fieldStore) {
-            recordStore.each(rec => {
-                let recData = rec.get(recName);
-                if (recData && !recordStore.hasInvalidLookups && fieldStore.findExact(fieldName, recData) === -1) {
-                    rec.set(recName, '[' + recData + ']');
-                    recordStore.hasInvalidLookups = true;
-                    recordStore.sectionCfg.fieldConfigs.forEach(f => {
-                        if (f.name === recName) {
-                            f.hasInvalidLookups = true;
-                        }
-                    }, this);
-                }
-            })
-        },
-
         getColumnConfigFromMetadata: function(meta, grid){
             var col = {};
             col.dataIndex = meta.dataIndex || meta.name;
@@ -517,11 +502,6 @@ EHR.DataEntryUtils = new function(){
 
             meta.showTooltip = EHR.DataEntryUtils.shouldShowTooltips();
 
-            if (meta.lookup && col.editor.store) {
-                col.editor.store.on('load', function(store, y, z) {
-                    EHR.DataEntryUtils.handleColInvalidLookups(col.dataIndex, col.editor.valueField, grid.store, store);
-                });
-            }
             col.renderer = LABKEY.ext4.Util.getDefaultRenderer(col, meta, grid);
 
             //HTML-encode the column header
diff --git a/ehr/resources/web/ehr/data/StoreCollection.js b/ehr/resources/web/ehr/data/StoreCollection.js
index de258c8f8..e3612bb1b 100644
--- a/ehr/resources/web/ehr/data/StoreCollection.js
+++ b/ehr/resources/web/ehr/data/StoreCollection.js
@@ -203,23 +203,6 @@ Ext4.define('EHR.data.StoreCollection', {
         console.log(arguments);
     },
 
-    normalizeInvalidLookups: function() {
-        this.clientStores.each(clientStore => {
-            if (clientStore.hasInvalidLookups) {
-                clientStore.sectionCfg.fieldConfigs.forEach(config => {
-                    if (config.hasInvalidLookups) {
-                        clientStore.each(rec => {
-                            let val = rec.get(config.name);
-                            if (val && val.startsWith('[')) {
-                                rec.set(config.name, val.slice(1, -1));
-                            }
-                        });
-                    }
-                }, this);
-            }
-        }, this);
-    },
-
     transformClientToServer: function(){
         if (EHR.debug)
             console.log('client to server');
diff --git a/ehr/resources/web/ehr/panel/DataEntryPanel.js b/ehr/resources/web/ehr/panel/DataEntryPanel.js
index d7ea7d03e..ea403c084 100644
--- a/ehr/resources/web/ehr/panel/DataEntryPanel.js
+++ b/ehr/resources/web/ehr/panel/DataEntryPanel.js
@@ -605,7 +605,6 @@ Ext4.define('EHR.panel.DataEntryPanel', {
         }
 
         Ext4.Msg.wait("Saving Changes...");
-        this.storeCollection.normalizeInvalidLookups();
         this.storeCollection.transformClientToServer();
 
         //add a context flag to the request to saveRows
diff --git a/ehr/resources/web/ehr/plugin/CellEditing.js b/ehr/resources/web/ehr/plugin/CellEditing.js
index 5ff7b2060..2928336d1 100644
--- a/ehr/resources/web/ehr/plugin/CellEditing.js
+++ b/ehr/resources/web/ehr/plugin/CellEditing.js
@@ -3,10 +3,8 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
     extend: 'LDK.grid.plugin.CellEditing',
     alias: 'plugin.ehr-cellediting',
 
-    getEditor: function(record, column) {
-        const editor = this.callParent(arguments);
-
-        if (record.data[column.dataIndex] && editor?.field?.xtype === 'labkey-combo' && editor?.field?.store) {
+    ensureLookups: function(record, column, editor) {
+        if (record.data[column.dataIndex] && editor?.field?.store) {
             const valid = editor.field.store.findExact("value", record.data[column.dataIndex]) !== -1
 
             if (!valid) {
@@ -20,6 +18,14 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
                 plugin.init(editor.field);
             }
         }
+    },
+
+    getEditor: function(record, column) {
+        const editor = this.callParent(arguments);
+
+        if( editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo') {
+            this.ensureLookups(record, column, editor);
+        }
 
         return editor;
     }
diff --git a/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js b/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
index 00b8267c7..8f0492d13 100644
--- a/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
+++ b/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
  */
 Ext4.define('EHR.grid.plugin.ClinicalObservationsCellEditing', {
-    extend: 'LDK.grid.plugin.CellEditing',
+    extend: 'EHR.grid.plugin.CellEditing',
     alias: 'plugin.clinicalobservationscellediting',
 
     constructor: function(config){
@@ -71,6 +71,10 @@ Ext4.define('EHR.grid.plugin.ClinicalObservationsCellEditing', {
         // Keep upward pointer correct for each use - editors are shared between locking sides
         editor.editingPlugin = me;
 
+        if( editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo') {
+            this.ensureLookups(record, column, editor);
+        }
+
         return editor;
     }
 });
\ No newline at end of file

From d91468d8be78095810262fef017d8343211aa46c Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Tue, 27 May 2025 06:59:28 -0700
Subject: [PATCH 3/7] cleanup

---
 ehr/resources/web/ehr/DataEntryUtils.js                |  1 -
 ehr/resources/web/ehr/plugin/CellEditing.js            | 10 ++++------
 .../web/ehr/plugin/ClinicalObservationsCellEditing.js  |  4 +---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ehr/resources/web/ehr/DataEntryUtils.js b/ehr/resources/web/ehr/DataEntryUtils.js
index 241a8eaf8..180149642 100644
--- a/ehr/resources/web/ehr/DataEntryUtils.js
+++ b/ehr/resources/web/ehr/DataEntryUtils.js
@@ -501,7 +501,6 @@ EHR.DataEntryUtils = new function(){
             }
 
             meta.showTooltip = EHR.DataEntryUtils.shouldShowTooltips();
-
             col.renderer = LABKEY.ext4.Util.getDefaultRenderer(col, meta, grid);
 
             //HTML-encode the column header
diff --git a/ehr/resources/web/ehr/plugin/CellEditing.js b/ehr/resources/web/ehr/plugin/CellEditing.js
index 2928336d1..cb58a1475 100644
--- a/ehr/resources/web/ehr/plugin/CellEditing.js
+++ b/ehr/resources/web/ehr/plugin/CellEditing.js
@@ -4,7 +4,9 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
     alias: 'plugin.ehr-cellediting',
 
     ensureLookups: function(record, column, editor) {
-        if (record.data[column.dataIndex] && editor?.field?.store) {
+        if( (editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo')
+                && record.data[column.dataIndex] && editor?.field?.store) {
+
             const valid = editor.field.store.findExact("value", record.data[column.dataIndex]) !== -1
 
             if (!valid) {
@@ -22,11 +24,7 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
 
     getEditor: function(record, column) {
         const editor = this.callParent(arguments);
-
-        if( editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo') {
-            this.ensureLookups(record, column, editor);
-        }
-
+        this.ensureLookups(record, column, editor);
         return editor;
     }
 });
\ No newline at end of file
diff --git a/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js b/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
index 8f0492d13..aa4dd0cd9 100644
--- a/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
+++ b/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
@@ -71,9 +71,7 @@ Ext4.define('EHR.grid.plugin.ClinicalObservationsCellEditing', {
         // Keep upward pointer correct for each use - editors are shared between locking sides
         editor.editingPlugin = me;
 
-        if( editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo') {
-            this.ensureLookups(record, column, editor);
-        }
+        this.ensureLookups(record, column, editor);
 
         return editor;
     }

From 29fe97b658bdc12c40c1c9bab8f263541d5bc7ae Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Tue, 27 May 2025 09:36:24 -0700
Subject: [PATCH 4/7] UserEditableCombo refactor

---
 ehr/resources/web/ehr/ehr_api.lib.xml         |  1 +
 .../web/ehr/form/SimpleDataEntryFormPanel.js  |  2 +-
 .../web/ehr/form/field/ProjectEntryField.js   |  2 +-
 .../web/ehr/form/field/RoomEntryField.js      |  2 +-
 .../web/ehr/form/field/RoomFieldSingle.js     |  2 +-
 .../ehr/form/field/UrinalysisResultField.js   |  2 +-
 .../web/ehr/model/sources/Default.js          | 46 +++++++++----------
 .../web/ehr/model/sources/LabworkChild.js     |  2 +-
 ehr/resources/web/ehr/plugin/CellEditing.js   |  2 +-
 .../web/ehr/plugin/UserEditableCombo.js       | 10 ++++
 10 files changed, 41 insertions(+), 30 deletions(-)
 create mode 100644 ehr/resources/web/ehr/plugin/UserEditableCombo.js

diff --git a/ehr/resources/web/ehr/ehr_api.lib.xml b/ehr/resources/web/ehr/ehr_api.lib.xml
index 59f74effe..0d233f465 100644
--- a/ehr/resources/web/ehr/ehr_api.lib.xml
+++ b/ehr/resources/web/ehr/ehr_api.lib.xml
@@ -10,6 +10,7 @@
 
 
         <!--Misc Ext4 components-->
+        <script path="ehr/plugin/UserEditableCombo.js" />
         <script path="ehr/panel/WeightGraphPanel.js"/>
         <script path="ehr/panel/WeightSummaryPanel.js"/>
         <script path="ehr/panel/KinshipPanel.js"/>
diff --git a/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js b/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js
index 42c9fd2cf..a37f1d474 100644
--- a/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js
+++ b/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js
@@ -24,7 +24,7 @@ Ext4.define('EHR.panel.SimpleDataEntryFormPanel', {
             if (item.cfg && (item.cfg.xtype == 'combo' || item.cfg.xtype == 'labkey-combo')){
                 if (!item.cfg.plugins){
                     item.cfg.plugins = [];
-                    item.cfg.plugins.push(Ext4.create('LDK.plugin.UserEditableCombo', {
+                    item.cfg.plugins.push(Ext4.create('EHR.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     }));
                 }
diff --git a/ehr/resources/web/ehr/form/field/ProjectEntryField.js b/ehr/resources/web/ehr/form/field/ProjectEntryField.js
index 5155bcb9a..01772eb33 100644
--- a/ehr/resources/web/ehr/form/field/ProjectEntryField.js
+++ b/ehr/resources/web/ehr/form/field/ProjectEntryField.js
@@ -32,7 +32,7 @@ Ext4.define('EHR.form.field.ProjectEntryField', {
       displayField: 'displayName',
       valueField: 'project',
       queryMode: 'local',
-      plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+      plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
         createWindow: function(){
           this.window = Ext4.create('Ext.window.Window', {
             modal: true,
diff --git a/ehr/resources/web/ehr/form/field/RoomEntryField.js b/ehr/resources/web/ehr/form/field/RoomEntryField.js
index 847d94199..4064619ff 100644
--- a/ehr/resources/web/ehr/form/field/RoomEntryField.js
+++ b/ehr/resources/web/ehr/form/field/RoomEntryField.js
@@ -37,7 +37,7 @@ Ext4.define('EHR.form.field.RoomEntryField', {
                 filterArray: [LABKEY.Filter.create('datedisabled', null, LABKEY.Filter.Types.ISBLANK)],
                 autoLoad: true
             },
-            plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+            plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                 allowChooseOther: false
             })]
         });
diff --git a/ehr/resources/web/ehr/form/field/RoomFieldSingle.js b/ehr/resources/web/ehr/form/field/RoomFieldSingle.js
index 21deaaf59..5a2c1aaf4 100644
--- a/ehr/resources/web/ehr/form/field/RoomFieldSingle.js
+++ b/ehr/resources/web/ehr/form/field/RoomFieldSingle.js
@@ -29,7 +29,7 @@ Ext4.define('EHR.form.field.RoomFieldSingle', {
                 filterArray: [LABKEY.Filter.create('datedisabled', null, LABKEY.Filter.Types.ISBLANK)],
                 autoLoad: true
             },
-            plugins: ['ldk-usereditablecombo']
+            plugins: ['ehr-usereditablecombo']
         });
 
         this.callParent(arguments);
diff --git a/ehr/resources/web/ehr/form/field/UrinalysisResultField.js b/ehr/resources/web/ehr/form/field/UrinalysisResultField.js
index b21758778..16be21f28 100644
--- a/ehr/resources/web/ehr/form/field/UrinalysisResultField.js
+++ b/ehr/resources/web/ehr/form/field/UrinalysisResultField.js
@@ -9,7 +9,7 @@ Ext4.define('EHR.form.field.UrinalysisResultField', {
 
     initComponent: function(){
         this.plugins = this.plugins || [];
-        this.plugins.push('ldk-usereditablecombo');
+        this.plugins.push('ehr-usereditablecombo');
 
         this.store = this.store || {
             store: {
diff --git a/ehr/resources/web/ehr/model/sources/Default.js b/ehr/resources/web/ehr/model/sources/Default.js
index e20a137af..242f5604a 100644
--- a/ehr/resources/web/ehr/model/sources/Default.js
+++ b/ehr/resources/web/ehr/model/sources/Default.js
@@ -122,7 +122,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             lookup: {columns: '*'},
             compositeField: 'Dosage',
             editorConfig: {
-                plugins: ['ldk-usereditablecombo']
+                plugins: ['ehr-usereditablecombo']
             },
             columnConfig: {
                 width: 120
@@ -140,7 +140,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             lookup: {columns: '*'},
             compositeField: 'Drug Conc',
             editorConfig: {
-                plugins: ['ldk-usereditablecombo'],
+                plugins: ['ehr-usereditablecombo'],
                 listeners: {
                     select: function(combo, recs){
                         if (!recs || recs.length != 1)
@@ -181,7 +181,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             compositeField: 'Volume',
             header: 'Vol Units',
             editorConfig: {
-                plugins: ['ldk-usereditablecombo']
+                plugins: ['ehr-usereditablecombo']
             },
             columnConfig: {
                 width: 90
@@ -203,7 +203,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 width: 120
             },
             editorConfig: {
-                plugins: ['ldk-usereditablecombo']
+                plugins: ['ehr-usereditablecombo']
             }
         },
         chargetype: {
@@ -215,7 +215,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             editorConfig: {
                 caseSensitive: false,
                 anyMatch: true,
-                plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+                plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                     allowChooseOther: false
                 })]
             },
@@ -227,7 +227,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             editorConfig: {
                 caseSensitive: false,
                 anyMatch: true,
-                plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+                plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                     allowChooseOther: false
                 })]
             },
@@ -892,7 +892,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             qualifier: {
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 },
                 shownInGrid: false
             },
@@ -908,7 +908,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             stain: {
                 defaultValue: 'Hematoxylin & Eosin',
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 },
                 shownInGrid: false
             },
@@ -940,7 +940,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 defaultValue: 'Hematoxylin & Eosin',
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 }
             },
             tissue: {
@@ -953,7 +953,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             qualifier: {
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 }
             },
             remark: {
@@ -1087,7 +1087,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                     sort: 'Type,DisplayName'
                 },
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo'],
+                    plugins: ['ehr-usereditablecombo'],
                     anyMatch: true,
                     listConfig: {
                         innerTpl: '{[LABKEY.Utils.encodeHtml(values.DisplayName + (values.LastName ? " (" + values.LastName + (values.FirstName ? ", " + values.FirstName : "") + ")" : ""))]}',
@@ -1237,7 +1237,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             sampleType : {
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 },
                 columnConfig: {
                     width: 160
@@ -1597,7 +1597,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 editorConfig: {
                     caseSensitive: false,
                     anyMatch: true,
-                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })],
                     listConfig: {
@@ -1666,7 +1666,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             chargecategory: {
                 editorConfig: {
-                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 },
@@ -1723,7 +1723,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             category: {
                 allowBlank: false,
                 editorConfig: {
-                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 },
@@ -1770,7 +1770,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             testid: {
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 },
                 lookup: {
                     columns: '*'
@@ -1790,7 +1790,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             qualifier: {
                 hidden: false,
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 }
             },
             agent: {
@@ -1814,7 +1814,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             method: {
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 }
             },
             result: {
@@ -1981,7 +1981,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 editorConfig: {
                     caseSensitive: false,
                     anyMatch: true,
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 },
                 columnConfig: {
                     width: 180
@@ -2091,7 +2091,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             destination: {
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 },
                 columnConfig: {
                     width: 200
@@ -2219,7 +2219,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                     width: 200
                 },
                 editorConfig: {
-                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 }
@@ -2423,7 +2423,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             route: {
                 editorConfig: {
-                    plugins: ['ldk-usereditablecombo']
+                    plugins: ['ehr-usereditablecombo']
                 },
                 allowBlank: false
             },
@@ -2456,7 +2456,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                     width: 180
                 },
                 editorConfig: {
-                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 }
diff --git a/ehr/resources/web/ehr/model/sources/LabworkChild.js b/ehr/resources/web/ehr/model/sources/LabworkChild.js
index 6517b0284..84257a8f2 100644
--- a/ehr/resources/web/ehr/model/sources/LabworkChild.js
+++ b/ehr/resources/web/ehr/model/sources/LabworkChild.js
@@ -11,7 +11,7 @@ EHR.model.DataModelManager.registerMetadata('LabworkChild', {
         testid: {
             editorConfig: {
                 plugins: [{
-                    ptype: 'ldk-usereditablecombo',
+                    ptype: 'ehr-usereditablecombo',
                     allowChooseOther: false
                 }]
             }
diff --git a/ehr/resources/web/ehr/plugin/CellEditing.js b/ehr/resources/web/ehr/plugin/CellEditing.js
index cb58a1475..a82f2ee0f 100644
--- a/ehr/resources/web/ehr/plugin/CellEditing.js
+++ b/ehr/resources/web/ehr/plugin/CellEditing.js
@@ -10,7 +10,7 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
             const valid = editor.field.store.findExact("value", record.data[column.dataIndex]) !== -1
 
             if (!valid) {
-                const plugin = Ext4.create('LDK.plugin.UserEditableCombo', {
+                const plugin = Ext4.create('EHR.plugin.UserEditableCombo', {
                     allowChooseOther: false,
                     name: 'invalidLookup',
                 });
diff --git a/ehr/resources/web/ehr/plugin/UserEditableCombo.js b/ehr/resources/web/ehr/plugin/UserEditableCombo.js
new file mode 100644
index 000000000..011677143
--- /dev/null
+++ b/ehr/resources/web/ehr/plugin/UserEditableCombo.js
@@ -0,0 +1,10 @@
+Ext4.define('EHR.plugin.UserEditableCombo', {
+    extend: 'LDK.plugin.UserEditableCombo',
+    pluginId: 'ehr-usereditablecombo',
+
+    useBracketsForUnknownValues: true,
+
+    initComponent: function(){
+        this.callParent(arguments);
+    }
+});
\ No newline at end of file

From 0206d599396efe6a20bda2616dec81296b8af2be Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Wed, 28 May 2025 04:56:20 -0700
Subject: [PATCH 5/7] Revert "UserEditableCombo refactor"

This reverts commit 29fe97b658bdc12c40c1c9bab8f263541d5bc7ae.
---
 ehr/resources/web/ehr/ehr_api.lib.xml         |  1 -
 .../web/ehr/form/SimpleDataEntryFormPanel.js  |  2 +-
 .../web/ehr/form/field/ProjectEntryField.js   |  2 +-
 .../web/ehr/form/field/RoomEntryField.js      |  2 +-
 .../web/ehr/form/field/RoomFieldSingle.js     |  2 +-
 .../ehr/form/field/UrinalysisResultField.js   |  2 +-
 .../web/ehr/model/sources/Default.js          | 46 +++++++++----------
 .../web/ehr/model/sources/LabworkChild.js     |  2 +-
 ehr/resources/web/ehr/plugin/CellEditing.js   |  2 +-
 .../web/ehr/plugin/UserEditableCombo.js       | 10 ----
 10 files changed, 30 insertions(+), 41 deletions(-)
 delete mode 100644 ehr/resources/web/ehr/plugin/UserEditableCombo.js

diff --git a/ehr/resources/web/ehr/ehr_api.lib.xml b/ehr/resources/web/ehr/ehr_api.lib.xml
index 0d233f465..59f74effe 100644
--- a/ehr/resources/web/ehr/ehr_api.lib.xml
+++ b/ehr/resources/web/ehr/ehr_api.lib.xml
@@ -10,7 +10,6 @@
 
 
         <!--Misc Ext4 components-->
-        <script path="ehr/plugin/UserEditableCombo.js" />
         <script path="ehr/panel/WeightGraphPanel.js"/>
         <script path="ehr/panel/WeightSummaryPanel.js"/>
         <script path="ehr/panel/KinshipPanel.js"/>
diff --git a/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js b/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js
index a37f1d474..42c9fd2cf 100644
--- a/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js
+++ b/ehr/resources/web/ehr/form/SimpleDataEntryFormPanel.js
@@ -24,7 +24,7 @@ Ext4.define('EHR.panel.SimpleDataEntryFormPanel', {
             if (item.cfg && (item.cfg.xtype == 'combo' || item.cfg.xtype == 'labkey-combo')){
                 if (!item.cfg.plugins){
                     item.cfg.plugins = [];
-                    item.cfg.plugins.push(Ext4.create('EHR.plugin.UserEditableCombo', {
+                    item.cfg.plugins.push(Ext4.create('LDK.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     }));
                 }
diff --git a/ehr/resources/web/ehr/form/field/ProjectEntryField.js b/ehr/resources/web/ehr/form/field/ProjectEntryField.js
index 01772eb33..5155bcb9a 100644
--- a/ehr/resources/web/ehr/form/field/ProjectEntryField.js
+++ b/ehr/resources/web/ehr/form/field/ProjectEntryField.js
@@ -32,7 +32,7 @@ Ext4.define('EHR.form.field.ProjectEntryField', {
       displayField: 'displayName',
       valueField: 'project',
       queryMode: 'local',
-      plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+      plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
         createWindow: function(){
           this.window = Ext4.create('Ext.window.Window', {
             modal: true,
diff --git a/ehr/resources/web/ehr/form/field/RoomEntryField.js b/ehr/resources/web/ehr/form/field/RoomEntryField.js
index 4064619ff..847d94199 100644
--- a/ehr/resources/web/ehr/form/field/RoomEntryField.js
+++ b/ehr/resources/web/ehr/form/field/RoomEntryField.js
@@ -37,7 +37,7 @@ Ext4.define('EHR.form.field.RoomEntryField', {
                 filterArray: [LABKEY.Filter.create('datedisabled', null, LABKEY.Filter.Types.ISBLANK)],
                 autoLoad: true
             },
-            plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+            plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                 allowChooseOther: false
             })]
         });
diff --git a/ehr/resources/web/ehr/form/field/RoomFieldSingle.js b/ehr/resources/web/ehr/form/field/RoomFieldSingle.js
index 5a2c1aaf4..21deaaf59 100644
--- a/ehr/resources/web/ehr/form/field/RoomFieldSingle.js
+++ b/ehr/resources/web/ehr/form/field/RoomFieldSingle.js
@@ -29,7 +29,7 @@ Ext4.define('EHR.form.field.RoomFieldSingle', {
                 filterArray: [LABKEY.Filter.create('datedisabled', null, LABKEY.Filter.Types.ISBLANK)],
                 autoLoad: true
             },
-            plugins: ['ehr-usereditablecombo']
+            plugins: ['ldk-usereditablecombo']
         });
 
         this.callParent(arguments);
diff --git a/ehr/resources/web/ehr/form/field/UrinalysisResultField.js b/ehr/resources/web/ehr/form/field/UrinalysisResultField.js
index 16be21f28..b21758778 100644
--- a/ehr/resources/web/ehr/form/field/UrinalysisResultField.js
+++ b/ehr/resources/web/ehr/form/field/UrinalysisResultField.js
@@ -9,7 +9,7 @@ Ext4.define('EHR.form.field.UrinalysisResultField', {
 
     initComponent: function(){
         this.plugins = this.plugins || [];
-        this.plugins.push('ehr-usereditablecombo');
+        this.plugins.push('ldk-usereditablecombo');
 
         this.store = this.store || {
             store: {
diff --git a/ehr/resources/web/ehr/model/sources/Default.js b/ehr/resources/web/ehr/model/sources/Default.js
index 242f5604a..e20a137af 100644
--- a/ehr/resources/web/ehr/model/sources/Default.js
+++ b/ehr/resources/web/ehr/model/sources/Default.js
@@ -122,7 +122,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             lookup: {columns: '*'},
             compositeField: 'Dosage',
             editorConfig: {
-                plugins: ['ehr-usereditablecombo']
+                plugins: ['ldk-usereditablecombo']
             },
             columnConfig: {
                 width: 120
@@ -140,7 +140,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             lookup: {columns: '*'},
             compositeField: 'Drug Conc',
             editorConfig: {
-                plugins: ['ehr-usereditablecombo'],
+                plugins: ['ldk-usereditablecombo'],
                 listeners: {
                     select: function(combo, recs){
                         if (!recs || recs.length != 1)
@@ -181,7 +181,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             compositeField: 'Volume',
             header: 'Vol Units',
             editorConfig: {
-                plugins: ['ehr-usereditablecombo']
+                plugins: ['ldk-usereditablecombo']
             },
             columnConfig: {
                 width: 90
@@ -203,7 +203,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 width: 120
             },
             editorConfig: {
-                plugins: ['ehr-usereditablecombo']
+                plugins: ['ldk-usereditablecombo']
             }
         },
         chargetype: {
@@ -215,7 +215,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             editorConfig: {
                 caseSensitive: false,
                 anyMatch: true,
-                plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+                plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                     allowChooseOther: false
                 })]
             },
@@ -227,7 +227,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             editorConfig: {
                 caseSensitive: false,
                 anyMatch: true,
-                plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+                plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                     allowChooseOther: false
                 })]
             },
@@ -892,7 +892,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             qualifier: {
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 },
                 shownInGrid: false
             },
@@ -908,7 +908,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             stain: {
                 defaultValue: 'Hematoxylin & Eosin',
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 },
                 shownInGrid: false
             },
@@ -940,7 +940,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 defaultValue: 'Hematoxylin & Eosin',
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 }
             },
             tissue: {
@@ -953,7 +953,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             qualifier: {
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 }
             },
             remark: {
@@ -1087,7 +1087,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                     sort: 'Type,DisplayName'
                 },
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo'],
+                    plugins: ['ldk-usereditablecombo'],
                     anyMatch: true,
                     listConfig: {
                         innerTpl: '{[LABKEY.Utils.encodeHtml(values.DisplayName + (values.LastName ? " (" + values.LastName + (values.FirstName ? ", " + values.FirstName : "") + ")" : ""))]}',
@@ -1237,7 +1237,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             sampleType : {
                 hidden: true,
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 },
                 columnConfig: {
                     width: 160
@@ -1597,7 +1597,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 editorConfig: {
                     caseSensitive: false,
                     anyMatch: true,
-                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })],
                     listConfig: {
@@ -1666,7 +1666,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             chargecategory: {
                 editorConfig: {
-                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 },
@@ -1723,7 +1723,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             category: {
                 allowBlank: false,
                 editorConfig: {
-                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 },
@@ -1770,7 +1770,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             testid: {
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 },
                 lookup: {
                     columns: '*'
@@ -1790,7 +1790,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             qualifier: {
                 hidden: false,
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 }
             },
             agent: {
@@ -1814,7 +1814,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             method: {
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 }
             },
             result: {
@@ -1981,7 +1981,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                 editorConfig: {
                     caseSensitive: false,
                     anyMatch: true,
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 },
                 columnConfig: {
                     width: 180
@@ -2091,7 +2091,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             destination: {
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 },
                 columnConfig: {
                     width: 200
@@ -2219,7 +2219,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                     width: 200
                 },
                 editorConfig: {
-                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 }
@@ -2423,7 +2423,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
             route: {
                 editorConfig: {
-                    plugins: ['ehr-usereditablecombo']
+                    plugins: ['ldk-usereditablecombo']
                 },
                 allowBlank: false
             },
@@ -2456,7 +2456,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                     width: 180
                 },
                 editorConfig: {
-                    plugins: [Ext4.create('EHR.plugin.UserEditableCombo', {
+                    plugins: [Ext4.create('LDK.plugin.UserEditableCombo', {
                         allowChooseOther: false
                     })]
                 }
diff --git a/ehr/resources/web/ehr/model/sources/LabworkChild.js b/ehr/resources/web/ehr/model/sources/LabworkChild.js
index 84257a8f2..6517b0284 100644
--- a/ehr/resources/web/ehr/model/sources/LabworkChild.js
+++ b/ehr/resources/web/ehr/model/sources/LabworkChild.js
@@ -11,7 +11,7 @@ EHR.model.DataModelManager.registerMetadata('LabworkChild', {
         testid: {
             editorConfig: {
                 plugins: [{
-                    ptype: 'ehr-usereditablecombo',
+                    ptype: 'ldk-usereditablecombo',
                     allowChooseOther: false
                 }]
             }
diff --git a/ehr/resources/web/ehr/plugin/CellEditing.js b/ehr/resources/web/ehr/plugin/CellEditing.js
index a82f2ee0f..cb58a1475 100644
--- a/ehr/resources/web/ehr/plugin/CellEditing.js
+++ b/ehr/resources/web/ehr/plugin/CellEditing.js
@@ -10,7 +10,7 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
             const valid = editor.field.store.findExact("value", record.data[column.dataIndex]) !== -1
 
             if (!valid) {
-                const plugin = Ext4.create('EHR.plugin.UserEditableCombo', {
+                const plugin = Ext4.create('LDK.plugin.UserEditableCombo', {
                     allowChooseOther: false,
                     name: 'invalidLookup',
                 });
diff --git a/ehr/resources/web/ehr/plugin/UserEditableCombo.js b/ehr/resources/web/ehr/plugin/UserEditableCombo.js
deleted file mode 100644
index 011677143..000000000
--- a/ehr/resources/web/ehr/plugin/UserEditableCombo.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Ext4.define('EHR.plugin.UserEditableCombo', {
-    extend: 'LDK.plugin.UserEditableCombo',
-    pluginId: 'ehr-usereditablecombo',
-
-    useBracketsForUnknownValues: true,
-
-    initComponent: function(){
-        this.callParent(arguments);
-    }
-});
\ No newline at end of file

From 51b794d461f0f82adaafdc8f69634b08f549021e Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Mon, 2 Jun 2025 05:33:56 -0700
Subject: [PATCH 6/7] Refactor to always add user editable combo plugin for
 combos

---
 ehr/resources/web/ehr/DataEntryUtils.js       | 20 +++++++++++++
 .../web/ehr/ehr_ext4_dataEntry.lib.xml        |  1 -
 ehr/resources/web/ehr/grid/Panel.js           | 15 +++++-----
 ehr/resources/web/ehr/plugin/CellEditing.js   | 30 -------------------
 .../plugin/ClinicalObservationsCellEditing.js |  5 ++--
 5 files changed, 31 insertions(+), 40 deletions(-)
 delete mode 100644 ehr/resources/web/ehr/plugin/CellEditing.js

diff --git a/ehr/resources/web/ehr/DataEntryUtils.js b/ehr/resources/web/ehr/DataEntryUtils.js
index 180149642..fe2ed654a 100644
--- a/ehr/resources/web/ehr/DataEntryUtils.js
+++ b/ehr/resources/web/ehr/DataEntryUtils.js
@@ -1108,6 +1108,26 @@ EHR.DataEntryUtils = new function(){
             }
 
             return projectStore.getAt(recIdx).get('project');
+        },
+
+        ensureLookupPlugin(editor, initPlugin) {
+            // const xtype = editor?.xtype;
+            const xtype = editor?.xtype;
+            if ((xtype === 'combo' || xtype === 'labkey-combo' || xtype === 'ehr-simplecombo')
+                    // && !editor.plugins?.find(p => p.ptype === 'ldk-usereditablecombo')) {
+                    && !editor.plugins?.find(p => p.ptype === 'ldk-usereditablecombo')) {
+
+                const plugin = Ext4.create('LDK.plugin.UserEditableCombo', {
+                    allowChooseOther: false,
+                });
+                editor.plugins = editor.plugins || [];
+                editor.plugins.push(plugin);
+
+                if (initPlugin)
+                    plugin.init(editor);
+            }
+
+            return editor;
         }
     }
 };
diff --git a/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml b/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
index 0af16f0ee..60557b71e 100644
--- a/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
+++ b/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
@@ -21,7 +21,6 @@
         <script path="ehr/plugin/ResizableTextArea.js"/>
         <script path="ehr/plugin/RowEditor.js"/>
         <script path="ehr/plugin/CollapsibleDataEntryPanel.js"/>
-        <script path="ehr/plugin/CellEditing.js"/>
 
         <!--fields-->
         <script path="ehr/form/field/AnimalField.js"/>
diff --git a/ehr/resources/web/ehr/grid/Panel.js b/ehr/resources/web/ehr/grid/Panel.js
index a188e83ed..3f7c1638f 100644
--- a/ehr/resources/web/ehr/grid/Panel.js
+++ b/ehr/resources/web/ehr/grid/Panel.js
@@ -11,8 +11,6 @@ Ext4.define('EHR.grid.Panel', {
     extend: 'LDK.grid.Panel',
     alias: 'widget.ehr-gridpanel',
 
-    editingPluginId: 'cellediting',
-
     initComponent: function(){
         if (!this.store){
             alert('Must provide a storeConfig');
@@ -91,6 +89,8 @@ Ext4.define('EHR.grid.Panel', {
             this.dataEntryPanel.updateMinWidth(this.minWidth);
         }
 
+        this.addComboEditorPlugin(this.columns);
+
     },
 
     pendingChanges: {},
@@ -109,11 +109,12 @@ Ext4.define('EHR.grid.Panel', {
         }
     },
 
-    getEditingPlugin: function(){
-        return Ext4.create('EHR.grid.plugin.CellEditing', {
-            pluginId: this.editingPluginId,
-            clicksToEdit: this.clicksToEdit
-        });
+    addComboEditorPlugin: function(columns){
+        Ext4.Array.forEach(columns, function(col){
+            if (col.editor) {
+                col.editor = EHR.DataEntryUtils.ensureLookupPlugin(col.editor, false);
+            }
+        }, this);
     },
 
     resizeHeight: function(){
diff --git a/ehr/resources/web/ehr/plugin/CellEditing.js b/ehr/resources/web/ehr/plugin/CellEditing.js
deleted file mode 100644
index cb58a1475..000000000
--- a/ehr/resources/web/ehr/plugin/CellEditing.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-Ext4.define('EHR.grid.plugin.CellEditing', {
-    extend: 'LDK.grid.plugin.CellEditing',
-    alias: 'plugin.ehr-cellediting',
-
-    ensureLookups: function(record, column, editor) {
-        if( (editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo')
-                && record.data[column.dataIndex] && editor?.field?.store) {
-
-            const valid = editor.field.store.findExact("value", record.data[column.dataIndex]) !== -1
-
-            if (!valid) {
-                const plugin = Ext4.create('LDK.plugin.UserEditableCombo', {
-                    allowChooseOther: false,
-                    name: 'invalidLookup',
-                });
-
-                editor.field.plugins = editor.plugins || [];
-                editor.field.plugins.push(plugin);
-                plugin.init(editor.field);
-            }
-        }
-    },
-
-    getEditor: function(record, column) {
-        const editor = this.callParent(arguments);
-        this.ensureLookups(record, column, editor);
-        return editor;
-    }
-});
\ No newline at end of file
diff --git a/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js b/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
index aa4dd0cd9..16675a955 100644
--- a/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
+++ b/ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js
@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
  */
 Ext4.define('EHR.grid.plugin.ClinicalObservationsCellEditing', {
-    extend: 'EHR.grid.plugin.CellEditing',
+    extend: 'LDK.grid.plugin.CellEditing',
     alias: 'plugin.clinicalobservationscellediting',
 
     constructor: function(config){
@@ -71,7 +71,8 @@ Ext4.define('EHR.grid.plugin.ClinicalObservationsCellEditing', {
         // Keep upward pointer correct for each use - editors are shared between locking sides
         editor.editingPlugin = me;
 
-        this.ensureLookups(record, column, editor);
+        if (editor.field)
+            editor.field = EHR.DataEntryUtils.ensureLookupPlugin(editor.field, true);
 
         return editor;
     }

From 0819e18663c78072a9549c7e41c8349c661e19a8 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Mon, 2 Jun 2025 10:56:36 -0700
Subject: [PATCH 7/7] remove commented out code

---
 ehr/resources/web/ehr/DataEntryUtils.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ehr/resources/web/ehr/DataEntryUtils.js b/ehr/resources/web/ehr/DataEntryUtils.js
index fe2ed654a..cc5258feb 100644
--- a/ehr/resources/web/ehr/DataEntryUtils.js
+++ b/ehr/resources/web/ehr/DataEntryUtils.js
@@ -1111,10 +1111,8 @@ EHR.DataEntryUtils = new function(){
         },
 
         ensureLookupPlugin(editor, initPlugin) {
-            // const xtype = editor?.xtype;
             const xtype = editor?.xtype;
             if ((xtype === 'combo' || xtype === 'labkey-combo' || xtype === 'ehr-simplecombo')
-                    // && !editor.plugins?.find(p => p.ptype === 'ldk-usereditablecombo')) {
                     && !editor.plugins?.find(p => p.ptype === 'ldk-usereditablecombo')) {
 
                 const plugin = Ext4.create('LDK.plugin.UserEditableCombo', {