Fix Issue 53342 (#1820)

- Remove AssayResultsForSamplesButton, AssayResultsForSamplesMenuItem
  - moved to ui-premium
- Add createSnapshotSelectionKeyStr
- Remove getJobCreationHref
- Remove getSelectedSampleIdsFromSelectionKey
- Remove getURLParamsForSampleSelectionKey
- getLookupRowIdsFromSelection: Add optional keyColumn arg

Author: labkey-alan

packages/components/package-lock.json

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

packages/components/package.json

@@ -1,6 +1,17 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.53.0
+*Released*: 1 July 2025
+- Remove AssayResultsForSamplesButton, AssayResultsForSamplesMenuItem
+  - moved to ui-premium
+- Add createSnapshotSelectionKeyStr
+- Remove getJobCreationHref
+- Remove getSelectedSampleIdsFromSelectionKey
+- Remove getURLParamsForSampleSelectionKey
+- getLookupRowIdsFromSelection: Add optional keyColumn arg
+- Export getSamplesTestAPIWrapper
+
 ### version 6.52.5
 *Released*: 30 June 2025
 - Issue 53360: Pass user comment through after naming pattern warning

packages/components/releaseNotes/components.md

@@ -347,10 +347,6 @@ import {
 } from './internal/components/entities/models';
 import { EntityMoveModal } from './internal/components/entities/EntityMoveModal';
 import { EntityMoveConfirmationModal } from './internal/components/entities/EntityMoveConfirmationModal';
-import {
-    AssayResultsForSamplesButton,
-    AssayResultsForSamplesMenuItem,
-} from './internal/components/entities/AssayResultsForSamplesButton';
 import { SampleAliquotViewSelector } from './internal/components/entities/SampleAliquotViewSelector';
 import { GridAliquotViewSelector } from './internal/components/entities/GridAliquotViewSelector';
 import {
@@ -393,7 +389,6 @@ import {
     getLookupRowIdsFromSelection,
     getSampleSet,
     getSampleTypeDetails,
-    getSelectedSampleIdsFromSelectionKey,
     getSelectionLineageData,
     updateSampleStorageData,
 } from './internal/components/samples/actions';
@@ -416,7 +411,6 @@ import {
     getSampleStatusColor,
     getSampleStatusContainerFilter,
     getSampleStatusType,
-    getURLParamsForSampleSelectionKey,
     isAllSamplesSchema,
     isSampleOperationPermitted,
     isSamplesSchema,
@@ -535,7 +529,6 @@ import {
     getEntityDescription,
     getEntityNoun,
     getInitialParentChoices,
-    getJobCreationHref,
     getSampleIdCellKey,
     getUniqueIdColumnMetadata,
     isDataClassEntity,
@@ -560,6 +553,7 @@ import { Pagination } from './internal/components/pagination/Pagination';
 import {
     createOrderedSnapshotSelectionKey,
     createSnapshotSelectionKey,
+    createSnapshotSelectionKeyStr,
     getQueryModelExportParams,
     runDetailsColumnsForQueryModel,
 } from './public/QueryModel/utils';
@@ -906,6 +900,7 @@ import { ModalButtons } from './internal/ModalButtons';
 import { getSecurityTestAPIWrapper } from './internal/components/security/APIWrapper';
 import { getFolderTestAPIWrapper } from './internal/components/container/FolderAPIWrapper';
 import { getLabelsTestAPIWrapper } from './internal/components/labels/APIWrapper';
+import { getSamplesTestAPIWrapper } from './internal/components/samples/APIWrapper';
 import { OverlayTrigger, useOverlayTriggerState } from './internal/OverlayTrigger';
 import { Tooltip } from './internal/Tooltip';
 import { Popover } from './internal/Popover';
@@ -1169,8 +1164,6 @@ export {
     AssayPickerTabs,
     AssayProtocolModel,
     AssayResultDataType,
-    AssayResultsForSamplesButton,
-    AssayResultsForSamplesMenuItem,
     AssayRunDataType,
     AssayRunOperation,
     AssayStateModel,
@@ -1229,6 +1222,7 @@ export {
     createMockWithRouteLeave,
     createOrderedSnapshotSelectionKey,
     createSnapshotSelectionKey,
+    createSnapshotSelectionKeyStr,
     createWebDavDirectory,
     DATA_CLASS_DESIGNER_ROLE,
     DATA_IMPORT_FILE_SIZE_LIMITS,
@@ -1394,7 +1388,6 @@ export {
     getImmediateChildLineageFilterValue,
     getInactiveUsers,
     getInitialParentChoices,
-    getJobCreationHref,
     getJsonDateFormatString,
     getJsonDateTimeFormatString,
     getJsonFormatString,
@@ -1439,6 +1432,7 @@ export {
     getSampleStatusColor,
     getSampleStatusContainerFilter,
     getSampleStatusType,
+    getSamplesTestAPIWrapper,
     getSampleTypeDetails,
     getSampleTypesFromTransactionIds,
     getSchemaQuery,
@@ -1448,14 +1442,12 @@ export {
     getSelectedDataDeprecated,
     getSelectedPicklistSamples,
     getSelectedRows,
-    getSelectedSampleIdsFromSelectionKey,
     getSelectionLineageData,
     getSourceDomainDefaultSystemFields,
     getStoredAmountDisplay,
     getTestAPIWrapper,
     getTimelineEntityUrl,
     getUniqueIdColumnMetadata,
-    getURLParamsForSampleSelectionKey,
     getUserProperties,
     getUserRoleDisplay,
     getUsersWithPermissions,

packages/components/src/index.ts

@@ -603,6 +603,10 @@ export interface SelectionResponse {
     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,
@@ -612,14 +616,12 @@ export async function getSelection(
     if (selectionKey) {
         let { keys, schemaQuery } = SchemaQuery.parseSelectionKey(selectionKey);
 
-        if (keys !== undefined) {
+        if (keys !== undefined && keys !== '') {
             return { resolved: true, schemaQuery, selected: keys.split(';') };
         }
 
-        if (!schemaQuery) {
-            if (schemaName && queryName) {
-                schemaQuery = new SchemaQuery(schemaName, queryName);
-            }
+        if (!schemaQuery && schemaName && queryName) {
+            schemaQuery = new SchemaQuery(schemaName, queryName);
         }
 
         if (!schemaQuery) {

packages/components/src/internal/actions.ts

@@ -1,5 +1,4 @@
 import { List, Map } from 'immutable';
-import { Filter } from '@labkey/api';
 
 import {
     TEST_LKS_STARTER_MODULE_CONTEXT,
@@ -12,8 +11,6 @@ import { SchemaQuery } from '../../../public/SchemaQuery';
 
 import { QueryInfo } from '../../../public/QueryInfo';
 
-import { makeTestQueryModel } from '../../../public/QueryModel/testUtils';
-
 import { ViewInfo } from '../../ViewInfo';
 
 import { CellMessage, EditorModel, ValueDescriptor } from '../editable/models';
@@ -28,7 +25,6 @@ import {
     getEntityNoun,
     getIdentifyingColumns,
     getInitialParentChoices,
-    getJobCreationHref,
     getSampleIdCellKey,
     parseEntityParentKey,
     sampleDeleteDependencyText,
@@ -275,60 +271,6 @@ describe('sampleDeleteDependencyText', () => {
     });
 });
 
-describe('getJobCreationHref', () => {
-    const schemaQuery = new SchemaQuery('s', 'q');
-    const queryInfo = new QueryInfo({ pkCols: ['pk'], schemaQuery });
-    const modelId = 'id';
-    const queryModel = makeTestQueryModel(schemaQuery, queryInfo, undefined, undefined, undefined, modelId);
-
-    test('singleSelect', () => {
-        expect(getJobCreationHref(queryModel).toString()).toContain('selectionKey=id');
-        const queryModelWithKeyValue = queryModel.mutate({ keyValue: 'key' });
-        expect(getJobCreationHref(queryModelWithKeyValue).toString()).toContain('selectionKey=appkey%7Cs%2Fq%7Ckey');
-    });
-    test('filters', () => {
-        expect(getJobCreationHref(queryModel, undefined, true).toString()).toBe('/workflow/new?selectionKey=id');
-
-        const queryModelWithFilters = queryModel.mutate({ filterArray: [Filter.create('TEST COL', 'TEST VALUE')] });
-        expect(getJobCreationHref(queryModelWithFilters, undefined, true).toString()).toBe(
-            '/workflow/new?selectionKey=id&query.TEST%20COL~eq=TEST%20VALUE'
-        );
-    });
-    test('with filters but ignoreFilter', () => {
-        expect(getJobCreationHref(queryModel, undefined, true).toString()).toBe('/workflow/new?selectionKey=id');
-
-        const queryModelWithFilters = queryModel.mutate({ filterArray: [Filter.create('TEST COL', 'TEST VALUE')] });
-        expect(
-            getJobCreationHref(queryModelWithFilters, undefined, true, undefined, false, null, true).toString()
-        ).toBe('/workflow/new?selectionKey=id&selectionKeyType=snapshot');
-    });
-    test('templateId', () => {
-        expect(getJobCreationHref(queryModel).toString()).not.toContain('templateId');
-        expect(getJobCreationHref(queryModel, 1).toString()).toContain('templateId=1');
-        expect(getJobCreationHref(queryModel, '1').toString()).toContain('templateId=1');
-    });
-    test('samplesIncluded', () => {
-        expect(getJobCreationHref(queryModel).toString()).toBe('/workflow/new?selectionKey=id&sampleTab=search');
-        expect(getJobCreationHref(queryModel, undefined, true).toString()).toBe('/workflow/new?selectionKey=id');
-    });
-    test('picklistName', () => {
-        expect(getJobCreationHref(queryModel).toString()).not.toContain('picklistName');
-        expect(getJobCreationHref(queryModel, undefined, false, 'name').toString()).toContain('picklistName=name');
-    });
-    test('isAssay', () => {
-        expect(getJobCreationHref(queryModel).toString()).not.toContain('isAssay');
-        expect(getJobCreationHref(queryModel, undefined, true, undefined, true).toString()).toBe(
-            '/workflow/new?selectionKey=id'
-        );
-        expect(getJobCreationHref(queryModel, undefined, true, undefined, false, 'sampleFieldKey').toString()).toBe(
-            '/workflow/new?selectionKey=id'
-        );
-        expect(getJobCreationHref(queryModel, undefined, true, undefined, true, 'sampleFieldKey').toString()).toBe(
-            '/workflow/new?selectionKey=id&assayProtocol=s&isAssay=true&sampleFieldKey=sampleFieldKey'
-        );
-    });
-});
-
 describe('getIdentifyingColumns', () => {
     const columns = [
         { fieldKey: 'intCol', jsonType: 'int', name: 'intCol' },