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.68.3",
"version": "6.68.4",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
5 changes: 5 additions & 0 deletions packages/components/releaseNotes/components.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages

### version 6.68.4
*Released*: 18 November 2025
- GitHub Issue 111: Query metadata editor indicates all fields as "New Field"
- use the field.lockExistingField property to determine if field is new or existing

### version 6.68.3
*Released*: 4 November 2025
- Issue 53983: Sort fields by caption
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const DomainFormToolbar: FC<DomainFormToolbarProps> = memo(props => {
(event: ChangeEvent<HTMLInputElement>) => onSearch(event.target.value),
[onSearch]
);

return (
<div className="row domain-field-toolbar">
<div className="col-xs-4">
Expand All @@ -151,15 +152,16 @@ const DomainFormToolbar: FC<DomainFormToolbarProps> = memo(props => {
onClick={onAddField}
/>
)}
<ActionButton
containerClass="container--toolbar-button"
buttonClass="domain-toolbar-delete-btn"
onClick={onBulkDeleteClick}
disabled={visibleSelection.size === 0}
>
<i className="fa fa-trash domain-toolbar-export-btn-icon" /> Delete
</ActionButton>

{!domainFormDisplayOptions?.hideAddFieldsButton && (
<ActionButton
containerClass="container--toolbar-button"
buttonClass="domain-toolbar-delete-btn"
onClick={onBulkDeleteClick}
disabled={visibleSelection.size === 0}
>
<i className="fa fa-trash domain-toolbar-export-btn-icon" /> Delete
</ActionButton>
)}
{shouldShowImportExport && (
<ActionButton
containerClass="container--toolbar-button"
Expand Down Expand Up @@ -1386,6 +1388,7 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
{showToolbar && (
<DomainFormToolbar
disableExport={disableExport}
domainFormDisplayOptions={domainFormDisplayOptions}
domainIndex={domainIndex}
fields={fields}
onAddField={this.onAddField}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,12 @@ describe('DomainField', () => {
);
});

test('getDetailsTextArray, queryMetadata editor', () => {
// Issue 54226
const field = DomainField.create({ propertyId: -1, name: 'test', lockExistingField: true });
expect(field.getDetailsArray().join('')).toBe('');
});

test('serialize, name trim', () => {
expect(DomainField.serialize(DomainField.create({})).name).toBe(undefined);
expect(DomainField.serialize(DomainField.create({ name: '' })).name).toBe('');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1407,7 +1407,8 @@ export class DomainField
const details = [];
let period = '';

if (this.isNew()) {
// Issue 54226: queryMetadata editor uses lockExistingField to mark existing fields
if (this.isNew() && !this.lockExistingField) {
details.push('New Field');
period = '. ';
} else if (this.updatedField) {
Expand Down