Skip to content

Commit 3ebea1c

Browse files
committed
getCrossFolderSelectionResult - Remove dataRegionSelectionKey arg
AssayImportDropdownSection - Fix issue with crossfolder selections in subfolders
1 parent 42e701d commit 3ebea1c

2 files changed

Lines changed: 3 additions & 13 deletions

File tree

packages/components/src/internal/components/entities/APIWrapper.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import {
4646

4747
export interface EntityAPIWrapper {
4848
getCrossFolderSelectionResult: (
49-
dataRegionSelectionKey: string,
5049
dataType: string, // 'samples' | 'exp.data' | 'assay',
5150
rowIds?: string[] | number[],
5251
picklistName?: string

packages/components/src/internal/components/entities/actions.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -746,27 +746,18 @@ export function getDataOperationConfirmationData(
746746
);
747747
}
748748

749-
// TODO: I believe we can drop the dataRegionSelectionKey arg and make rowIds required.
750749
export function getCrossFolderSelectionResult(
751-
dataRegionSelectionKey: string,
752750
dataType: string, // 'samples' | 'exp.data' | 'assay',
753-
rowIds?: number[] | string[],
751+
rowIds: number[] | string[],
754752
picklistName?: string
755753
): Promise<CrossFolderSelectionResult> {
756-
if (!dataRegionSelectionKey && !rowIds?.length) {
757-
return Promise.resolve(undefined);
758-
}
754+
if (!rowIds?.length) return Promise.resolve(undefined);
759755

760756
return new Promise((resolve, reject) => {
761757
return Ajax.request({
762758
url: ActionURL.buildURL('experiment', 'getCrossFolderDataSelection.api'),
763759
method: 'POST',
764-
jsonData: {
765-
dataRegionSelectionKey,
766-
rowIds,
767-
dataType,
768-
picklistName,
769-
},
760+
jsonData: { rowIds, dataType, picklistName },
770761
success: Utils.getCallbackWrapper(response => {
771762
if (response.success) {
772763
resolve({

0 commit comments

Comments
 (0)