Skip to content

GitHub Issue #688: Sample's Created By and Modified By fields do not resolve correctly when added to assay results grid if sample lookup is set to a specific sample type #7564

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 6 commits into
base: develop
Choose a base branch
from
Open

GitHub Issue #688: Sample's Created By and Modified By fields do not resolve correctly when added to assay results grid if sample lookup is set to a specific sample type #7564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9d8778
GitHub Issue #688: use schema getTable() for materialIdForeignKey ins…
cnathe Apr 7, 2026
606f091
Merge remote-tracking branch 'origin/develop' into fb_sampleLookup688
cnathe Apr 8, 2026
f58b621
Fix for failing selenium tests - revert setting of _columnName
cnathe Apr 8, 2026
1736ab8
Merge remote-tracking branch 'origin/develop' into fb_sampleLookup688
cnathe Apr 8, 2026
9b3a639
AssayTest case for GitHub Issue #688 to verify sample lookup createdB…
cnathe Apr 8, 2026
f199939
claude code feedback - restore createMaterialTable() for st == null case
cnathe Apr 8, 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
13 changes: 8 additions & 5 deletions api/src/org/labkey/api/exp/query/SamplesSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,17 @@ public ForeignKey materialIdForeignKey(@Nullable final ExpSampleType st, @Nullab

private TableInfo createLookupTableInfo()
{
// Hack to support lookup via RowId or Name
if (domainProperty != null && domainProperty.getPropertyType().getJdbcType().isText())
_columnName = "Name";

// GitHub Issue #688
if (st != null)
return getTable(tableName, getLookupContainerFilter());

ExpMaterialTable ret = ExperimentService.get().createMaterialTable(SamplesSchema.this, getLookupContainerFilter(), st);
Copy link
Copy Markdown
Contributor

@labkey-klum labkey-klum Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't explore why the lookups were set up correctly for the all samples case, but I assume with your edits that this still works?

Copy link
Copy Markdown
Contributor Author

@cnathe cnathe Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. with my edit, the All Samples lookup still works as expected. I believe it is because in ExpSchema.getMaterialIdForeignKey() the all samples case uses getTable() for the ExpSchema instead of calling the code here in SamplesSchema.materialIdForeignKey

ret.populate();
ret.overlayMetadata(ret.getPublicName(), SamplesSchema.this, new ArrayList<>());
if (domainProperty != null && domainProperty.getPropertyType().getJdbcType().isText())
{
// Hack to support lookup via RowId or Name
_columnName = "Name";
}
ret.setLocked(true);
return ret;
}
Expand Down
20 changes: 17 additions & 3 deletions study/test/src/org/labkey/test/tests/study/AssayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ public void testSampleFieldUpdate()
clickAndWait(Locator.linkWithText("view results"));
assertElementPresent("Sample lookup failed for: OS_1", new Locator.LinkLocator("OS_1"), 1);


log("Edit assay design and change Sample field to point to created Sample Type");
goToManageAssays();
clickAndWait(Locator.LinkLocator.linkWithText(SAMPLE_FIELD_TEST_ASSAY));
Expand All @@ -294,10 +293,21 @@ public void testSampleFieldUpdate()
importAssayData(SAMPLE_FIELD_TEST_ASSAY, TEST_RUN2, "SampleField\nS_1");
goToManageAssays().clickAndWait(Locator.linkWithText(SAMPLE_FIELD_TEST_ASSAY));
clickAndWait(Locator.linkWithText("view results"));
// assertElementPresent("Sample lookup failed for: OS_1", new Locator.LinkLocator("OS_1"), 1); //TODO this becomes the RowId "<123>" after change. Issue #40047

DataRegionTable table = new DataRegionTable("Data", getDriver());
List<String> sampleFieldValues = table.getColumnDataAsText("SampleField");
assertTrue("First sample should not resolve to sample type", sampleFieldValues.get(0).startsWith("<"));
assertEquals("Second sample should resolve to sample type", "S_1", sampleFieldValues.get(1));
assertElementPresent("Sample lookup failed for: S_1", new Locator.LinkLocator("S_1"), 1);

log("GitHub Issue #688: verify sample lookup to createdBy");
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addColumn("SampleField/CreatedBy");
_customizeViewsHelper.applyCustomView();
table = new DataRegionTable("Data", getDriver());
List<String> createdByValues = table.getColumnDataAsText("SampleField/CreatedBy");
assertEquals("First sample should not have a createdBy since it doesn't resolve", " ", createdByValues.get(0));
assertEquals("Second sample should have a createdBy since it resolves to a sample type", getCurrentUserName(), createdByValues.get(1));

log("Edit assay design and change Sample field to point back to 'All Samples'");
goToManageAssays();
clickAndWait(Locator.LinkLocator.linkWithText(SAMPLE_FIELD_TEST_ASSAY));
Expand All @@ -319,6 +329,10 @@ public void testSampleFieldUpdate()
assertElementPresent("Sample lookup failed for: S_2", new Locator.LinkLocator("S_2"), 1);
assertElementPresent("Sample lookup failed for: OS_2", new Locator.LinkLocator("OS_2"), 1);

log("GitHub Issue #688: verify sample lookup to createdBy");
table = new DataRegionTable("Data", getDriver());
for (int i = 0; i < table.getDataRowCount(); i++)
assertEquals("Row " + i + " should have current user as createdBy since they all resolve to samples", getCurrentUserName(), table.getDataAsText(i, "SampleField/CreatedBy"));
}

private void importAssayData(String assayName, String runName, String runDataStr)
Expand Down
Loading