Skip to content

Remove experimental feature to allow the merge option in datasets with server managed third keys #7892

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-klum wants to merge 2 commits into
base: develop
Choose a base branch
from
+3 −13
Open

Remove experimental feature to allow the merge option in datasets with server managed third keys #7892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47461ff
Remove experimental feature
labkey-klum Jul 29, 2026
90c56f9
debug code
labkey-klum Jul 29, 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
5 changes: 0 additions & 5 deletions study/src/org/labkey/study/StudyModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,6 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
"Flags rows in assay linked datasets where the subject and timepoint may be different from the source assay.",
false);

OptionalFeatureService.get().addExperimentalFeatureFlag(DatasetQueryView.EXPERIMENTAL_ALLOW_MERGE_WITH_MANAGED_KEYS,
"Allow merge of study dataset that uses server-managed additional key fields",
"Merging of dataset that uses server-managed third key (such as GUID or auto RowId) is not officially supported. Unexpected outcome might be experienced when merge is performed.",
false);

OptionalFeatureService.get().addExperimentalFeatureFlag(DatasetQueryView.EXPERIMENTAL_QUERY_DATASETS,
"Allow query based dataset snapshots",
"Allow unprovisioned, query-based dataset snapshots to be created.",
Expand Down
6 changes: 2 additions & 4 deletions study/src/org/labkey/study/controllers/StudyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.json.JSONObject;
import org.junit.Test;
import org.labkey.api.action.ApiJsonForm;
import org.labkey.api.action.ApiResponse;
import org.labkey.api.action.ApiSimpleResponse;
Expand Down Expand Up @@ -163,7 +164,6 @@
import org.labkey.api.security.RequiresNoPermission;
import org.labkey.api.security.RequiresPermission;
import org.labkey.api.security.SecurityManager;
import org.junit.Test;
import org.labkey.api.security.User;
import org.labkey.api.security.permissions.AbstractContainerScopingTest;
import org.labkey.api.security.permissions.AdminPermission;
Expand All @@ -175,7 +175,6 @@
import org.labkey.api.security.permissions.QCAnalystPermission;
import org.labkey.api.security.permissions.ReadPermission;
import org.labkey.api.security.permissions.UpdatePermission;
import org.labkey.api.settings.OptionalFeatureService;
import org.labkey.api.specimen.SpecimenManager;
import org.labkey.api.specimen.SpecimenMigrationService;
import org.labkey.api.specimen.location.LocationImpl;
Expand Down Expand Up @@ -323,7 +322,6 @@
import static org.labkey.study.model.QCStateSet.getQCUrlFilterKey;
import static org.labkey.study.model.QCStateSet.getQCUrlFilterValue;
import static org.labkey.study.model.QCStateSet.selectedQCStateLabelFromUrl;
import static org.labkey.study.query.DatasetQueryView.EXPERIMENTAL_ALLOW_MERGE_WITH_MANAGED_KEYS;

public class StudyController extends BaseStudyController
{
Expand Down Expand Up @@ -2709,7 +2707,7 @@ public ModelAndView getView(ImportDatasetForm form, BindException errors) throws
if (null == PipelineService.get().findPipelineRoot(getContainer()))
return new RequirePipelineView(_study, true, errors);

boolean showImportOptions = OptionalFeatureService.get().isFeatureEnabled(EXPERIMENTAL_ALLOW_MERGE_WITH_MANAGED_KEYS) || _def.getKeyManagementType() == Dataset.KeyManagementType.None;
boolean showImportOptions = _def.getKeyManagementType() == Dataset.KeyManagementType.None;
setShowMergeOption(showImportOptions);
setShowUpdateOption(showImportOptions);
setSuccessMessageSuffix("imported"); //Works for when the merge option is selected (may include updates) vs default "inserted"
Expand Down
1 change: 0 additions & 1 deletion study/src/org/labkey/study/query/DatasetQueryView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
public class DatasetQueryView extends StudyQueryView
{
public static final String EXPERIMENTAL_LINKED_DATASET_CHECK = "LinkedDatasetCheck";
public static final String EXPERIMENTAL_ALLOW_MERGE_WITH_MANAGED_KEYS = "MergeWithManagedDatasetKeys";
public static final String EXPERIMENTAL_QUERY_DATASETS = "queryBasedDatasets";

private final DatasetDefinition _dataset;
Expand Down
4 changes: 1 addition & 3 deletions study/src/org/labkey/study/query/DatasetTableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
import org.labkey.api.security.permissions.RestrictedUpdatePermission;
import org.labkey.api.security.permissions.UpdatePermission;
import org.labkey.api.security.roles.Role;
import org.labkey.api.settings.OptionalFeatureService;
import org.labkey.api.specimen.model.SpecimenTablesProvider;
import org.labkey.api.study.Dataset;
import org.labkey.api.study.DatasetTable;
Expand Down Expand Up @@ -118,7 +117,6 @@
import java.util.function.Predicate;

import static org.labkey.api.util.IntegerUtils.asLongElseNull;
import static org.labkey.study.query.DatasetQueryView.EXPERIMENTAL_ALLOW_MERGE_WITH_MANAGED_KEYS;

/** Wraps a DatasetSchemaTableInfo and makes it Query-ized. Represents a single dataset's data */
public class DatasetTableImpl extends BaseStudyTable implements DatasetTable
Expand Down Expand Up @@ -492,7 +490,7 @@ public SQLFragment getValueSql(String tableAliasName)

addFolderColumn();

if(OptionalFeatureService.get().isFeatureEnabled(EXPERIMENTAL_ALLOW_MERGE_WITH_MANAGED_KEYS) || getDataset().getKeyManagementType() == Dataset.KeyManagementType.None)
if (getDataset().getKeyManagementType() == Dataset.KeyManagementType.None)
{
setAllowedInsertOption(QueryUpdateService.InsertOption.MERGE);
setAllowedInsertOption(QueryUpdateService.InsertOption.REPLACE);
Expand Down