From 0bc15050cb9419f05fcae19c5ca64b6557736eb5 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 27 Jun 2025 16:05:27 -0700
Subject: [PATCH 1/5] Issue 53153: Disable value validation for expInput,
 aliquotParent columns

---
 .../src/internal/components/forms/BulkAddUpdateForm.tsx       | 4 ++--
 .../src/internal/components/forms/QueryFormInputs.tsx         | 1 +
 .../src/internal/components/forms/QueryInfoForm.tsx           | 3 +--
 .../src/internal/components/forms/detail/DetailDisplay.tsx    | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/internal/components/forms/BulkAddUpdateForm.tsx b/packages/components/src/internal/components/forms/BulkAddUpdateForm.tsx
index bb19edca5e..168204848c 100644
--- a/packages/components/src/internal/components/forms/BulkAddUpdateForm.tsx
+++ b/packages/components/src/internal/components/forms/BulkAddUpdateForm.tsx
@@ -1,5 +1,5 @@
 import React, { FC, useMemo } from 'react';
-import { List, Map } from 'immutable';
+import { List } from 'immutable';
 
 import { Operation } from '../../../public/QueryColumn';
 
@@ -18,9 +18,9 @@ type BaseProps = Omit<
     | 'hideButtons'
     | 'includeCountField'
     | 'initiallyDisableFields'
+    | 'queryInfo'
     | 'showLabelAsterisk'
     | 'title'
