diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 208e60e1fc..1544dfb6ba 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.7", + "version": "6.58.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.7", + "version": "6.58.8", "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 b19c55b9cd..b58560ed0d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.7", + "version": "6.58.8", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index c0df6235dd..c215b665b3 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,6 +1,11 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages +### version 6.58.8 +*Released*: 29 August 2025 +- 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 + - Stop aggressively infer column based on removed internal spaces + ### version 6.58.7 *Released*: 29 August 2025 - Update default audit level diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts index 79fca6f872..9dcb8ed325 100644 --- a/packages/components/src/index.ts +++ b/packages/components/src/index.ts @@ -665,6 +665,7 @@ import { SAMPLE_DATA_EXPORT_CONFIG, SAMPLE_ID_FIND_FIELD, SAMPLE_INSERT_EXTRA_COLUMNS, + SAMPLE_IMPORT_EXTRA_ALLOWED_COLUMNS, SAMPLE_STATE_COLUMN_NAME, SAMPLE_STATE_TYPE_COLUMN_NAME, SAMPLE_STATUS_REQUIRED_COLUMNS, @@ -1678,6 +1679,7 @@ export { SAMPLE_ID_FIELD_KEY, SAMPLE_ID_FIND_FIELD, SAMPLE_INSERT_EXTRA_COLUMNS, + SAMPLE_IMPORT_EXTRA_ALLOWED_COLUMNS, SAMPLE_STATE_COLUMN_NAME, SAMPLE_STATE_TYPE_COLUMN_NAME, SAMPLE_STATUS_REQUIRED_COLUMNS, diff --git a/packages/components/src/internal/components/samples/constants.ts b/packages/components/src/internal/components/samples/constants.ts index e638699432..82d84f7ced 100644 --- a/packages/components/src/internal/components/samples/constants.ts +++ b/packages/components/src/internal/components/samples/constants.ts @@ -203,6 +203,7 @@ export const SAMPLE_STORAGE_COLUMNS_WITH_SUBSELECT_EXPR = [ ]; export const SAMPLE_INSERT_EXTRA_COLUMNS = [...AMOUNT_AND_UNITS_COLUMNS, ...SAMPLE_STORAGE_COLUMNS, ALIQUOTED_FROM_COL]; +export const SAMPLE_IMPORT_EXTRA_ALLOWED_COLUMNS = [...SAMPLE_INSERT_EXTRA_COLUMNS, "SampleID", "EnteredStorage", "ExpirationDate"]; // those lookup values are at Home project level, no need to reload on target folder change export const SAMPLE_ALL_PROJECT_LOOKUP_FIELDS = ['SampleState', 'Units']; diff --git a/packages/components/src/public/QueryColumn.ts b/packages/components/src/public/QueryColumn.ts index 5c1f80217d..f2e47a0b15 100644 --- a/packages/components/src/public/QueryColumn.ts +++ b/packages/components/src/public/QueryColumn.ts @@ -459,7 +459,6 @@ export class QueryColumn implements IQueryColumn { const isLineageLookup = this.isAncestorInput() || this.isExpInput(); return ( (!isLineageLookup && this.caption?.toLowerCase() === lcName) || - (!isLineageLookup && this.caption?.replaceAll(' ', '').toLowerCase() === lcName) || // Issue 52193: allow for "SampleID" when caption is "Sample ID", but don't match for simply fewer spaces this.name?.toLowerCase() === lcName || this.fieldKey?.toLowerCase() === lcName );