Skip to content

Issue #980: Deprecate the UI for deriving samples in LKS #3052

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
labkey-susanh merged 4 commits into from
Jun 19, 2026
Merged

Issue #980: Deprecate the UI for deriving samples in LKS #3052

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
5c498fc
Issue #980: Deprecate the UI for deriving samples in LKS
labkey-susanh Jun 16, 2026
7c9d000
Stash and restore previous deriveSamplesNotInApp setting
labkey-susanh Jun 17, 2026
b9732c3
Add missing reset of setting
labkey-susanh Jun 17, 2026
0a5c462
Use resetOptionalFeature
labkey-susanh Jun 17, 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
9 changes: 9 additions & 0 deletions src/org/labkey/test/tests/SampleTypeLimitsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.labkey.test.params.list.ListDefinition;
import org.labkey.test.params.list.VarListDefinition;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.OptionalFeatureHelper;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.SampleTypeHelper;
import org.labkey.test.util.TestDataGenerator;
Expand Down Expand Up @@ -117,6 +118,13 @@ private void doSetup()
}
}

@Override
protected void doCleanup(boolean afterTest)
{
super.doCleanup(afterTest);
OptionalFeatureHelper.resetOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp");
}

@Test
public void testStringLookupFields() throws IOException, CommandException
{
Expand Down Expand Up @@ -196,6 +204,7 @@ private void insertSampleTypeRow(String regionName, String rowValue)
public void testDeriveSamplesLookupFields() throws IOException, CommandException
{
goToProjectHome();
OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp", true);

log("Create sample type with lookup field to " + SAMPLE_TYPE_NAME);
String sampleTypeName = "SampleTypeWithLookup";
Expand Down
7 changes: 3 additions & 4 deletions src/org/labkey/test/tests/SampleTypeLineageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.labkey.test.params.experiment.DataClassDefinition;
import org.labkey.test.params.experiment.SampleTypeDefinition;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.OptionalFeatureHelper;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.SampleTypeHelper;
import org.labkey.test.util.TestDataGenerator;
Expand Down Expand Up @@ -86,7 +87,6 @@ public static void setupProject()
{
SampleTypeLineageTest init = getCurrentTest();

// Comment out this line (after you run once) it will make iterating on tests much easier.
init.doSetup();
}

Expand All @@ -101,16 +101,15 @@ private void doSetup()
portalHelper.addWebPart("Sample Types");

portalHelper.exitAdminMode();
OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp", true);
}

@Override
protected void doCleanup(boolean afterTest) throws TestTimeoutException
{
super.doCleanup(afterTest);

// If you are debugging tests change this function to do nothing.
// It can make re-running faster but you need to valid the integrity of the test data on your own.
// log("Do nothing.");
OptionalFeatureHelper.resetOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp");
}

/**
Expand Down
6 changes: 6 additions & 0 deletions src/org/labkey/test/tests/SampleTypeLinkToStudyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.labkey.test.params.FieldDefinition;
import org.labkey.test.params.experiment.SampleTypeDefinition;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.OptionalFeatureHelper;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.SampleTypeHelper;
import org.labkey.test.util.StudyHelper;
Expand Down Expand Up @@ -105,8 +106,12 @@ private void doSetup()
new PortalHelper(getDriver()).addBodyWebPart("Datasets");

createSampleTypes();
OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp", true);

}



private void createSampleTypes()
{
SampleTypeHelper sampleHelper = new SampleTypeHelper(this);
Expand Down Expand Up @@ -881,5 +886,6 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException
_containerHelper.deleteProject(DATE_BASED_STUDY, false);
_containerHelper.deleteProject(SAMPLE_TYPE_PROJECT + " Study 1", false);
_containerHelper.deleteProject(SAMPLE_TYPE_PROJECT + " Study 2", false);
OptionalFeatureHelper.resetOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp");
}
}
10 changes: 9 additions & 1 deletion src/org/labkey/test/tests/SampleTypeNameExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.labkey.test.util.AuditLogHelper;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.EscapeUtil;
import org.labkey.test.util.OptionalFeatureHelper;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.SampleTypeHelper;
import org.labkey.test.util.TestDataGenerator;
Expand Down Expand Up @@ -132,6 +133,13 @@ public static void setupProject() throws IOException, CommandException
test.doSetup();
}

@Override
protected void doCleanup(boolean afterTest)
{
super.doCleanup(afterTest);
OptionalFeatureHelper.resetOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp");
}

private void addDataRow(TestDataGenerator dataGenerator, String name, int intVal)
{
Map<String, Object> sampleData = new HashMap<>();
Expand Down Expand Up @@ -196,7 +204,7 @@ private void doSetup() throws IOException, CommandException

// Just want to get an updated view of the sample types.
refresh();

OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp", true);
}

@Before
Expand Down