Issue 53328: AssayDefinitionModel.hasLookup to only consider the first sample lookup column for assay import cases (#1859)

### version 6.62.8
*Released*: 3 October 2025
- Issue 53328: AssayDefinitionModel.hasLookup to only consider the first sample lookup column for assay import cases

Author: cnathe

packages/components/package-lock.json

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

packages/components/package.json

@@ -1,6 +1,10 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.62.8
+*Released*: 3 October 2025
+- Issue 53328: AssayDefinitionModel.hasLookup to only consider the first sample lookup column for assay import cases
+
 ### version 6.62.7
 *Released*: 29 September 2025
 - Enumerate plate, plate set auditing events

packages/components/releaseNotes/components.md

@@ -37,11 +37,27 @@ describe('AssayDefinitionModel', () => {
         expect(sampleColumn.column.fieldKey).toBe('SampleID');
     });
 
-    test('hasLookup()', () => {
+    test('hasLookup() with sample lookup', () => {
         const modelWithSampleId = AssayDefinitionModel.create(assayDefJSON);
         expect(modelWithSampleId.hasLookup(new SchemaQuery('samples', 'Samples'))).toBeTruthy();
+        expect(modelWithSampleId.hasLookup(new SchemaQuery('samples', 'Samples'), true)).toBeTruthy();
+        expect(modelWithSampleId.hasLookup(new SchemaQuery('samples', 'Samples'), false, true)).toBeTruthy();
         expect(modelWithSampleId.hasLookup(new SchemaQuery('study', 'Study'))).toBeTruthy();
+        expect(modelWithSampleId.hasLookup(new SchemaQuery('study', 'Study'), true)).toBeTruthy();
+        expect(modelWithSampleId.hasLookup(new SchemaQuery('study', 'Study'), false, true)).toBeFalsy();
         expect(modelWithSampleId.hasLookup(new SchemaQuery('study', 'Other'))).toBeFalsy();
+        expect(modelWithSampleId.hasLookup(new SchemaQuery('study', 'Other'), true)).toBeFalsy();
+        expect(modelWithSampleId.hasLookup(new SchemaQuery('study', 'Other'), false, true)).toBeFalsy();
+    });
+
+    test('hasLookup() without sample lookup', () => {
+        const modelWithout = AssayDefinitionModel.create(assayDefNoSampleIdJSON);
+        expect(modelWithout.hasLookup(new SchemaQuery('samples', 'Samples'))).toBeFalsy();
+        expect(modelWithout.hasLookup(new SchemaQuery('samples', 'Samples'), true)).toBeFalsy();
+        expect(modelWithout.hasLookup(new SchemaQuery('samples', 'Samples'), false, true)).toBeFalsy();
+        expect(modelWithout.hasLookup(new SchemaQuery('study', 'Study'))).toBeTruthy();
+        expect(modelWithout.hasLookup(new SchemaQuery('study', 'Study'), true)).toBeTruthy();
+        expect(modelWithout.hasLookup(new SchemaQuery('study', 'Study'), false, true)).toBeFalsy();
     });
 
     test('getSampleColumnFieldKeys()', () => {

packages/components/src/internal/AssayDefinitionModel.test.ts

@@ -1,4 +1,4 @@
-import { fromJS, List, Map, Record as ImmutableRecord } from 'immutable';
+import { fromJS, Record as ImmutableRecord, List, Map } from 'immutable';
 import { Filter } from '@labkey/api';
 
 import { ExtendedMap } from '../public/ExtendedMap';
@@ -14,6 +14,7 @@ import { AppURL } from './url/AppURL';
 import { SCHEMAS } from './schemas';
 import { ASSAYS_KEY } from './app/constants';
 import { ComponentsAPIWrapper } from './APIWrapper';
+import { isAllSamplesSchema } from './components/samples/utils';
 
 export enum AssayDomainTypes {
     BATCH = 'Batch',
@@ -125,7 +126,7 @@ export class AssayDefinitionModel extends ImmutableRecord({
         selectionKey?: string,
         filters?: Filter.IFilter[],
         containerPath?: string,
-        params?: Record<string, string | number | boolean>
+        params?: Record<string, boolean | number | string>
     ): string {
         let url: string;
         // Note, will need to handle the re-import run case separately. Possibly introduce another URL via links
@@ -162,7 +163,7 @@ export class AssayDefinitionModel extends ImmutableRecord({
         return AppURL.create(ASSAYS_KEY, this.type, this.name, 'runs');
     }
 
-    hasLookup(targetSQ: SchemaQuery, isPicklist?: boolean): boolean {
+    hasLookup(targetSQ: SchemaQuery, isPicklist?: boolean, forImport = false): boolean {
         const isSampleSet = targetSQ.hasSchema(SCHEMAS.SAMPLE_SETS.SCHEMA);
 
         // 44339: the SourceSamples custom query is backed by exp.materials
@@ -173,13 +174,12 @@ export class AssayDefinitionModel extends ImmutableRecord({
         const findLookup = (col: QueryColumn): boolean => {
             if (col.isLookup()) {
                 const lookupSQ = col.lookup.schemaQuery;
-                const isMatch =
-                    targetSQ.isEqual(lookupSQ) ||
-                    (isTargetAllSamples && SCHEMAS.EXP_TABLES.MATERIALS.isEqual(lookupSQ));
+                const isAllSamplesLookup = isAllSamplesSchema(lookupSQ);
+                const isMatch = targetSQ.isEqual(lookupSQ) || (isTargetAllSamples && isAllSamplesLookup);
 
                 // 35881: If targetSQ is a Sample Set then allow targeting exp.materials table as well
                 if (isSampleSet) {
-                    return isMatch || SCHEMAS.EXP_TABLES.MATERIALS.isEqual(lookupSQ);
+                    return isMatch || isAllSamplesLookup;
                 }
 
                 return isMatch;
@@ -188,6 +188,12 @@ export class AssayDefinitionModel extends ImmutableRecord({
             return false;
         };
 
+        // Issue 53328: only consider the first sample lookup column here since it will be used on the assay import page
+        if (forImport) {
+            const sampleLookupCol = this.getSampleColumn();
+            return sampleLookupCol ? findLookup(sampleLookupCol.column) : false;
+        }
+
         // Traditional for loop so we can short circuit.
         for (const k of Object.keys(AssayDomainTypes)) {
             const domainType = AssayDomainTypes[k];