Skip to content

Remove MVTC experimental flag #7622

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
XingY merged 4 commits into from
Apr 28, 2026
Merged

Remove MVTC experimental flag #7622

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
d8d00cc
Remove MVTC experimental flag
XingY Apr 26, 2026
ce32c93
crlf
XingY Apr 27, 2026
fd43326
crlf
XingY Apr 27, 2026
c78282b
remove stale import
XingY Apr 28, 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
4 changes: 0 additions & 4 deletions api/src/org/labkey/api/exp/property/DomainUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@
import org.labkey.api.query.UserSchema;
import org.labkey.api.query.ValidationException;
import org.labkey.api.security.User;
import org.labkey.api.settings.AppProps;
import org.labkey.api.settings.OptionalFeatureService;
import org.labkey.api.util.DateUtil;
import org.labkey.api.util.GUID;
import org.labkey.api.util.JdbcUtil;
Expand Down Expand Up @@ -444,8 +442,6 @@ public static boolean allowMultiChoice(DomainKind<?> kind)
{
if (!kind.allowMultiChoiceProperties())
return false;
if (!OptionalFeatureService.get().isFeatureEnabled(AppProps.MULTI_VALUE_TEXT_CHOICE))
return false;
return CoreSchema.getInstance().getSqlDialect().isPostgreSQL();
}

Expand Down
1 change: 0 additions & 1 deletion api/src/org/labkey/api/settings/AppProps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public interface AppProps
String ADMIN_PROVIDED_ALLOWED_EXTERNAL_RESOURCES = "allowedExternalResources";
String QUANTITY_COLUMN_SUFFIX_TESTING = "quantityColumnSuffixTesting";
String REJECT_CONTROLLER_FIRST_URLS = "rejectControllerFirstUrls";
String MULTI_VALUE_TEXT_CHOICE = "multiChoiceDataType";

String UNKNOWN_VERSION = "Unknown Release Version";

Expand Down
3 changes: 0 additions & 3 deletions experiment/src/org/labkey/experiment/ExperimentModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,6 @@ protected void init()

OptionalFeatureService.get().addExperimentalFeatureFlag(NameGenerator.EXPERIMENTAL_ALLOW_GAP_COUNTER, "Allow gap with withCounter and rootSampleCount expression",
"Check this option if gaps in the count generated by withCounter or rootSampleCount name expression are allowed.", true);

OptionalFeatureService.get().addExperimentalFeatureFlag(AppProps.MULTI_VALUE_TEXT_CHOICE, "Allow multi-value Text Choice properties",
"Support selecting more than one value for text choice fields", false);
}
OptionalFeatureService.get().addExperimentalFeatureFlag(AppProps.QUANTITY_COLUMN_SUFFIX_TESTING, "Quantity column suffix testing",
"If a column name contains a \"__<unit>\" suffix, this feature allows for testing it as a Quantity display column", false);
Expand Down
2 changes: 0 additions & 2 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 @@ -48,7 +48,6 @@
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.DomainUtils;
import org.labkey.test.util.LogMethod;
import org.labkey.test.util.OptionalFeatureHelper;
import org.labkey.test.util.SampleTypeHelper;
import org.labkey.test.util.StudyHelper;
import org.labkey.test.util.TestDataGenerator;
Expand Down Expand Up @@ -132,7 +131,6 @@ public void testAssayNameMaxLength() throws Exception
public void testAssayMultiFileImportForMVTC() throws Exception
{
Assume.assumeTrue("Multi-choice text fields are only supported on PostgreSQL", WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL);
OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
Copy link
Copy Markdown
Contributor

@cnathe cnathe Apr 28, 2026

Choose a reason for hiding this comment

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

minor: looks like this test and some others in the various PRs here have an unused import of OptionalFeatureHelper that can be removed.

_containerHelper.createProject(MVTC_MULTI_FILE_IMPORT_PROJECT, "Assay");
new GeneralAssayDesign(MVTC_MULTI_FILE_IMPORT_ASSAY)
.setRunFields(List.of(new FieldDefinition("runText", FieldDefinition.ColumnType.String)), true)
Expand Down
2 changes: 0 additions & 2 deletions study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import org.labkey.test.util.DomainUtils;
import org.labkey.test.util.LogMethod;
import org.labkey.test.util.LoggedParam;
import org.labkey.test.util.OptionalFeatureHelper;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.TestDataGenerator;
import org.labkey.test.util.data.TestDataUtils;
Expand Down Expand Up @@ -189,7 +188,6 @@ public void testDatasets()
public void testDatasetWithMultiChoice()
{
Assume.assumeTrue("Multi-choice text fields are only supported on PostgreSQL", WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL);
Copy link
Copy Markdown
Contributor

@cnathe cnathe Apr 28, 2026

Choose a reason for hiding this comment

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

unrelated to this PR, but the tests that have this check, do they just fail in MSSQL runs? seems like we'd instead just want to return if not postgres so that the test "passes" and doesn't cause noise on TC.

Copy link
Copy Markdown
Contributor Author

@XingY XingY Apr 28, 2026

Choose a reason for hiding this comment

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

Looking at the documentation, a failed assume would halt and ignore the rest of the test, which sounds correct.

OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
String datasetName = "Test dataset";
DatasetDesignerPage definitionPage = _studyHelper.goToManageDatasets()
.clickCreateNewDataset()
Expand Down
Loading