From 34dc9660079df0c8d62d94dd00690997d3d2a778 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 26 Aug 2025 19:23:33 -0700 Subject: [PATCH 1/3] 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 --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 5 +++++ packages/components/src/index.ts | 2 ++ .../components/src/internal/components/samples/constants.ts | 1 + packages/components/src/public/QueryColumn.ts | 1 - 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index d1e5af2dfb..eba430bfca 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.6", + "version": "6.58.7-fb-issue53773.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.6", + "version": "6.58.7-fb-issue53773.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 b4493de8f6..841814b88b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.6", + "version": "6.58.7-fb-issue53773.1", "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 eea89a45eb..860a064a66 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.X +*Released*: X 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.6 *Released*: 26 August 2025 - Merge from release25.7-SNAPSHOT to develop diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts index fb68a7a75e..c68cf08bd0 100644 --- a/packages/components/src/index.ts +++ b/packages/components/src/index.ts @@ -664,6 +664,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, @@ -1676,6 +1677,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..28f6a78d6b 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"]; // 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 ); From 3032e8941776768d5937a45b989f634800ec4c23 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 28 Aug 2025 11:03:17 -0700 Subject: [PATCH 2/3] include ExpirationDate in allowed sample columns --- .../components/src/internal/components/samples/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/internal/components/samples/constants.ts b/packages/components/src/internal/components/samples/constants.ts index 28f6a78d6b..82d84f7ced 100644 --- a/packages/components/src/internal/components/samples/constants.ts +++ b/packages/components/src/internal/components/samples/constants.ts @@ -203,7 +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"]; +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']; From c84327c48861ec054d8d75b39fc1746b55996fc5 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 28 Aug 2025 11:37:52 -0700 Subject: [PATCH 3/3] include ExpirationDate in allowed sample columns --- 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 eba430bfca..2db1532222 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.7-fb-issue53773.1", + "version": "6.58.7-fb-issue53773.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.7-fb-issue53773.1", + "version": "6.58.7-fb-issue53773.2", "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 841814b88b..e3aa10e868 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.7-fb-issue53773.1", + "version": "6.58.7-fb-issue53773.2", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [