Skip to content

Provide warnings for unknown fields for cross sample type import #2862

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

Open
cnathe wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Provide warnings for unknown fields for cross sample type import #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3a7ed5
Test fixes for change from quoted values to bold in error messages
cnathe Jan 23, 2026
877a253
Test fixes for change from quoted values to bold in error messages
cnathe Jan 23, 2026
e14dde5
getConversionErrorMessage update for cases that don't wrap value and …
cnathe Jan 27, 2026
eca8fd2
Merge remote-tracking branch 'origin/develop' into fb_crossSampleType…
cnathe Jan 27, 2026
cc83bc6
Update text for "can't upload attachment" error message for consistency
cnathe Jan 28, 2026
990f510
Merge remote-tracking branch 'origin/develop' into fb_crossSampleType…
cnathe Jan 28, 2026
82daf70
Merge remote-tracking branch 'origin/develop' into fb_crossSampleType…
cnathe Jan 29, 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
14 changes: 10 additions & 4 deletions src/org/labkey/test/LabKeySiteWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,23 +1721,29 @@ protected void deletePipelineJob(@LoggedParam String jobDescription, @LoggedPara

public String getConversionErrorMessage(Object value, String fieldName, Class<?> targetClass)
{
return getConversionErrorMessage(value, fieldName, targetClass, true);
return getConversionErrorMessage(value, fieldName, targetClass, true, false);
}

// Note: Keep in sync with ConvertHelper.getStandardConversionErrorMessage()
// Example: "Could not convert value '2.34' (Double) for Boolean field 'Medical History.Dep Diagnosed in Last 18 Months'"
public String getConversionErrorMessage(Object value, String fieldName, Class<?> targetClass, boolean useUSDateParsing)
public String getConversionErrorMessage(Object value, String fieldName, Class<?> targetClass, boolean useUSDateParsing, boolean withoutSingleQuotes)
{
String errorMessage;
String fieldType = targetClass.getSimpleName();
String quote = withoutSingleQuotes ? "" : "'";

// Issue 50768: Need a better error message if date value is not in the expected format.
if (fieldType.equalsIgnoreCase("date") || fieldType.equalsIgnoreCase("datetime") || fieldType.equalsIgnoreCase("timestamp"))
{
String parsingMode = useUSDateParsing ? "U.S. date parsing (MDY)" : "Non-U.S. date parsing (DMY)";
return "'" + value + "' is not a valid " + fieldType + " for " + fieldName + " using " + parsingMode;
errorMessage = quote + value + quote + " is not a valid " + fieldType + " for " + fieldName + " using " + parsingMode;
}
else
{
errorMessage = "Could not convert value " + quote + value + quote + " (" + value.getClass().getSimpleName() + ") for " + fieldType + " field " + quote + fieldName + quote;
}

return "Could not convert value '" + value + "' (" + value.getClass().getSimpleName() + ") for " + fieldType + " field '" + fieldName + "'" ;
return errorMessage;
}

private ProductKey getProductConfiguration() throws IOException, CommandException
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/InlineImagesListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ public final void testList() throws Exception
importFilePathError(listImportPage, "1", PDF_FILE.getName());
importFilePathError(listImportPage, "5", PDF_FILE.getName());

String attachmentError = "Can't upload '%s' to field %s with type Attachment.";
String attachmentError = "Cannot upload '%s' to Attachment type field '%s'.";
String attachmentPdfError = String.format(attachmentError, PDF_FILE.getName(), LIST_ATTACHMENT01_NAME);
String attachmentAbsentError = String.format(attachmentError, "Absent.txt", LIST_ATTACHMENT01_NAME);
verifyQueryAPI("lists", LIST_NAME, Map.of(LIST_KEY_NAME, 5, LIST_ATTACHMENT01_NAME, PDF_FILE.getName()), true, "Row 1: " + attachmentPdfError);
Expand All @@ -397,7 +397,7 @@ private void importFilePathError(ImportDataPage listImportPage, String key, Stri
listImportPage.submitExpectingError();
try
{
String expectedError = "Row 1: Can't upload '" + attachmentValue + "' to field " + LIST_ATTACHMENT01_NAME + " with type Attachment.";
String expectedError = "Row 1: Cannot upload '" + attachmentValue + "' to Attachment type field '" + LIST_ATTACHMENT01_NAME + "'.";
checker().withScreenshot("import_error").verifyTrue("Invalid attachment error not as expected", isElementPresent(Locator.tagWithClass("div", "labkey-error").withText(expectedError)));
}
catch(NoSuchElementException nse)
Expand Down