Skip to content

Add brackets in UserEditableCombo dropdowns around broken lookups #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
labkey-martyp wants to merge 4 commits into from
Closed

Add brackets in UserEditableCombo dropdowns around broken lookups #247

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78fe331
Add tpl to bracket invalid lookups
labkey-martyp May 27, 2025
6816e4e
opt in
labkey-martyp May 27, 2025
a2abf21
Opt in refactor. Less intrusive
labkey-martyp May 27, 2025
d2cc3bc
commit for posterity
labkey-martyp May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions LDK/resources/web/LDK/plugin/UserEditableCombo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Ext4.define('LDK.plugin.UserEditableCombo', {

alias: 'plugin.ldk-usereditablecombo',
allowChooseOther: true,
useBracketsForUnknownValues: false,

init: function(combo) {
this.combo = combo;
Expand Down Expand Up @@ -84,6 +85,7 @@ Ext4.define('LDK.plugin.UserEditableCombo', {
var rec = this.store.createModel({});
rec.set(this.valueField, val);
rec.set(this.displayField, val);
rec.set("invalid", true);

this.store.add(rec);
},
Expand All @@ -95,6 +97,47 @@ Ext4.define('LDK.plugin.UserEditableCombo', {
}
});

if (this.useBracketsForUnknownValues) {
let innerTpl = 'this.formatLookup(values)';

const innerTplWrap = this.combo?.listConfig?.getInnerTpl();
if (typeof innerTplWrap === 'string') {
innerTpl = innerTplWrap.replaceAll('values', innerTpl);
}
else if (Array.isArray(innerTplWrap)) {
innerTpl = innerTplWrap.map(t => t.replaceAll('values', innerTpl));
}
else {
innerTpl = '{[' + innerTpl + ']}';
}

Ext4.override(combo, {
tpl: Ext4.create('Ext.XTemplate',
'<ul class="x4-list-plain">',
'<tpl for=".">',
'<li role="option" class="x4-boundlist-item">',
'' + innerTpl,
'</li>',
'</tpl>',
'</ul>',
{
formatLookup: function(value) {
const val = value[this.field.displayField] || value[this.field.valueField] || '';
if (Ext4.isEmpty(val)) {
return '';
}

if (value.invalid) {
return '[' + LABKEY.Utils.encodeHtml(val) + ']';
}

return LABKEY.Utils.encodeHtml(val);
}
}
)
});
}

combo.store.on('add', this.onStoreAdd, this);
combo.store.on('load', combo.ensureValueInStore, combo);
combo.store.on('beforerender', combo.ensureValueInStore, combo);
Expand Down