Fix various issues with selections (#1841)

- QueryModel.getSelectedIds: optimize when filterIds are not passed
- EntityMoveModal: Don't use selectionKey, simplify props
- Refactor PicklistEditModal, ChoosePicklistModal
  - Don't rely on selectionKey
  - Don't rely on QueryModel
- Add usePicklistSelections to get rid of duplicate selection loading logic
- Update AddToPicklistMenuItem, PicklistCreationMenuItem
- BulkUpdateForm
  - Remove props: header, onSubmitForEdit, sortString
  - Rename props: pluralNoun, singularNoun -> nounPlural, nounSingular
  - Add props: aliquots, sampleOperation, editStatusData
  - Render errors
- QueryAPIWrapper: remove getSelection
- EntityServerAPIWrapper.getCrossFolderSelectionResult: remove useSnapshotSelection argument

Author: labkey-alan

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.60.1",
+  "version": "6.61.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -1,6 +1,23 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.61.0
+*Released*: 8 September 2025
+- QueryModel.getSelectedIds: optimize when filterIds are not passed
+- EntityMoveModal: Don't use selectionKey, simplify props, improve error messaging
+- Refactor PicklistEditModal, ChoosePicklistModal
+  - Don't rely on selectionKey
+  - Don't rely on QueryModel
+- Add usePicklistSelections to get rid of duplicate selection loading logic
+- Update AddToPicklistMenuItem, PicklistCreationMenuItem
+- BulkUpdateForm
+  - Remove props: header, onSubmitForEdit, sortString
+  - Rename props: pluralNoun, singularNoun -> nounPlural, nounSingular
+  - Add props: aliquots, sampleOperation, editStatusData
+  - Render errors
+- QueryAPIWrapper: remove getSelection
+- EntityServerAPIWrapper.getCrossFolderSelectionResult: remove useSnapshotSelection argument
+
 ### version 6.60.1
 *Released*: 3 September 2025
 - Issue 53742: Sample Manager: Unable to perform actions from various pages on sample type with a '/'

packages/components/releaseNotes/components.md

@@ -1841,7 +1841,7 @@ export {
     wrapDraggable,
 };
 
-export type { ClearSelectedOptions, ReplaceSelectedOptions, SelectionResponse } from './internal/actions';
+export type { ClearSelectedOptions, ReplaceSelectedOptions } from './internal/actions';
 export type { ThreadBlockProps } from './internal/announcements/ThreadBlock';
 export type { ThreadEditorProps } from './internal/announcements/ThreadEditor';
 export type { ComponentsAPIWrapper } from './internal/APIWrapper';
@@ -1985,7 +1985,7 @@ export type { QueryParamValue } from './internal/url/AppURL';
 export type { AppRouteResolver } from './internal/url/models';
 export type { URLMapper } from './internal/url/URLResolver';
 export type { NavigateFn } from './internal/url/useAppNavigate';
-export type { Loader } from './internal/useLoadableState';
+export type { LoadableState, Loader } from './internal/useLoadableState';
 export type { ContainerFormats, DateTimeSettingProp } from './internal/util/Date';
 export type { MeasurementUnit } from './internal/util/measurement';
 export type { UseRequestHandler } from './internal/util/RequestHandler';

packages/components/src/index.ts

@@ -37,7 +37,6 @@ import {
     VIEW_NOT_FOUND_EXCEPTION_CLASS,
 } from './constants';
 import { DataViewInfo } from './DataViewInfo';
-import { getQueryParams } from './util/URL';
 
 import { handleRequestFailure } from './request';
 import { resolveErrorMessage } from './util/messaging';
@@ -597,49 +596,6 @@ export function getSnapshotSelections(key: string, containerPath?: string): Prom
     });
 }
 
-export interface SelectionResponse {
-    resolved: boolean;
-    schemaQuery?: SchemaQuery;
-    selected: any[];
-}
-
-// TODO: this method is only used by AssayImportPanels, and is needed in order to correctly get the filters needed when
-//  fetching the selected samples. We should remove this method when we address Issue 53378. AssayImportDropdownSection,
-//  and getImportItemsForAssayDefinitions, should be updated to create a snapshot selection key against exp.materials
-//  before navigating to the assay import page, similar to what we do when creating workflow jobs.
-export async function getSelection(
-    searchParams: URLSearchParams,
-    schemaName?: string,
-    queryName?: string
-): Promise<SelectionResponse> {
-    const selectionKey = searchParams.get('selectionKey');
-    if (selectionKey) {
-        let { keys, schemaQuery } = SchemaQuery.parseSelectionKey(selectionKey);
-
-        if (keys !== undefined && keys !== '') {
-            return { resolved: true, schemaQuery, selected: keys.split(';') };
-        }
-
-        if (!schemaQuery && schemaName && queryName) {
-            schemaQuery = new SchemaQuery(schemaName, queryName);
-        }
-
-        if (!schemaQuery) {
-            throw new Error(
-                `No schema found for selection with selectionKey ${selectionKey} schemaName ${schemaName} queryName ${queryName}`
-            );
-        }
-
-        const params = getQueryParams(searchParams);
-        const filters = Filter.getFiltersFromParameters(params);
-        const response = await getSelected(selectionKey, false, schemaQuery, filters);
-
-        return { resolved: true, schemaQuery, selected: response.selected };
-    }
-
-    return { resolved: false, selected: [] };
-}
-
 export function fetchCharts(schemaQuery: SchemaQuery, containerPath?: string): Promise<DataViewInfo[]> {
     return new Promise((resolve, reject) => {
         Ajax.request({

packages/components/src/internal/actions.ts

@@ -46,9 +46,7 @@ import {
 
 export interface EntityAPIWrapper {
     getCrossFolderSelectionResult: (
-        dataRegionSelectionKey: string,
         dataType: string, // 'samples' | 'exp.data' | 'assay',
-        useSnapshotSelection?: boolean,
         rowIds?: string[] | number[],
         picklistName?: string
     ) => Promise<CrossFolderSelectionResult>;

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

@@ -131,23 +131,23 @@ export const EntityMoveConfirmationModal: FC<EntityMoveConfirmationModalProps> =
 
     if (isLoading(loading)) {
         return (
-            <Modal title={confirmModalProps.title} onCancel={confirmModalProps.onCancel}>
+            <Modal onCancel={confirmModalProps.onCancel} title={confirmModalProps.title}>
                 <LoadingSpinner msg="Loading target folders..." />
             </Modal>
         );
     }
 
     if (error) {
         return (
-            <Modal title={confirmModalProps.title} onCancel={confirmModalProps.onCancel} cancelText="Dismiss">
+            <Modal cancelText="Dismiss" onCancel={confirmModalProps.onCancel} title={confirmModalProps.title}>
                 <Alert>{error}</Alert>
             </Modal>
         );
     }
 
     if (containerOptions?.length === 0) {
         return (
-            <Modal title={confirmModalProps.title} onCancel={confirmModalProps.onCancel} cancelText="Dismiss">
+            <Modal cancelText="Dismiss" onCancel={confirmModalProps.onCancel} title={confirmModalProps.title}>
                 You do not have permission to move {nounPlural} to any of the available folders.
             </Modal>
         );
@@ -156,8 +156,8 @@ export const EntityMoveConfirmationModal: FC<EntityMoveConfirmationModalProps> =
     return (
         <Modal
             {...confirmModalProps}
-            onConfirm={onConfirmCallback}
             canConfirm={!!selectedContainerOption && (!requiresUserComment || hasValidUserComment)}
+            onConfirm={onConfirmCallback}
         >
             {children}
             <div className="top-padding">