Skip to content

Commit 88e9a7e

Browse files
authored
Issue 53773: Field name contains internal spaces are silently ignored on import if column name doesn't contain matching spaces (#1847)
1 parent 41e157c commit 88e9a7e

6 files changed

Lines changed: 11 additions & 4 deletions

File tree

packages/components/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@labkey/components",
3-
"version": "6.58.7",
3+
"version": "6.58.8",
44
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
55
"sideEffects": false,
66
"files": [

packages/components/releaseNotes/components.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# @labkey/components
22
Components, models, actions, and utility functions for LabKey applications and pages
33

4+
### version 6.58.8
5+
*Released*: 29 August 2025
6+
- Issue 53773: Updating a field whose name contains a space via file will silently be ignored if the space is not included in the file
7+
- Stop aggressively infer column based on removed internal spaces
8+
49
### version 6.58.7
510
*Released*: 29 August 2025
611
- Update default audit level

packages/components/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,7 @@ import {
665665
SAMPLE_DATA_EXPORT_CONFIG,
666666
SAMPLE_ID_FIND_FIELD,
667667
SAMPLE_INSERT_EXTRA_COLUMNS,
668+
SAMPLE_IMPORT_EXTRA_ALLOWED_COLUMNS,
668669
SAMPLE_STATE_COLUMN_NAME,
669670
SAMPLE_STATE_TYPE_COLUMN_NAME,
670671
SAMPLE_STATUS_REQUIRED_COLUMNS,
@@ -1678,6 +1679,7 @@ export {
16781679
SAMPLE_ID_FIELD_KEY,
16791680
SAMPLE_ID_FIND_FIELD,
16801681
SAMPLE_INSERT_EXTRA_COLUMNS,
1682+
SAMPLE_IMPORT_EXTRA_ALLOWED_COLUMNS,
16811683
SAMPLE_STATE_COLUMN_NAME,
16821684
SAMPLE_STATE_TYPE_COLUMN_NAME,
16831685
SAMPLE_STATUS_REQUIRED_COLUMNS,

packages/components/src/internal/components/samples/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ export const SAMPLE_STORAGE_COLUMNS_WITH_SUBSELECT_EXPR = [
203203
];
204204

205205
export const SAMPLE_INSERT_EXTRA_COLUMNS = [...AMOUNT_AND_UNITS_COLUMNS, ...SAMPLE_STORAGE_COLUMNS, ALIQUOTED_FROM_COL];
206+
export const SAMPLE_IMPORT_EXTRA_ALLOWED_COLUMNS = [...SAMPLE_INSERT_EXTRA_COLUMNS, "SampleID", "EnteredStorage", "ExpirationDate"];
206207

207208
// those lookup values are at Home project level, no need to reload on target folder change
208209
export const SAMPLE_ALL_PROJECT_LOOKUP_FIELDS = ['SampleState', 'Units'];

packages/components/src/public/QueryColumn.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ export class QueryColumn implements IQueryColumn {
459459
const isLineageLookup = this.isAncestorInput() || this.isExpInput();
460460
return (
461461
(!isLineageLookup && this.caption?.toLowerCase() === lcName) ||
462-
(!isLineageLookup && this.caption?.replaceAll(' ', '').toLowerCase() === lcName) || // Issue 52193: allow for "SampleID" when caption is "Sample ID", but don't match for simply fewer spaces
463462
this.name?.toLowerCase() === lcName ||
464463
this.fieldKey?.toLowerCase() === lcName
465464
);

0 commit comments

Comments
 (0)