From 71ad05addb8d9b3742e1ad3a1a1ad57f021a5946 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 17 Apr 2026 11:44:09 -0500 Subject: [PATCH 1/2] GitHub Issue #1061: Update NabAssayTest case for setting default value type of ParticipantVisitResolver --- .../labkey/test/tests/nab/NabAssayTest.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/nab/NabAssayTest.java b/src/org/labkey/test/tests/nab/NabAssayTest.java index f02ae5276c..c46037ef49 100644 --- a/src/org/labkey/test/tests/nab/NabAssayTest.java +++ b/src/org/labkey/test/tests/nab/NabAssayTest.java @@ -30,13 +30,16 @@ import org.labkey.test.categories.Daily; import org.labkey.test.components.PlateGrid; import org.labkey.test.components.assay.AssayConstants; +import org.labkey.test.components.domain.AdvancedFieldSetting; import org.labkey.test.components.labkey.LabKeyAlert; +import org.labkey.test.pages.ReactAssayDesignerPage; import org.labkey.test.pages.admin.PermissionsPage; import org.labkey.test.pages.assay.RunQCPage; import org.labkey.test.pages.assay.plate.PlateDesignerPage; import org.labkey.test.pages.assay.plate.PlateTemplateListPage; import org.labkey.test.pages.query.NewQueryPage; import org.labkey.test.pages.query.SourceQueryPage; +import org.labkey.test.params.FieldDefinition; import org.labkey.test.tests.AbstractAssayTest; import org.labkey.test.util.AssayImportOptions; import org.labkey.test.util.AssayImporter; @@ -234,7 +237,6 @@ public void runUITests() clickProject(TEST_ASSAY_PRJ_NAB); clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); - _assayHelper.clickEditAssayDesign() .setPlateTemplate(PLATE_TEMPLATE_NAME) .clickFinish(); @@ -259,6 +261,15 @@ public void runUITests() clickAndWait(Locator.linkWithText("Assay List")); clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); + log("GitHub Issue #1061: set ParticipantVisitResolver field as fixed value for default value setting"); + clickProject(TEST_ASSAY_PRJ_NAB); + clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); + ReactAssayDesignerPage assayDesignerPage = _assayHelper.clickEditAssayDesign(); + assayDesignerPage.goToBatchFields() + .getField(AssayConstants.PARTICIPANT_VISIT_RESOLVER_FIELD_NAME) + .setAdvancedSettings(List.of(AdvancedFieldSetting.defaultType(FieldDefinition.DefaultType.FIXED_NON_EDITABLE))); + assayDesignerPage.clickFinish(); + log("Uploading NAb Runs"); new AssayImporter(this, new AssayImportOptions.ImportOptionsBuilder(). assayId("ptid + visit"). @@ -276,6 +287,15 @@ public void runUITests() runFile(TEST_ASSAY_NAB_FILE1). build()).doImport(); + log("GitHub Issue #1061: revert ParticipantVisitResolver field default value setting"); + clickProject(TEST_ASSAY_PRJ_NAB); + clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); + assayDesignerPage = _assayHelper.clickEditAssayDesign(); + assayDesignerPage.goToBatchFields() + .getField(AssayConstants.PARTICIPANT_VISIT_RESOLVER_FIELD_NAME) + .setAdvancedSettings(List.of(AdvancedFieldSetting.defaultType(FieldDefinition.DefaultType.LAST_ENTERED))); + assayDesignerPage.clickFinish(); + // verify that we catch an invalid date prior to upload new AssayImporter(this, new AssayImportOptions.ImportOptionsBuilder(). assayId("ptid + date"). From 0f8fd61de667d23c9edd1b52ac70baa85b4a71bd Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 17 Apr 2026 14:57:12 -0500 Subject: [PATCH 2/2] fix to put assay run imports back into subfolder --- src/org/labkey/test/tests/nab/NabAssayTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/org/labkey/test/tests/nab/NabAssayTest.java b/src/org/labkey/test/tests/nab/NabAssayTest.java index c46037ef49..b064647619 100644 --- a/src/org/labkey/test/tests/nab/NabAssayTest.java +++ b/src/org/labkey/test/tests/nab/NabAssayTest.java @@ -255,12 +255,6 @@ public void runUITests() assertTextPresent(PLATE_TEMPLATE_NAME); assertTextNotPresent("NAb: 5 specimens in duplicate"); - navigateToFolder(TEST_ASSAY_PRJ_NAB, TEST_ASSAY_FLDR_NAB); - portalHelper.addWebPart("Assay List"); - - clickAndWait(Locator.linkWithText("Assay List")); - clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); - log("GitHub Issue #1061: set ParticipantVisitResolver field as fixed value for default value setting"); clickProject(TEST_ASSAY_PRJ_NAB); clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); @@ -270,6 +264,11 @@ public void runUITests() .setAdvancedSettings(List.of(AdvancedFieldSetting.defaultType(FieldDefinition.DefaultType.FIXED_NON_EDITABLE))); assayDesignerPage.clickFinish(); + navigateToFolder(TEST_ASSAY_PRJ_NAB, TEST_ASSAY_FLDR_NAB); + portalHelper.addWebPart("Assay List"); + clickAndWait(Locator.linkWithText("Assay List")); + clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); + log("Uploading NAb Runs"); new AssayImporter(this, new AssayImportOptions.ImportOptionsBuilder(). assayId("ptid + visit"). @@ -295,6 +294,9 @@ public void runUITests() .getField(AssayConstants.PARTICIPANT_VISIT_RESOLVER_FIELD_NAME) .setAdvancedSettings(List.of(AdvancedFieldSetting.defaultType(FieldDefinition.DefaultType.LAST_ENTERED))); assayDesignerPage.clickFinish(); + navigateToFolder(TEST_ASSAY_PRJ_NAB, TEST_ASSAY_FLDR_NAB); + clickAndWait(Locator.linkWithText("Assay List")); + clickAndWait(Locator.linkWithText(TEST_ASSAY_NAB)); // verify that we catch an invalid date prior to upload new AssayImporter(this, new AssayImportOptions.ImportOptionsBuilder().