-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
base: develop
Are you sure you want to change the base?
Changes from all commits
8ec8d70
c6d13ee
47e754c
73cd2b3
72d421a
f6cebd0
6c02b6c
661ea91
c5d89e8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -915,25 +915,6 @@ protected boolean isAttachmentProperty(String name) | |
| return false; | ||
| } | ||
|
|
||
| protected void configureCrossFolderImport(DataIteratorBuilder rows, DataIteratorContext context) throws IOException | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: (unrelated) unused imports |
||
| { | ||
| 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 | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { hookServer, RequestOptions, selectRandomN, successfulResponse } from '@labkey/test'; | ||
| import { hookServer, RequestOptions, selectRandomN, successfulResponse, testSeed } from '@labkey/test'; | ||
|
|
||
| import { | ||
| deleteAssayDesign, | ||
|
|
@@ -12,7 +12,8 @@ import { ASSAY_DESIGNER_ROLE } from '@labkey/components'; | |
|
|
||
| // @ts-expect-error process is not available in a browser environment | ||
| const server = hookServer(process.env); | ||
| const PROJECT_NAME = 'DataClassCrudJestProject'; | ||
| const PROJECT_NAME = 'AssayDesignCrudJestProject'; | ||
| console.log(`[AssayDesignCrud] Random seed: ${testSeed} (rerun with: TEST_SEED=${testSeed})`); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps we console log this during
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep, it's already logged in |
||
|
|
||
| let readerUser, readerUserOptions; | ||
| let editorUser, editorUserOptions; | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Perhaps just inline so we only need to compute once when there is an error.