Skip to content

Commit 34af55a

Browse files
committed
getLookupRowIdsFromSelection: Add optional keyColumn arg
1 parent b7ff10c commit 34af55a

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

packages/components/releaseNotes/components.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Components, models, actions, and utility functions for LabKey applications and p
99
- Remove getJobCreationHref
1010
- Remove getSelectedSampleIdsFromSelectionKey
1111
- Remove getURLParamsForSampleSelectionKey
12+
- getLookupRowIdsFromSelection: Add optional keyColumn arg
1213

1314
### version 6.52.4
1415
*Released*: 30 June 2025

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,22 +471,29 @@ export async function getDefaultDiscardStatus(containerPath?: string): Promise<n
471471
* @param queryName of selected rows
472472
* @param selected rowIds to pull sampleIds for
473473
* @param fieldKey field key for the Lookup
474+
* @param keyColumn the pkCol
474475
*/
475476
export async function getLookupRowIdsFromSelection(
476477
schemaName: string,
477478
queryName: string,
478479
selected: any[],
479-
fieldKey: string
480+
fieldKey: string,
481+
keyColumn = 'RowId'
480482
): Promise<number[]> {
481483
const sampleIds = new Set<number>();
482484

483485
if (fieldKey) {
484486
const rowIdFieldKey = `${fieldKey}/RowId`; // Pull the rowId of the lookup
487+
const columns = [keyColumn, rowIdFieldKey].join(',');
485488
const { data, dataIds } = await getSelectedDataDeprecated(
486489
schemaName,
487490
queryName,
488491
selected,
489-
'RowId,' + rowIdFieldKey
492+
columns,
493+
undefined,
494+
undefined,
495+
undefined,
496+
keyColumn
490497
); // Include the RowId column to prevent warnings
491498
if (data) {
492499
const rows = data.toJS();

0 commit comments

Comments
 (0)