From fe06f98bc3ef1c959ec1fa9d96f91b47697a5ea5 Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 7 Oct 2025 14:07:51 -0500 Subject: [PATCH 1/5] Filter.actionValueFromFilter fix to move decode columnName out of getDisplayValue() --- packages/components/releaseNotes/components.md | 4 ++++ .../public/QueryModel/grid/actions/Filter.test.ts | 15 ++++++++++++++- .../src/public/QueryModel/grid/actions/Filter.ts | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index e1cc4d49b6..a35d05993a 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 +- Filter.actionValueFromFilter fix to move decode columnName out of getDisplayValue() + ### version 6.62.9 *Released*: 7 October 2025 - Issue 53934: Remove stored amount "too precise" validation check on setting amount modal diff --git a/packages/components/src/public/QueryModel/grid/actions/Filter.test.ts b/packages/components/src/public/QueryModel/grid/actions/Filter.test.ts index 825a93c28f..3172249a41 100644 --- a/packages/components/src/public/QueryModel/grid/actions/Filter.test.ts +++ b/packages/components/src/public/QueryModel/grid/actions/Filter.test.ts @@ -37,7 +37,7 @@ describe('FilterAction::actionValueFromFilter', () => { const filter = Filter.create('U mg$SL', '10', Filter.Types.EQUAL); const value: ActionValue = action.actionValueFromFilter(filter); expect(value.displayValue).toBe('U mg/L = 10'); - expect(value.value).toBe('"U mg$SL" = 10'); + expect(value.value).toBe('"U mg/L" = 10'); }); test('with label from QueryColumn', () => { @@ -80,4 +80,17 @@ describe('FilterAction::actionValueFromFilter', () => { const value: ActionValue = action.actionValueFromFilter(filter, col); expect(value.displayValue).toBe('TimeCol = 01:02:00'); }); + + test('decodePart label vs column name', () => { + const col = new QueryColumn({ shortCaption: '$Bool Field./,$&' }); + const filter = Filter.create('$DBoolField$P$S$C$D$A', true, Filter.Types.EQUAL); + + let value: ActionValue = action.actionValueFromFilter(filter, col); + expect(value.displayValue).toBe('$Bool Field./,$& = true'); + expect(value.value).toBe('"$Bool Field./,$&" = true'); + + value = action.actionValueFromFilter(filter); + expect(value.displayValue).toBe('$BoolField./,$& = true'); + expect(value.value).toBe('"$BoolField./,$&" = true'); + }); }); diff --git a/packages/components/src/public/QueryModel/grid/actions/Filter.ts b/packages/components/src/public/QueryModel/grid/actions/Filter.ts index 54207b7ddc..470d253bed 100644 --- a/packages/components/src/public/QueryModel/grid/actions/Filter.ts +++ b/packages/components/src/public/QueryModel/grid/actions/Filter.ts @@ -161,7 +161,7 @@ export class FilterAction implements Action { rawValue: string | string[] ): { displayValue: string; inputValue: string } { let value: string, inputValue: string; - const displayParts = [decodePart(columnName), resolveSymbol(filterType)]; + const displayParts = [columnName, resolveSymbol(filterType)]; const inputDisplayParts = [`"${displayParts[0]}"`, displayParts[1]]; // need to quote column name for input display if (!filterType.isDataValueRequired()) { @@ -210,7 +210,7 @@ export class FilterAction implements Action { actionValueFromFilter(filter: Filter.IFilter, column?: QueryColumn, isReadOnly?: string): ActionValue { const label = column?.shortCaption; - const columnName = filter.getColumnName(); + const columnName = decodePart(filter.getColumnName()); const filterType = filter.getFilterType(); const operator = resolveSymbol(filter.getFilterType()); let value = filter.getValue(); From 58b913edcd99df0891f12e0e923a94280a8706f8 Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 7 Oct 2025 14:19:51 -0500 Subject: [PATCH 2/5] 6.63.0-gridPanelTestFilterPill.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 a7b47b15fb..7d23fbb6b7 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.63.0", + "version": "6.63.0-gridPanelTestFilterPill.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.63.0", + "version": "6.63.0-gridPanelTestFilterPill.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 673847c65e..6f87225429 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.63.0", + "version": "6.63.0-gridPanelTestFilterPill.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 0452e2cb45a473e75210eb63881bb805ebf0a682 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 8 Oct 2025 08:58:45 -0500 Subject: [PATCH 3/5] 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 d9c6b33617..45a82714fe 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 +### version 6.63.1 +*Released*: 8 October 2025 - Filter.actionValueFromFilter fix to move decode columnName out of getDisplayValue() ### version 6.63.0 From 77c48a0cf76f92f5f0bcfa6dc7e410726bb32088 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 8 Oct 2025 08:59:02 -0500 Subject: [PATCH 4/5] npm run lint-branch-fix --- .../components/src/public/QueryModel/grid/actions/Filter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/public/QueryModel/grid/actions/Filter.ts b/packages/components/src/public/QueryModel/grid/actions/Filter.ts index 470d253bed..2dfcca1c10 100644 --- a/packages/components/src/public/QueryModel/grid/actions/Filter.ts +++ b/packages/components/src/public/QueryModel/grid/actions/Filter.ts @@ -160,7 +160,7 @@ export class FilterAction implements Action { filterType: Filter.IFilterType, rawValue: string | string[] ): { displayValue: string; inputValue: string } { - let value: string, inputValue: string; + let inputValue: string, value: string; const displayParts = [columnName, resolveSymbol(filterType)]; const inputDisplayParts = [`"${displayParts[0]}"`, displayParts[1]]; // need to quote column name for input display From d39c3d842cce132b29bd2d56ab231ca978aa3800 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 8 Oct 2025 08:59:40 -0500 Subject: [PATCH 5/5] 6.63.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 7d23fbb6b7..9113f8a900 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.63.0-gridPanelTestFilterPill.0", + "version": "6.63.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.63.0-gridPanelTestFilterPill.0", + "version": "6.63.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 6f87225429..fed787725a 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.63.0-gridPanelTestFilterPill.0", + "version": "6.63.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [