Merge branch 'develop' into fb_trendlineProvidedParams

Author: cnathe

packages/components/package-lock.json

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

packages/components/package.json

@@ -8,6 +8,20 @@ Components, models, actions, and utility functions for LabKey applications and p
   - Include new 5 Parameter nonlinear curve fit option in trendline select
   - Use column metadata displayWidth in app grid column render calcWidths
 
+###  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
+
+###  version 6.70.6
+*Released*: 18 November 2025
+- Issue 52560: Need sample-type specific error for incorrect units during multi-sample-type creation
+    - Build the correct lookupFilters for units validation for `insertPastedData`
+
 ###  version 6.70.5
 *Released*: 13 November 2025
 - Issue 54186: App actions for picklists and assay run delete don't get TransactionAuditEvent
@@ -45,6 +59,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

@@ -301,7 +301,7 @@ export class AssayDefinitionModel extends ImmutableRecord({
         sampleIds?: number[] | string[]
     ): Promise<QueryInfo> {
         const sampleResultColumnData = this.getSampleColInResults();
-        if (sampleResultColumnData) {
+        if (sampleResultColumnData && sampleResultColumnData.isSampleLookup() /*skip plate well column*/) {
             if (sampleResultColumnData.isSingleSampleTypeLookup())
                 return api.query.getQueryDetails(sampleResultColumnData.lookup.schemaQuery);
             else if (sampleIds?.length > 0) {

packages/components/src/internal/AssayDefinitionModel.ts

@@ -243,7 +243,7 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
     showDefaultValues = () => {
         const { field, showDefaultValueSettings } = this.props;
 
-        // GitHub Issue #783: we don't yet support default values in the App
+        // GitHub Issue #298: we don't yet support default values in the App
         if (isApp()) return false;
 
         // some domains just don't support default values

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

@@ -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('');
@@ -1458,7 +1464,7 @@ describe('resolveBaseProperties', () => {
         expect(field.rangeURI).toBe(SAMPLE_TYPE.rangeURI);
         expect(field.required).toBe(true);
 
-        // GitHub Issue 787
+        // GitHub Issue #656
         field = DomainField.resolveBaseProperties({ name: 'SampleId', required: false });
         expect(field.dataType).toBe(SAMPLE_TYPE);
         expect(field.conceptURI).toBe(SAMPLE_TYPE.conceptURI);

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

@@ -1181,7 +1181,7 @@ export class DomainField
                 field.dataType = SAMPLE_TYPE;
                 field.conceptURI = SAMPLE_TYPE.conceptURI;
                 field.rangeURI = SAMPLE_TYPE.rangeURI;
-                field.required = !!(raw.required ?? true); // GitHub Issue 787
+                field.required = !!(raw.required ?? true); // GitHub Issue #656
             }
         }
 
@@ -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) {

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

@@ -1153,11 +1153,19 @@ async function getParsedLookup(
     if (!lookupValueCache.hasOwnProperty(cacheKey)) {
         const columnMetadata = editorModel.getColumnMetadata(column.fieldKey);
 
+        const lookupFilters = getLookupFilters(
+            column,
+            columnMetadata?.filteredLookupKeys?.toArray(),
+            columnMetadata?.filteredLookupValues?.toArray(),
+            columnMetadata?.lookupValueFilters,
+            forUpdate
+        );
+
         lookupValueCache[cacheKey] = findLookupValues({
             column,
             containerPath,
             forUpdate,
-            lookupValueFilters: columnMetadata?.lookupValueFilters,
+            lookupValueFilters: lookupFilters,
             lookupValues: display,
         });
     }

packages/components/src/internal/components/editable/actions.ts

@@ -1327,8 +1327,8 @@ export function getSingleSampleTypeQueryInfo(sampleIds: number[] | string[]): Pr
         })
             .then(result => {
                 const sampleTypes = result.values;
-                if (sampleTypes.length > 1) {
-                    resolve(null); // multiple sample types found
+                if (sampleTypes.length !== 1) {
+                    resolve(null);
                     return;
                 }
                 const sampleTypeSQ = new SchemaQuery(SCHEMAS.SAMPLE_SETS.SCHEMA, sampleTypes[0]);