Skip to content

GitHub Issue 903: Remove Cross-Container Sample and Data Class Import Feature #7698

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
XingY wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

GitHub Issue 903: Remove Cross-Container Sample and Data Class Import Feature #7698

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
8ec8d70
GitHub Issue 903: Remove Cross-Container Sample and Data Class Import…
XingY May 26, 2026
c6d13ee
crlf
XingY May 27, 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
11 changes: 0 additions & 11 deletions api/src/org/labkey/api/dataiterator/DataIteratorContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public class DataIteratorContext
LookupResolutionType _lookupResolutionType = LookupResolutionType.primaryKey;
QueryImportPipelineJob _backgroundJob = null;
boolean _crossTypeImport = false;
boolean _crossFolderImport = false;
boolean _allowCreateStorage = false;
boolean _useTransactionAuditCache = false;
private final Set<String> _passThroughBuiltInColumnNames = new CaseInsensitiveHashSet();
Expand Down Expand Up @@ -202,16 +201,6 @@ public void setCrossTypeImport(boolean crossTypeImport)
_crossTypeImport = crossTypeImport;
}

public boolean isCrossFolderImport()
{
return _crossFolderImport;
}

public void setCrossFolderImport(boolean crossFolderImport)
{
_crossFolderImport = crossFolderImport;
}

public boolean isAllowCreateStorage()
{
return _allowCreateStorage;
Expand Down
6 changes: 0 additions & 6 deletions api/src/org/labkey/api/query/AbstractQueryImportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ public enum Params
crossTypeImport,
allowCreateStorage,
importLookupByAlternateKey, // deprecated. Prefer lookupResolutionType
crossFolderImport,
useTransactionAuditCache,
lookupResolutionType,
auditDetails,
Expand All @@ -331,7 +330,6 @@ protected Map<Params, Boolean> getOptionParamsMap()
_optionParamsMap.put(Params.importIdentity, Boolean.valueOf(getParam(Params.importIdentity)));
_optionParamsMap.put(Params.crossTypeImport, Boolean.valueOf(getParam(Params.crossTypeImport)));
_optionParamsMap.put(Params.allowCreateStorage, Boolean.valueOf(getParam(Params.allowCreateStorage)));
_optionParamsMap.put(Params.crossFolderImport, Boolean.valueOf(getParam(Params.crossFolderImport)));
_optionParamsMap.put(Params.useTransactionAuditCache, Boolean.valueOf(getParam(Params.useTransactionAuditCache)));
}
return _optionParamsMap;
Expand All @@ -345,8 +343,6 @@ protected Set<String> getTransactionImportParams(String insertOption, boolean us
importParams.add("backgroundImport");
if (Boolean.valueOf(getParam(Params.crossTypeImport)))
importParams.add(Params.crossTypeImport.name());
if (Boolean.valueOf(getParam(Params.crossFolderImport)))
importParams.add(Params.crossFolderImport.name());
if (Boolean.valueOf(getParam(Params.useTransactionAuditCache)))
importParams.add(Params.useTransactionAuditCache.name());
if (Boolean.valueOf(getParam(Params.allowCreateStorage)))
Expand Down Expand Up @@ -852,7 +848,6 @@ public static DataIteratorContext createDataIteratorContext(QueryUpdateService.I
boolean importIdentity = optionParamsMap.getOrDefault(AbstractQueryImportAction.Params.importIdentity, false);
boolean crossTypeImport = optionParamsMap.getOrDefault(AbstractQueryImportAction.Params.crossTypeImport, false);
boolean allowCreateStorage = optionParamsMap.getOrDefault(AbstractQueryImportAction.Params.allowCreateStorage, false);
boolean crossFolderImport = optionParamsMap.getOrDefault(AbstractQueryImportAction.Params.crossFolderImport, false);
boolean useTransactionAuditCache = optionParamsMap.getOrDefault(Params.useTransactionAuditCache, false);

DataIteratorContext context = new DataIteratorContext(errors);
Expand All @@ -874,7 +869,6 @@ public static DataIteratorContext createDataIteratorContext(QueryUpdateService.I
context.setSupportAutoIncrementKey(true);
}
context.setCrossTypeImport(crossTypeImport);
context.setCrossFolderImport(crossFolderImport && container != null && container.hasProductFolders());
context.setAllowCreateStorage(allowCreateStorage);
context.setUseTransactionAuditCache(useTransactionAuditCache);
context.setLogger(logger);
Expand Down
4 changes: 2 additions & 2 deletions api/src/org/labkey/api/query/AbstractQueryUpdateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ protected int _importRowsUsingDIB(User user, Container container, DataIteratorBu

preImportDIBValidation(in, null);

boolean skipTriggers = context.getConfigParameterBoolean(ConfigParameters.SkipTriggers) || context.isCrossTypeImport() || context.isCrossFolderImport();
boolean skipTriggers = context.getConfigParameterBoolean(ConfigParameters.SkipTriggers) || context.isCrossTypeImport();
boolean hasTableScript = hasTableScript(container);
TriggerDataBuilderHelper helper = new TriggerDataBuilderHelper(getQueryTable(), container, user, extraScriptContext, context.getInsertOption().useImportAliases);
if (!skipTriggers)
Expand Down Expand Up @@ -1299,7 +1299,7 @@ static FileLike checkFileUnderRoot(Container container, FileLike file) throws Ex

protected void _addSummaryAuditEvent(Container container, User user, DataIteratorContext context, int count)
{
if (!context.isCrossTypeImport() && !context.isCrossFolderImport()) // audit handled at table level
if (!context.isCrossTypeImport()) // audit handled at table level
{
AuditBehaviorType auditType = (AuditBehaviorType) context.getConfigParameter(DetailedAuditLogDataIterator.AuditConfigs.AuditBehavior);
String auditUserComment = (String) context.getConfigParameter(DetailedAuditLogDataIterator.AuditConfigs.AuditUserComment);
Expand Down
19 changes: 0 additions & 19 deletions api/src/org/labkey/api/query/DefaultQueryUpdateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,25 +915,6 @@ protected boolean isAttachmentProperty(String name)
return false;
}

protected void configureCrossFolderImport(DataIteratorBuilder rows, DataIteratorContext context) throws IOException
{
if (!context.getInsertOption().updateOnly && context.isCrossFolderImport() && rows instanceof DataLoader dataLoader)
{
boolean hasContainerField = false;
for (ColumnDescriptor columnDescriptor : dataLoader.getColumns())
{
String fieldName = columnDescriptor.getColumnName();
if (fieldName.equalsIgnoreCase("Container") || fieldName.equalsIgnoreCase("Folder"))
{
hasContainerField = true;
break;
}
}
if (!hasContainerField)
context.setCrossFolderImport(false);
}
}

public static @Nullable String getKeyColumnAliasForUpdate(TableInfo tableInfo, @NotNull Map<String, Integer> columnNameMap)
{
// Currently, SampleUpdateAddColumnsDataIterator and DataClassUpdateAddColumnsDataIterator is being called before a translator is invoked to
Expand Down
8 changes: 4 additions & 4 deletions experiment/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion experiment/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"@labkey/build": "9.1.3",
"@labkey/test": "1.13.1",
"@labkey/test": "1.13.2-fb-dropCrossFolder.1",
"@types/jest": "30.0.0",
"@types/react": "18.3.27",
"@types/react-dom": "18.3.7",
Expand Down
Loading