-    | 'queryInfo'
 >;
 
 interface BulkAddUpdateFormProps extends BaseProps {
diff --git a/packages/components/src/internal/components/forms/QueryFormInputs.tsx b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
index bd1c158a1b..60c1113c70 100644
--- a/packages/components/src/internal/components/forms/QueryFormInputs.tsx
+++ b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
@@ -282,6 +282,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                         maxRows={10}
                                         multiple={multiple}
                                         name={fieldKey}
+                                        notFoundValuesEnabled={!(col.isExpInput() || col.isAliquotParent())} // Issue 53153
                                         onQSChange={this.onSelectChange}
                                         onToggleDisable={this.onToggleDisable}
                                         placeholder="Select or type to search..."
diff --git a/packages/components/src/internal/components/forms/QueryInfoForm.tsx b/packages/components/src/internal/components/forms/QueryInfoForm.tsx
index 03af0bb615..f93353f8ed 100644
--- a/packages/components/src/internal/components/forms/QueryInfoForm.tsx
+++ b/packages/components/src/internal/components/forms/QueryInfoForm.tsx
@@ -27,7 +27,6 @@ import { FormButtons } from '../../FormButtons';
 
 import { EntityCreationTypeModel } from '../samples/models';
 import { QueryInfo } from '../../../public/QueryInfo';
-import { formatDate, formatDateTime, formatTime } from '../../util/Date';
 import { Alert } from '../base/Alert';
 import { LoadingSpinner } from '../base/LoadingSpinner';
 
@@ -56,7 +55,7 @@ export const getUpdatedFields = (
     for (const key in data) {
         if (data.hasOwnProperty(key)) {
             if (fieldsToUpdate.has(key.toLowerCase()) || (additionalFields && additionalFields?.indexOf(key) !== -1)) {
-                const col = queryInfo?.getColumn(key);
+                const col = queryInfo.getColumn(key);
                 if (col?.jsonType === 'string' && typeof data[key] === 'string') {
                     filteredData = filteredData.set(key, data[key]?.trim());
                 } else {
diff --git a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
index bb397b9c57..db114eacdc 100644
--- a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
@@ -341,6 +341,7 @@ export function resolveDetailEditRenderer(
                         maxRows={10}
                         multiple={multiple}
                         name={col.fieldKey}
+                        notFoundValuesEnabled={!(col.isExpInput() || col.isAliquotParent())} // Issue 53153
                         onBlur={options?.onBlur}
                         onQSChange={options?.onSelectChange}
                         placeholder={options?.placeholder ?? 'Select or type to search...'}

From 04be2c53fe1545210788fc60f2fe7a2fea2f1c80 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 2 Jul 2025 14:22:10 -0700
Subject: [PATCH 2/5] 6.53.1-fb-aa-53153.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index f53f279e7e..2f783ed7de 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.0",
+  "version": "6.53.1-fb-aa-53153.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.53.0",
+      "version": "6.53.1-fb-aa-53153.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 32e7a0ef85..c143ace882 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.0",
+  "version": "6.53.1-fb-aa-53153.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 5eab06d33900b297599732cdbe9c260734995cdd Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 3 Jul 2025 09:23:36 -0700
Subject: [PATCH 3/5] Prepare release notes

---
 packages/components/releaseNotes/components.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 79f643d78a..b3400b15be 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,10 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.53.1
+*Released*: 3 July 2025
+- Issue 53153: Disable value validation for expInput, aliquotParent columns
+
 ### version 6.53.0
 *Released*: 1 July 2025
 - Remove AssayResultsForSamplesButton, AssayResultsForSamplesMenuItem

From 4e392465becb3382fb5c8147c81c65e2996cb1d2 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 3 Jul 2025 09:24:50 -0700
Subject: [PATCH 4/5] lint

---
 .../components/forms/QueryFormInputs.tsx      | 56 +++++++++----------
 .../components/forms/QueryInfoForm.tsx        | 10 ++--
 .../components/forms/detail/DetailDisplay.tsx | 32 +++++------
 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/packages/components/src/internal/components/forms/QueryFormInputs.tsx b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
index 60c1113c70..bef8859b08 100644
--- a/packages/components/src/internal/components/forms/QueryFormInputs.tsx
+++ b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
@@ -270,7 +270,6 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                             getContainerFilterForLookups()
                                         }
                                         containerPath={col.lookup.containerPath ?? containerPath}
-                                        toggleDisabledTooltip={toggleDisabledTooltip}
                                         description={col.description}
                                         displayColumn={col.lookup.displayColumn}
                                         fireQSChangeOnInit={fireQSChangeOnInit}
@@ -291,6 +290,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                         required={col.required}
                                         schemaQuery={col.lookup.schemaQuery}
                                         showLabel
+                                        toggleDisabledTooltip={toggleDisabledTooltip}
                                         value={value}
                                         valueColumn={col.lookup.keyColumn}
                                     />
@@ -304,6 +304,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                             <TextChoiceInput
                                 addLabelAsterisk={showAsteriskSymbol}
                                 allowDisable={allowFieldDisable}
+                                description={col.description}
                                 formsy
                                 initiallyDisabled={shouldDisableField}
                                 key={fieldKey}
@@ -312,7 +313,6 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                 placeholder="Select or type to search..."
                                 queryColumn={col}
                                 renderFieldLabel={renderFieldLabel}
-                                description={col.description}
                                 value={value}
                             />
                         );
@@ -321,80 +321,80 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                     if (col.inputType === 'textarea') {
                         return (
                             <TextAreaInput
-                                key={fieldKey}
-                                queryColumn={col}
-                                value={value}
+                                addLabelAsterisk={showAsteriskSymbol}
                                 allowDisable={allowFieldDisable}
                                 initiallyDisabled={shouldDisableField}
+                                key={fieldKey}
                                 onToggleDisable={this.onToggleDisable}
-                                addLabelAsterisk={showAsteriskSymbol}
+                                queryColumn={col}
                                 renderFieldLabel={renderFieldLabel}
+                                value={value}
                             />
                         );
                     } else if (col.inputType === 'file' && renderFileInputs) {
                         return (
                             <FileInput
+                                addLabelAsterisk={showAsteriskSymbol}
+                                allowDisable={allowFieldDisable}
                                 formsy
-                                key={fieldKey}
-                                queryColumn={col}
+                                initiallyDisabled={shouldDisableField}
                                 initialValue={value}
+                                key={fieldKey}
                                 name={fieldKey}
-                                allowDisable={allowFieldDisable}
-                                initiallyDisabled={shouldDisableField}
                                 onToggleDisable={this.onToggleDisable}
-                                addLabelAsterisk={showAsteriskSymbol}
+                                queryColumn={col}
                                 renderFieldLabel={renderFieldLabel}
                                 showLabel
                             />
                         );
                     }
                     switch (col.jsonType) {
-                        case 'date':
-                        case 'time':
+                        case 'boolean':
                             return (
-                                <DatePickerInput
-                                    key={fieldKey}
-                                    queryColumn={col}
-                                    value={value}
+                                <CheckboxInput
+                                    addLabelAsterisk={showAsteriskSymbol}
                                     allowDisable={allowFieldDisable}
                                     initiallyDisabled={shouldDisableField}
+                                    key={fieldKey}
                                     onToggleDisable={this.onToggleDisable}
-                                    addLabelAsterisk={showAsteriskSymbol}
+                                    queryColumn={col}
                                     renderFieldLabel={renderFieldLabel}
+                                    value={value}
                                 />
                             );
-                        case 'boolean':
+                        case 'date':
+                        case 'time':
                             return (
-                                <CheckboxInput
-                                    key={fieldKey}
-                                    queryColumn={col}
-                                    value={value}
+                                <DatePickerInput
+                                    addLabelAsterisk={showAsteriskSymbol}
                                     allowDisable={allowFieldDisable}
                                     initiallyDisabled={shouldDisableField}
+                                    key={fieldKey}
                                     onToggleDisable={this.onToggleDisable}
-                                    addLabelAsterisk={showAsteriskSymbol}
+                                    queryColumn={col}
                                     renderFieldLabel={renderFieldLabel}
+                                    value={value}
                                 />
                             );
                         default:
                             return (
                                 <React.Fragment key={fieldKey}>
                                     <TextInput
-                                        queryColumn={col}
-                                        value={value ? String(value) : value}
+                                        addLabelAsterisk={showAsteriskSymbol}
                                         allowDisable={allowFieldDisable}
                                         initiallyDisabled={shouldDisableField}
                                         onToggleDisable={this.onToggleDisable}
-                                        addLabelAsterisk={showAsteriskSymbol}
+                                        queryColumn={col}
                                         renderFieldLabel={renderFieldLabel}
+                                        value={value ? String(value) : value}
                                     />
                                     {internalSpacesWarningFieldKeys?.indexOf(fieldKey.toLowerCase()) > -1 && (
                                         <div className="row shift-margin-to-bottom">
                                             <div className="col-sm-3 col-xs-12" />
                                             <div className="col-sm-9 col-xs-12 text-danger">
                                                 <InternalSpacesWarning
-                                                    value={value}
                                                     fieldName={col.caption?.toLowerCase() ?? col.name.toLowerCase()}
+                                                    value={value}
                                                 />
                                             </div>
                                         </div>
diff --git a/packages/components/src/internal/components/forms/QueryInfoForm.tsx b/packages/components/src/internal/components/forms/QueryInfoForm.tsx
index f93353f8ed..6be87e342e 100644
--- a/packages/components/src/internal/components/forms/QueryInfoForm.tsx
+++ b/packages/components/src/internal/components/forms/QueryInfoForm.tsx
@@ -71,8 +71,8 @@ export const getUpdatedFields = (
 export interface QueryInfoFormProps extends Omit<QueryFormInputsProps, 'onFieldsEnabledChange'> {
     api?: ComponentsAPIWrapper;
     asModal?: boolean;
-    canSubmitNotDirty?: boolean;
     cancelText?: string;
+    canSubmitNotDirty?: boolean;
     countText?: string;
     creationTypeOptions?: EntityCreationTypeModel[];
     disabled?: boolean;
@@ -346,9 +346,9 @@ export class QueryInfoForm extends PureComponent<QueryInfoFormProps, State> {
                     <CommentTextArea
                         actionName="Update"
                         containerClassName="inline-comment"
+                        inline
                         onChange={this.onCommentChange}
                         requiresUserComment={requiresUserComment}
-                        inline
                     />
                 )}
 
@@ -433,17 +433,17 @@ export class QueryInfoForm extends PureComponent<QueryInfoFormProps, State> {
                     {!showErrorsAtBottom && this.renderError()}
                     <Formsy
                         className="form-horizontal"
-                        onValidSubmit={this.handleValidSubmit}
-                        onValid={this.enableSubmitButton}
                         onChange={this.handleChange}
                         onInvalid={this.disableSubmitButton}
+                        onValid={this.enableSubmitButton}
+                        onValidSubmit={this.handleValidSubmit}
                         ref={this.formRef}
                     >
                         <QueryInfoQuantity
+                            countText={countText}
                             creationTypeOptions={creationTypeOptions}
                             includeCountField={includeCountField}
                             maxCount={maxCount}
-                            countText={countText}
                             onCountChange={this.onCountChange}
                         />
                         {(header || showQuantityHeader) && <hr />}
diff --git a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
index db114eacdc..d8039fb481 100644
--- a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
@@ -359,15 +359,15 @@ export function resolveDetailEditRenderer(
         if (col.validValues) {
             return (
                 <TextChoiceInput
+                    autoFocus={options?.autoFocus}
                     formsy
                     inputClass={DETAIL_INPUT_WRAPPER_CLASS_NAME}
-                    queryColumn={col}
-                    value={value}
-                    autoFocus={options?.autoFocus}
                     onBlur={options?.onBlur}
                     onChange={options?.onSelectChange}
                     placeholder={options?.placeholder ?? 'Select or type to search...'}
+                    queryColumn={col}
                     showLabel={showLabel}
+                    value={value}
                 />
             );
         }
@@ -426,6 +426,7 @@ export function resolveDetailEditRenderer(
                 return (
                     <TextInput
                         elementWrapperClassName={DETAIL_INPUT_WRAPPER_CLASS_NAME}
+                        includeSpacesWarning={options.includeSpacesWarning}
                         isUpdate={true}
                         queryColumn={col}
                         // Issue 43561: Support name expression fields
@@ -435,7 +436,6 @@ export function resolveDetailEditRenderer(
                         // required if the nameExpression is not defined to force the form to require a value.
                         required={col.required || col.nameExpression !== undefined}
                         showLabel={showLabel}
-                        includeSpacesWarning={options.includeSpacesWarning}
                         validatePristine
                         validationError={validationError}
                         value={value}
@@ -450,20 +450,17 @@ export function resolveDetailRenderer(column: QueryColumn): Renderer {
 
     if (column?.detailRenderer) {
         switch (column.detailRenderer.toLowerCase()) {
-            case 'multivaluedetailrenderer':
-                renderer = d => <MultiValueRenderer data={d} />;
-                break;
             case 'aliasrenderer':
                 renderer = d => <AliasRenderer data={d} view="detail" />;
                 break;
             case 'appendunits':
-                renderer = d => <AppendUnits data={d} col={column} />;
+                renderer = d => <AppendUnits col={column} data={d} />;
                 break;
             case 'assayrunreference':
                 renderer = d => <AssayRunReferenceRenderer data={d} />;
                 break;
-            case 'labelcolorrenderer':
-                renderer = d => <LabelColorRenderer data={d} />;
+            case 'expirationdatecolumnrenderer':
+                renderer = d => <ExpirationDateColumnRenderer col={column} data={d} tableCell={false} />;
                 break;
             case 'filecolumnrenderer':
                 renderer = d => <FileColumnRenderer data={d} isFileLink={column.rangeURI === FILELINK_RANGE_URI} />;
@@ -471,24 +468,27 @@ export function resolveDetailRenderer(column: QueryColumn): Renderer {
             case 'foldercolumnrenderer':
                 renderer = d => <FolderColumnRenderer data={d} />;
                 break;
+            case 'labelcolorrenderer':
+                renderer = d => <LabelColorRenderer data={d} />;
+                break;
+            case 'multivaluedetailrenderer':
+                renderer = d => <MultiValueRenderer data={d} />;
+                break;
             case 'nolinkrenderer':
                 renderer = d => <NoLinkRenderer data={d} />;
                 break;
+            case 'samplestatusrenderer':
+                renderer = (d, r) => <SampleStatusRenderer row={r} />;
+                break;
             case 'sampletypeimportaliasrenderer':
                 renderer = d => <SampleTypeImportAliasRenderer data={d} />;
                 break;
             case 'sourcetypeimportaliasrenderer':
                 renderer = d => <SourceTypeImportAliasRenderer data={d} />;
                 break;
-            case 'samplestatusrenderer':
-                renderer = (d, r) => <SampleStatusRenderer row={r} />;
-                break;
             case 'userdetailsrenderer':
                 renderer = d => <UserDetailsRenderer data={d} />;
                 break;
-            case 'expirationdatecolumnrenderer':
-                renderer = d => <ExpirationDateColumnRenderer data={d} col={column} tableCell={false} />;
-                break;
             default:
                 break;
         }

From 67798ea7dd9144d4bc8841072c6e75c0d315b082 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 3 Jul 2025 09:25:37 -0700
Subject: [PATCH 5/5] 6.53.1

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 2f783ed7de..ffb1076379 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.1-fb-aa-53153.0",
+  "version": "6.53.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.53.1-fb-aa-53153.0",
+      "version": "6.53.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index c143ace882..8127bf64b1 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.1-fb-aa-53153.0",
+  "version": "6.53.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [