Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/components/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "6.63.0",
"version": "6.63.1",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
4 changes: 4 additions & 0 deletions packages/components/releaseNotes/components.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages

### version 6.63.1
*Released*: 8 October 2025
- Filter.actionValueFromFilter fix to move decode columnName out of getDisplayValue()

### version 6.63.0
*Released*: 7 October 2025
- Issue 53934: Remove stored amount "too precise" validation check on setting amount modal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down Expand Up @@ -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');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ export class FilterAction implements Action {
filterType: Filter.IFilterType,
rawValue: string | string[]
): { displayValue: string; inputValue: string } {
let value: string, inputValue: string;
const displayParts = [decodePart(columnName), resolveSymbol(filterType)];
let inputValue: string, value: string;
const displayParts = [columnName, resolveSymbol(filterType)];
const inputDisplayParts = [`"${displayParts[0]}"`, displayParts[1]]; // need to quote column name for input display

if (!filterType.isDataValueRequired()) {
Expand Down Expand Up @@ -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();
Expand Down