Skip to content

Merge changes from release25.11-SNAPSHOT through v6.68.3 #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cnathe merged 4 commits into from
Nov 5, 2025
Merged

Merge changes from release25.11-SNAPSHOT through v6.68.3 #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
594f805
Curve Fit Statistic Access (#1878)
labkey-alan Nov 3, 2025
af919d5
Issue 53983: Sort fields by caption (#1884)
labkey-nicka Nov 4, 2025
c291968
Update release notes with version number and release date
cnathe Nov 5, 2025
f57e554
6.69.0
cnathe Nov 5, 2025
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
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "6.68.1",
"version": "6.69.0",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
15 changes: 15 additions & 0 deletions packages/components/releaseNotes/components.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages

### version 6.69.0
*Released*: 5 November 2025
- Merge from release25.11-SNAPSHOT to develop
- includes changes from 6.68.2 #1878
- includes changes from 6.68.3 #1884

### version 6.68.3
*Released*: 4 November 2025
- Issue 53983: Sort fields by caption
- Issue 53927: Adjust column view layout to wrap

### version 6.68.2
*Released*: 3 November 2025
- SVGChart: render curve fit statistics when available

### version 6.68.1
*Released* 2 November 2025
- Issue 52063: Domain designer to handle lookup to a query with a pipe character
Expand Down
137 changes: 122 additions & 15 deletions packages/components/src/internal/components/ColumnSelectionModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import { wrapDraggable } from '../test/testHelpers';

import {
ColumnChoice,
ColumnChoiceProps,
ColumnChoiceGroup,
ColumnChoiceGroupProps,
ColumnChoiceProps,
ColumnInView,
ColumnInViewProps,
ColumnSelectionModal,
Expand Down Expand Up @@ -52,7 +52,7 @@ describe('ColumnSelectionModal', () => {

test('isInView', () => {
render(<ColumnChoice {...defaultProps()} isInView />);
expect(document.querySelector('.field-caption').textContent).toBe('Test Column');
expect(document.querySelector('.field-caption')).toHaveTextContent('Test Column');
expect(document.querySelectorAll('.fa-check')).toHaveLength(1);
expect(document.querySelectorAll('.fa-plus')).toHaveLength(0);
expect(document.querySelectorAll('.field-expand-icon')).toHaveLength(1);
Expand All @@ -62,7 +62,7 @@ describe('ColumnSelectionModal', () => {

test('not isInView', () => {
render(<ColumnChoice {...defaultProps()} isInView={false} />);
expect(document.querySelector('.field-caption').textContent).toBe('Test Column');
expect(document.querySelector('.field-caption')).toHaveTextContent('Test Column');
expect(document.querySelectorAll('.fa-check')).toHaveLength(0);
expect(document.querySelectorAll('.fa-plus')).toHaveLength(1);
expect(document.querySelectorAll('.field-expand-icon')).toHaveLength(1);
Expand All @@ -72,7 +72,7 @@ describe('ColumnSelectionModal', () => {

test('lookup, collapsed', () => {
render(<ColumnChoice {...defaultProps()} column={QUERY_COL_LOOKUP} isInView={false} />);
expect(document.querySelector('.field-caption').textContent).toBe('Test Column');
expect(document.querySelector('.field-caption')).toHaveTextContent('Test Column');
expect(document.querySelectorAll('.fa-check')).toHaveLength(0);
expect(document.querySelectorAll('.fa-plus')).toHaveLength(1);
expect(document.querySelectorAll('.field-expand-icon')).toHaveLength(3);
Expand All @@ -82,7 +82,7 @@ describe('ColumnSelectionModal', () => {

test('lookup, expanded', () => {
render(<ColumnChoice {...defaultProps()} column={QUERY_COL_LOOKUP} isExpanded isInView={false} />);
expect(document.querySelector('.field-caption').textContent).toBe('Test Column');
expect(document.querySelector('.field-caption')).toHaveTextContent('Test Column');
expect(document.querySelectorAll('.fa-check')).toHaveLength(0);
expect(document.querySelectorAll('.fa-plus')).toHaveLength(1);
expect(document.querySelectorAll('.field-expand-icon')).toHaveLength(3);
Expand Down Expand Up @@ -116,7 +116,7 @@ describe('ColumnSelectionModal', () => {
}

function validate(column: QueryColumn, deleteDisabled: boolean): void {
expect(document.querySelector('.field-caption span').textContent).toBe(column.caption);
expect(document.querySelector('.field-caption span')).toHaveTextContent(column.caption);
const removeIcon = document.querySelector('.fa-times');
if (deleteDisabled) {
expect(removeIcon).toBeFalsy();
Expand Down Expand Up @@ -184,7 +184,7 @@ describe('ColumnSelectionModal', () => {
describe('FieldLabelDisplay', () => {
test('not lookup', () => {
render(<FieldLabelDisplay column={QUERY_COL} includeFieldKey />);
expect(document.querySelector('.field-caption span').textContent).toBe(QUERY_COL.caption);
expect(document.querySelector('.field-caption span')).toHaveTextContent(QUERY_COL.caption);
expect(document.querySelectorAll('.overlay-trigger')).toHaveLength(1);
expect(document.querySelectorAll('input')).toHaveLength(0);
});
Expand Down Expand Up @@ -266,8 +266,8 @@ describe('ColumnSelectionModal', () => {
<ColumnChoiceGroup
{...defaultProps()}
column={QUERY_COL_LOOKUP}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: new QueryInfo({}) }}
columnsInView={[QUERY_COL_LOOKUP]}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: new QueryInfo({}) }}
/>
);
validate(true, true);
Expand All @@ -279,8 +279,8 @@ describe('ColumnSelectionModal', () => {
<ColumnChoiceGroup
{...defaultProps()}
column={QUERY_COL_LOOKUP}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
columnsInView={[QUERY_COL_LOOKUP]}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
/>
);
validate(true, true, true);
Expand All @@ -292,8 +292,8 @@ describe('ColumnSelectionModal', () => {
<ColumnChoiceGroup
{...defaultProps()}
column={QUERY_COL_LOOKUP}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
columnsInView={[QUERY_COL_LOOKUP, QUERY_COL]}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
/>
);
validate(true, true, true);
Expand Down Expand Up @@ -321,8 +321,8 @@ describe('ColumnSelectionModal', () => {
<ColumnChoiceGroup
{...defaultProps()}
column={QUERY_COL_LOOKUP}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
columnsInView={[QUERY_COL_LOOKUP, colHidden]}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
showAllColumns
/>
);
Expand All @@ -336,9 +336,9 @@ describe('ColumnSelectionModal', () => {
<ColumnChoiceGroup
{...defaultProps()}
column={QUERY_COL_LOOKUP}
columnsInView={[QUERY_COL_LOOKUP]}
expandedColumnFilter={jest.fn().mockImplementation(c => !c.removeFromViews)}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
columnsInView={[QUERY_COL_LOOKUP]}
/>
);
validate(true, true);
Expand Down Expand Up @@ -376,15 +376,67 @@ describe('ColumnSelectionModal', () => {
<ColumnChoiceGroup
{...defaultProps()}
column={QUERY_COL_LOOKUP}
columnsInView={[QUERY_COL_LOOKUP]}
expandedColumnFilter={jest.fn().mockImplementation(c => !c.isJunctionLookup())}
expandedColumns={{ [QUERY_COL_LOOKUP.index]: queryInfo }}
columnsInView={[QUERY_COL_LOOKUP]}
showAllColumns
/>
);
validate(true, true, true);
expect(document.querySelectorAll('.list-group-item')).toHaveLength(2);
});

// Issue 53983
test('Expanded lookup child fields are sorted by caption', () => {
const parent = new QueryColumn({
caption: 'Parent',
name: 'parent',
fieldKey: 'parent',
fieldKeyArray: ['parent'],
fieldKeyPath: 'parent',
selectable: true,
lookup: new QueryLookup({}),
});
const childZ = new QueryColumn({
caption: 'zeta',
name: 'z',
fieldKey: 'z',
fieldKeyArray: ['z'],
fieldKeyPath: 'parent/z',
selectable: true,
});
const childA = new QueryColumn({
caption: 'Alpha',
name: 'a',
fieldKey: 'a',
fieldKeyArray: ['a'],
fieldKeyPath: 'parent/a',
selectable: true,
});

const expandedInfo = new QueryInfo({
columns: new ExtendedMap({
[childZ.fieldKey]: childZ,
[childA.fieldKey]: childA,
}),
});

render(
<ColumnChoiceGroup
{...defaultProps()}
column={parent}
expandedColumns={{ [parent.index]: expandedInfo }}
showAllColumns
/>
);

// Expect list to contain parent followed by children sorted by caption: Alpha, zeta
const items = Array.from(document.querySelectorAll('.list-group-item .field-caption')).map(el =>
el.textContent.trim()
);

expect(items).toEqual(['Parent', 'Alpha', 'zeta']);
});
});

describe('ColumnSelectionModal', () => {
Expand All @@ -404,8 +456,8 @@ describe('ColumnSelectionModal', () => {
expect(titles).toHaveLength(2);

expect(document.querySelectorAll('.list-group-item')).toHaveLength(2);
expect(titles[0].textContent).toContain('Available Fields');
expect(titles[1].textContent).toContain('Selected Fields');
expect(titles[0]).toHaveTextContent('Available Fields');
expect(titles[1]).toHaveTextContent('Selected Fields');
expect(document.querySelector('.field-modal__footer')).toBeFalsy();
});

Expand All @@ -432,5 +484,60 @@ describe('ColumnSelectionModal', () => {
// verify useEffect initialization of selectedIndex, selectedColumns
expect(document.querySelectorAll('.list-group-item.active')).toHaveLength(1);
});

// Issue 53983
test('Available Fields list is sorted by caption', () => {
const colB = new QueryColumn({
caption: 'b Beta',
name: 'b',
fieldKey: 'b',
fieldKeyArray: ['b'],
fieldKeyPath: 'b',
selectable: true,
});
const colA = new QueryColumn({
caption: 'A Alpha',
name: 'a',
fieldKey: 'a',
fieldKeyArray: ['a'],
fieldKeyPath: 'a',
selectable: true,
});
const col10 = new QueryColumn({
caption: 'Item 10',
name: 'item10',
fieldKey: 'item10',
fieldKeyArray: ['item10'],
fieldKeyPath: 'item10',
selectable: true,
});
const col2 = new QueryColumn({
caption: 'Item 2',
name: 'item2',
fieldKey: 'item2',
fieldKeyArray: ['item2'],
fieldKeyPath: 'item2',
selectable: true,
});

const queryInfo = new QueryInfo({
columns: new ExtendedMap({
[colB.fieldKey]: colB,
[colA.fieldKey]: colA,
[col10.fieldKey]: col10,
[col2.fieldKey]: col2,
}),
});

render(<ColumnSelectionModal {...defaultProps()} queryInfo={queryInfo} />);

// Available Fields (left column)
const availableFields = document.querySelector('.field-modal__col-content');
const captions = [...availableFields.querySelectorAll('.list-group-item .field-caption')].map(
el => el.textContent?.trim() ?? ''
);

expect(captions).toEqual(['A Alpha', 'b Beta', 'Item 2', 'Item 10']);
});
});
});
Loading