Skip to content

GitHub Issue 995: Unable to import assay run with required MVTC values #7517

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
XingY merged 2 commits into from
Mar 25, 2026
Merged

GitHub Issue 995: Unable to import assay run with required MVTC values #7517

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
913ed14
GitHub Issue 995: Unable to import assay run with required MVTC values
XingY Mar 24, 2026
a241b01
CRLF
XingY Mar 24, 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
26 changes: 18 additions & 8 deletions api/src/org/labkey/api/exp/OntologyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,22 +749,32 @@ public static boolean validateProperty(List<? extends IPropertyValidator> valida
{
boolean ret = true;

Object value = objectProperty.getObjectValue();
boolean isArray = prop.getPropertyType() == PropertyType.MULTI_CHOICE;

if (prop.isRequired() && value == null && objectProperty.getMvIndicator() == null)
Object value = isArray ? objectProperty.arrayValue : objectProperty.getObjectValue();
boolean isNull = value == null;

// GitHub Issue 995: Unable to import assay run with required MVTC values
if (isArray && value instanceof MultiChoice.Array array)
isNull = array.isEmpty();

if (prop.isRequired() && isNull && objectProperty.getMvIndicator() == null)
{
errors.add(new PropertyValidationError("Field '" + prop.getName() + "' is required", prop.getName()));
ret = false;
}

// Check if the string is too long. Use either the PropertyDescriptor's scale or VARCHAR(4000) for ontology managed values
int stringLengthLimit = prop.getScale() > 0 ? prop.getScale() : getTinfoObjectProperty().getColumn("StringValue").getScale();
int stringLength = value == null ? 0 : value.toString().length();
if (value != null && prop.isStringType() && stringLength > stringLengthLimit)
if (!isArray)
{
String s = stringLength <= 100 ? value.toString() : StringUtilsLabKey.leftSurrogatePairFriendly(value.toString(), 100);
errors.add(new PropertyValidationError("Field '" + prop.getName() + "' is limited to " + stringLengthLimit + " characters, but the value is " + stringLength + " characters. (The value starts with '" + s + "...')", prop.getName()));
ret = false;
int stringLengthLimit = prop.getScale() > 0 ? prop.getScale() : getTinfoObjectProperty().getColumn("StringValue").getScale();
int stringLength = value == null ? 0 : value.toString().length();
if (value != null && prop.isStringType() && stringLength > stringLengthLimit)
{
String s = stringLength <= 100 ? value.toString() : StringUtilsLabKey.leftSurrogatePairFriendly(value.toString(), 100);
errors.add(new PropertyValidationError("Field '" + prop.getName() + "' is limited to " + stringLengthLimit + " characters, but the value is " + stringLength + " characters. (The value starts with '" + s + "...')", prop.getName()));
ret = false;
}
}

// TODO: check date is within postgres date range
Expand Down
Loading