From c667b7aba2b8498df81fb7b5214027a4f1a067da Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 24 Nov 2025 13:42:06 -0600 Subject: [PATCH 1/6] GridColumn to only apply displayWidth to multiLine columns --- packages/components/releaseNotes/components.md | 4 ++++ packages/components/src/internal/components/base/Grid.tsx | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 7dd5a3188d..43fb74098a 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 TBD +*Released*: TBD November 2025 +- GridColumn to only apply displayWidth to multiLine columns (see changes from v6.71.0) + ### version 6.72.0 *Released*: 20 November 2025 - Default to detailed audit behavior diff --git a/packages/components/src/internal/components/base/Grid.tsx b/packages/components/src/internal/components/base/Grid.tsx index cf14dcaa22..c0b0893bb3 100644 --- a/packages/components/src/internal/components/base/Grid.tsx +++ b/packages/components/src/internal/components/base/Grid.tsx @@ -37,6 +37,9 @@ function processColumns(columns: List): List { }); } + // only apply the displayWidth, if avaialble, to multiLine text columns + const _displayWidth = c.rangeURI?.endsWith('multiLine') ? c.displayWidth : undefined; + return new GridColumn({ align: c.align, cell: c.cell, @@ -48,7 +51,7 @@ function processColumns(columns: List): List { raw: c, tableCell: c.tableCell, title: c.title || c.caption, - width: c.width || c.displayWidth, + width: c.width || _displayWidth, }); }) .toList(); From 6749c4427ede1ebe42711bec124126fa85b92627 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 24 Nov 2025 13:42:35 -0600 Subject: [PATCH 2/6] 6.72.0-displayWidthMultiLine.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 fb53dd702d..db28d95f0c 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.72.0", + "version": "6.72.0-displayWidthMultiLine.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.72.0", + "version": "6.72.0-displayWidthMultiLine.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 3f49f2ee15..a052de0c03 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.72.0", + "version": "6.72.0-displayWidthMultiLine.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From ac8af8046c4321ea493eca789c2298bb5bea1f88 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 24 Nov 2025 16:26:18 -0600 Subject: [PATCH 3/6] move displayWidth multiLine column check to QueryColumn constructor --- packages/components/releaseNotes/components.md | 2 +- packages/components/src/internal/components/base/Grid.tsx | 5 +---- packages/components/src/public/IQueryColumn.ts | 1 + packages/components/src/public/QueryColumn.ts | 5 +++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 43fb74098a..9833dfaafe 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -3,7 +3,7 @@ Components, models, actions, and utility functions for LabKey applications and p ### version TBD *Released*: TBD November 2025 -- GridColumn to only apply displayWidth to multiLine columns (see changes from v6.71.0) +- QueryColumn to only apply displayWidth for multiLine columns ### version 6.72.0 *Released*: 20 November 2025 diff --git a/packages/components/src/internal/components/base/Grid.tsx b/packages/components/src/internal/components/base/Grid.tsx index c0b0893bb3..2b970c9176 100644 --- a/packages/components/src/internal/components/base/Grid.tsx +++ b/packages/components/src/internal/components/base/Grid.tsx @@ -37,9 +37,6 @@ function processColumns(columns: List): List { }); } - // only apply the displayWidth, if avaialble, to multiLine text columns - const _displayWidth = c.rangeURI?.endsWith('multiLine') ? c.displayWidth : undefined; - return new GridColumn({ align: c.align, cell: c.cell, @@ -51,7 +48,7 @@ function processColumns(columns: List): List { raw: c, tableCell: c.tableCell, title: c.title || c.caption, - width: c.width || _displayWidth, + width: c.width, }); }) .toList(); diff --git a/packages/components/src/public/IQueryColumn.ts b/packages/components/src/public/IQueryColumn.ts index 826af56686..3ba29f8966 100644 --- a/packages/components/src/public/IQueryColumn.ts +++ b/packages/components/src/public/IQueryColumn.ts @@ -18,6 +18,7 @@ export interface IQueryColumn { displayField?: string; displayFieldJsonType?: string; displayFieldSqlType?: string; + displayWidth: number | string; // excludeFromShifting: boolean; // ext: any; facetingBehaviorType: string; diff --git a/packages/components/src/public/QueryColumn.ts b/packages/components/src/public/QueryColumn.ts index fc77622bef..f0a11b930c 100644 --- a/packages/components/src/public/QueryColumn.ts +++ b/packages/components/src/public/QueryColumn.ts @@ -205,6 +205,11 @@ export class QueryColumn implements IQueryColumn { if (rawColumn && rawColumn.lookup !== undefined) { Object.assign(this, { lookup: new QueryLookup(rawColumn.lookup) }); } + + // only apply the displayWidth, if available, to multiLine text columns for now + if (rawColumn?.displayWidth && this.width === undefined && this.rangeURI?.endsWith('multiLine')) { + Object.assign(this, { width: rawColumn.displayWidth }); + } } static ANCESTORS_PREFIX = 'Ancestors'; From c04c0606dbc608db37ea1436c08db5a07e279521 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 24 Nov 2025 16:27:02 -0600 Subject: [PATCH 4/6] 6.72.0-displayWidthMultiLine.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 db28d95f0c..02c4cfd371 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.72.0-displayWidthMultiLine.0", + "version": "6.72.0-displayWidthMultiLine.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.72.0-displayWidthMultiLine.0", + "version": "6.72.0-displayWidthMultiLine.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 a052de0c03..29f72b0b22 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.72.0-displayWidthMultiLine.0", + "version": "6.72.0-displayWidthMultiLine.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 603ba9fed620080fec23687d60f53004c903c341 Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 25 Nov 2025 11:01:17 -0600 Subject: [PATCH 5/6] Update release notes with version number and release date --- packages/components/releaseNotes/components.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 9833dfaafe..f66a935313 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,8 +1,8 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages -### version TBD -*Released*: TBD November 2025 +### version 6.72.1 +*Released*: 25 November 2025 - QueryColumn to only apply displayWidth for multiLine columns ### version 6.72.0 From 85cf839df8d00a34fdcff813fa3e503b4a69a187 Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 25 Nov 2025 11:01:33 -0600 Subject: [PATCH 6/6] 6.72.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 02c4cfd371..abd1d95bd3 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.72.0-displayWidthMultiLine.1", + "version": "6.72.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.72.0-displayWidthMultiLine.1", + "version": "6.72.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 29f72b0b22..d8a9257bee 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.72.0-displayWidthMultiLine.1", + "version": "6.72.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [