Skip to content

Linked schema form improvements #7310

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

Merged
labkey-klum merged 3 commits into from
Jan 8, 2026
Merged

Linked schema form improvements #7310

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a43d19b
Improve linked schema form validation
labkey-klum Jan 2, 2026
f8b6c78
clear warnings
labkey-klum Jan 2, 2026
3ed4d3f
Switch event listener to better handle combo changes.
labkey-klum Jan 5, 2026
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
36 changes: 15 additions & 21 deletions query/src/org/labkey/query/view/linkedSchema.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
Expand Down Expand Up @@ -40,8 +41,7 @@
BaseExternalSchemaBean bean = (BaseExternalSchemaBean)HttpView.currentModel();
AbstractExternalSchemaDef def = bean.getSchemaDef();

Container targetContainer = getContainer();
Container sourceContainer = targetContainer;
Container sourceContainer = getContainer();

boolean isExternal = true;
if (def instanceof LinkedSchemaDef lsd)
Expand All @@ -60,8 +60,6 @@
Ext4.onReady(function () {

var schemaType = <%=q(isExternal ? SchemaType.external.name() : SchemaType.linked.name())%>;
var external = <%=isExternal%>;

Ext4.QuickTips.init();

Ext4.define('LABKEY.Query.SchemaTemplate', {
Expand Down Expand Up @@ -115,14 +113,14 @@
if (this.getOverride()) {
this.setOverride(false);
this.boundField.setDisabled(true);
var fieldContainer = this.boundField.up('fieldcontainer');
let fieldContainer = this.boundField.up('fieldcontainer');
if (fieldContainer)
fieldContainer.setDisabled(true);
}
else {
this.setOverride(true);
this.boundField.setDisabled(false);
var fieldContainer = this.boundField.up('fieldcontainer');
let fieldContainer = this.boundField.up('fieldcontainer');
if (fieldContainer)
fieldContainer.setDisabled(false);
}
Expand All @@ -140,7 +138,6 @@
name: 'userSchemaName',
fieldLabel: 'Schema Name',
allowBlank: false,
validateOnBlur: false,
maxLength: 50,
value: <%=q(def.getUserSchemaName())%>,
helpPopup: <%=qh(bean.getHelpHTML("UserSchemaName"))%>
Expand All @@ -150,31 +147,30 @@
name: 'dataSource',
fieldLabel: 'Source Container',
value: <%=q(def.getDataSource())%>,
<%--helpPopup: <%=qh(bean.getHelpHTML("DataSource"))%>--%>
typeAhead: true,
anyMatch: true,
forceSelection: true
}));

sourceContainerCombo.on('select', function (field, records) {
var record = records[0];
if (record) {
sourceContainerCombo.on('change', function (field, newValue) {
if (newValue) {
sourceSchemaField.setDisabled(false);
metadataField.setDisabled(false);
schemaTemplateCombo.loadTemplateField(field.getValue());
schemaTemplateCombo.loadTemplateField(newValue);
} else {
sourceSchemaField.setDisabled(true);
metadataField.setDisabled(true);
schemaTemplateCombo.setDisabled(true);
}
});


var schemaTemplateCombo = Ext4.create('Ext.form.field.ComboBox', {
name: 'schemaTemplate',
fieldLabel: 'Schema Template',
width: 395,
displayField: 'name',
valueField: 'name',
editable: true,
//autoLoad: <%=def.getDataSource() != null%>,
disabled: <%=def.getDataSource() == null%>,
value: <%=q(initialTemplateName)%>,
listConfig : {
Expand Down Expand Up @@ -329,8 +325,7 @@
var schemaTemplateName = schemaTemplateCombo.getValue();
var schemaTemplateRecord = schemaTemplateCombo.store.getById(schemaTemplateName);
if (schemaTemplateRecord) {
var sourceSchemaName = schemaTemplateRecord.get('sourceSchemaName');
return sourceSchemaName;
return schemaTemplateRecord.get('sourceSchemaName');
}
}
});
Expand Down Expand Up @@ -414,8 +409,7 @@
var schemaTemplateName = schemaTemplateCombo.getValue();
var schemaTemplateRecord = schemaTemplateCombo.store.getById(schemaTemplateName);
if (schemaTemplateRecord) {
var tables = schemaTemplateRecord.get('tables');
return tables;
return schemaTemplateRecord.get('tables');
}
}
});
Expand Down Expand Up @@ -450,8 +444,7 @@
var schemaTemplateName = schemaTemplateCombo.getValue();
var schemaTemplateRecord = schemaTemplateCombo.store.getById(schemaTemplateName);
if (schemaTemplateRecord) {
var metaData = schemaTemplateRecord.get('metadata');
return metaData;
return schemaTemplateRecord.get('metadata');
}
}
});
Expand Down Expand Up @@ -497,6 +490,7 @@
items: [{
text: <%=q(bean.isInsert() ? "Create" : "Update")%>,
type: 'submit',
formBind : true,
handler: function () {
var sourceContainerValue = sourceContainerCombo.getValue();
if (!sourceContainerValue)
Expand Down Expand Up @@ -544,7 +538,7 @@
});
}
},{
<% if (bean.isInsert()) { %>
<% if (!bean.isInsert()) { %>
text: 'Delete',
handler: function() { document.location = <%=q(bean.getDeleteURL())%>; }
},{
Expand Down