Skip to content

Issue 53153: Disable value validation for expInput, aliquotParent columns #1824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-nicka merged 5 commits into from
Jul 3, 2025
Merged

Issue 53153: Disable value validation for expInput, aliquotParent columns #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0bc1505
Issue 53153: Disable value validation for expInput, aliquotParent col…
labkey-nicka Jun 27, 2025
04be2c5
6.53.1-fb-aa-53153.0
labkey-nicka Jul 2, 2025
5eab06d
Prepare release notes
labkey-nicka Jul 3, 2025
4e39246
lint
labkey-nicka Jul 3, 2025
67798ea
6.53.1
labkey-nicka Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/components/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "6.53.0",
"version": "6.53.1",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
4 changes: 4 additions & 0 deletions packages/components/releaseNotes/components.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/internal/components/forms/BulkAddUpdateForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { FC, useMemo } from 'react';
import { List, Map } from 'immutable';
import { List } from 'immutable';

import { Operation } from '../../../public/QueryColumn';

Expand All @@ -18,9 +18,9 @@ type BaseProps = Omit<
| 'hideButtons'
| 'includeCountField'
| 'initiallyDisableFields'
| 'queryInfo'
| 'showLabelAsterisk'
| 'title'
| 'queryInfo'
>;

interface BulkAddUpdateFormProps extends BaseProps {
Expand Down
57 changes: 29 additions & 28 deletions packages/components/src/internal/components/forms/QueryFormInputs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -282,6 +281,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..."
Expand All @@ -290,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}
/>
Expand All @@ -303,6 +304,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
<TextChoiceInput
addLabelAsterisk={showAsteriskSymbol}
allowDisable={allowFieldDisable}
description={col.description}
formsy
initiallyDisabled={shouldDisableField}
key={fieldKey}
Expand All @@ -311,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}
/>
);
Expand All @@ -320,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>
Expand Down
13 changes: 6 additions & 7 deletions packages/components/src/internal/components/forms/QueryInfoForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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 {
Expand All @@ -72,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;
Expand Down Expand Up @@ -347,9 +346,9 @@ export class QueryInfoForm extends PureComponent<QueryInfoFormProps, State> {
<CommentTextArea
actionName="Update"
containerClassName="inline-comment"
inline
onChange={this.onCommentChange}
requiresUserComment={requiresUserComment}
inline
/>
)}

Expand Down Expand Up @@ -434,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 />}
Expand Down
33 changes: 17 additions & 16 deletions packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...'}
Expand All @@ -358,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}
/>
);
}
Expand Down Expand Up @@ -425,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
Expand All @@ -434,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}
Expand All @@ -449,45 +450,45 @@ 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} />;
break;
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;
}
Expand Down