Skip to content

GH Issue 594: Update messaging related to parent samples/sources not found during import #7790

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
labkey-susanh wants to merge 4 commits into
base: develop
Choose a base branch
from
+8 −5
Open

GH Issue 594: Update messaging related to parent samples/sources not found during import #7790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
589390c
GH Issue 594: Update messaging related to parent samples/sources not …
labkey-susanh Jun 23, 2026
dcf1fe0
Remove extra space and update non-source messaging to match
labkey-susanh Jun 23, 2026
2a54f7f
Update test expectations
labkey-susanh Jun 24, 2026
d156cac
Merge remote-tracking branch 'origin/develop' into fb_importErrorMess…
labkey-susanh Jun 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
7 changes: 5 additions & 2 deletions experiment/src/client/test/integration/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,10 @@ export async function verifyRequiredLineageInsertUpdate(server: IntegrationTestS
failedImportResp = await ExperimentCRUDUtils.importData(server, 'name\t' + parentInput + '\nCData3\t', dataType, 'IMPORT', topFolderOptions, editorUserOptions, false, false, isChildSample, true);
expect(JSON.parse(failedImportResp.text).exception).toBe('Missing value for required property: ' + parentInput);
failedImportResp = await ExperimentCRUDUtils.importData(server, 'name\t' + parentInput + '\nCData3\tbadparentname', dataType, 'IMPORT', topFolderOptions, editorUserOptions, false, false, isChildSample, true);
expect(JSON.parse(failedImportResp.text).exception).toContain("'badparentname' not found in");
if (isParentSample)
expect(JSON.parse(failedImportResp.text).exception).toContain("Parent sample 'badparentname' from Sample Type '" + parentDataType + "' not found in the current context.");
else
expect(JSON.parse(failedImportResp.text).exception).toContain("Data input 'badparentname' from Data Class '" + parentDataType + "' not found in the current context.");
failedImportResp = await ExperimentCRUDUtils.importData(server, 'name\tpAlias\nCData3\t', dataType, 'IMPORT', topFolderOptions, editorUserOptions, false, false, isChildSample, true);
expect(JSON.parse(failedImportResp.text).exception).toBe('Missing value for required property: pAlias');
failedImportResp = await ExperimentCRUDUtils.importData(server, 'name\nCData3', dataType, 'MERGE', topFolderOptions, editorUserOptions, false, false, isChildSample, true);
Expand Down Expand Up @@ -942,4 +945,4 @@ export function generateFieldNameForImport(length: number = 10, charset?: string
fieldName = generateFieldName(length, charset);
}
return fieldName;
}
}
6 changes: 3 additions & 3 deletions experiment/src/org/labkey/experiment/ExpDataIterators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ else if (aliasPrefix != null && aliasSuffix != null)
if (sample != null)
parentMaterials.put(sample, sampleRole(sample));
else
throw new ValidationException("Sample '" + entityName + "' not found in Sample Type '" + namePart + "'.");
throw new ValidationException("Parent sample '" + entityName + "' from Sample Type '" + namePart + "' not found in the current context.");

}
}
Expand Down Expand Up @@ -2002,9 +2002,9 @@ else if (DATA_INPUT_PARENT.equalsIgnoreCase(aliasPrefix))
{

if (ExpSchema.DataClassCategoryType.sources.name().equalsIgnoreCase(dataClass.getCategory()))
throw new ValidationException("Source '" + entityName + "' not found in Source Type '" + namePart + "'.");
throw new ValidationException("Source '" + entityName + "' from Source Type '" + namePart + "' not found in the current context.");
else
throw new ValidationException("Data input '" + entityName + "' not found in Data Class '" + namePart + "'.");
throw new ValidationException("Data input '" + entityName + "' from Data Class '" + namePart + "' not found in the current context.");
}
}
}
Expand Down