Merge changes from release25.11-SNAPSHOT through v6.68.4 (#1898)

###  version 6.70.8
*Released*: 19 November 2025
- Merge from release25.11-SNAPSHOT to develop
    - includes changes from 6.68.4 #1892

Author: cnathe

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.70.7",
+  "version": "6.70.8",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -1,6 +1,11 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+###  version 6.70.8
+*Released*: 19 November 2025
+- Merge from release25.11-SNAPSHOT to develop
+    - includes changes from 6.68.4 #1892
+
 ###  version 6.70.7
 *Released*: 18 November 2025
 - Exclude plate well column lookup for identifying fields determination
@@ -47,6 +52,11 @@ Components, models, actions, and utility functions for LabKey applications and p
   - includes changes from 6.68.2 #1878
   - includes changes from 6.68.3 #1884
 
+###  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

packages/components/releaseNotes/components.md

@@ -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">
@@ -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"
@@ -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}

packages/components/src/internal/components/domainproperties/DomainForm.tsx

@@ -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('');

packages/components/src/internal/components/domainproperties/models.test.ts

@@ -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) {