From 506890cf2ca961bd5ebde37c637e4e6d88022ca9 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 22 Jul 2025 11:31:04 -0500
Subject: [PATCH 01/17] GitHub Issue 783: Hide domain designer field Advanced
 Settings that are not currently implemented in app

---
 packages/components/releaseNotes/components.md             | 4 ++++
 .../components/domainproperties/AdvancedSettings.tsx       | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index f37d519b16..2dc1450f3a 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,10 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version TBD
+*Released*: TBD
+- GitHub Issue 783: Hide domain designer field Advanced Settings that are not currently implemented in app
+
 ### version 6.56.2
 *Released*: 21 July 2025
 - Issue 53451: JS error when deleting numeric filter values with Between operator
diff --git a/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx b/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
index 6de4dd032f..1b70b278f2 100644
--- a/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
+++ b/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
@@ -3,7 +3,7 @@ import { List } from 'immutable';
 import { ActionURL } from '@labkey/api';
 
 import { Modal } from '../../Modal';
-import { getSubmitButtonClass } from '../../app/utils';
+import { getSubmitButtonClass, isApp } from '../../app/utils';
 
 import {
     ADVANCED_FIELD_EDITOR_TOPIC,
@@ -243,6 +243,9 @@ 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
+        if (isApp()) return false;
+
         // some domains just don't support default values
         if (!showDefaultValueSettings) return false;
 
@@ -479,7 +482,7 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                         </div>
                     </LabelHelpTip>
                 </CheckboxLK>
-                {PropDescType.isMvEnableable(field.dataType.rangeURI) && !field.isCalculatedField() && (
+                {PropDescType.isMvEnableable(field.dataType.rangeURI) && !field.isCalculatedField() && !isApp() && (
                     <CheckboxLK
                         checked={mvEnabled}
                         onChange={this.handleCheckbox}

From 04399b194ac78fe98ecc45867838a23e817886c2 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 22 Jul 2025 11:33:03 -0500
Subject: [PATCH 02/17] GitHub Issue 788: Domain Designer better handling of
 invalid lookup query value for Sample data type

---
 .../components/releaseNotes/components.md     |  1 +
 .../domainproperties/SampleFieldOptions.tsx   | 32 +++++++++++++++----
 .../components/domainproperties/models.tsx    | 25 ++++++++++++---
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 2dc1450f3a..6985a98644 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -4,6 +4,7 @@ Components, models, actions, and utility functions for LabKey applications and p
 ### version TBD
 *Released*: TBD
 - GitHub Issue 783: Hide domain designer field Advanced Settings that are not currently implemented in app
+- GitHub Issue 788: Domain Designer better handling of invalid lookup query value for Sample data type
 
 ### version 6.56.2
 *Released*: 21 July 2025
diff --git a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
index 944a7b2eec..5c6ce8a58b 100644
--- a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
@@ -11,7 +11,7 @@ import { LabelHelpTip } from '../base/LabelHelpTip';
 import { isFieldFullyLocked } from './propertiesUtil';
 import { fetchQueries } from './actions';
 import { createFormInputId, createFormInputName } from './utils';
-import { ALL_SAMPLES_DISPLAY_TEXT, DOMAIN_FIELD_SAMPLE_TYPE, DOMAIN_VALIDATOR_LOOKUP } from './constants';
+import { DOMAIN_FIELD_SAMPLE_TYPE, DOMAIN_VALIDATOR_LOOKUP } from './constants';
 import {
     DomainField,
     encodeLookup,
@@ -35,6 +35,7 @@ interface SampleFieldProps extends ITypeDependentProps {
 }
 
 interface State {
+    isValidOptions?: boolean;
     loadingState: LoadingState;
     sampleTypes: List<LookupInfo>;
     validateLookup: boolean;
@@ -48,7 +49,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
     };
 
     componentDidMount = async (): Promise<void> => {
-        const { original, field } = this.props;
+        const { original, field, value } = this.props;
 
         this.setState({ loadingState: LoadingState.LOADING });
 
@@ -60,7 +61,14 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                 .filter(st => st.type.isInteger()) // Remove rowId duplicates
                 .toList();
 
+            let isValidOptions = true;
+            if (value !== SAMPLE_TYPE_OPTION_VALUE && sampleTypes.size > 0) {
+                const optionValues = sampleTypes.map(st => encodeLookup(st.name, st.type));
+                isValidOptions = optionValues.includes(value);
+            }
+
             this.setState({
+                isValidOptions,
                 loadingState: LoadingState.LOADED,
                 sampleTypes,
                 validateLookup: field.isNew() || !!field.lookupValidator,
@@ -73,6 +81,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
 
     onFieldChange = (evt): void => {
         this.props.onChange(evt.target.id, evt.target.value);
+        this.setState({ isValidOptions: true });
     };
 
     addLookupValidator = (evt): void => {
@@ -88,9 +97,8 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
     };
 
     render() {
-        const { index, label, lockType, value, domainIndex } = this.props;
-
-        const { loadingState, sampleTypes, validateLookup } = this.state;
+        const { index, label, lockType, value, domainIndex, field } = this.props;
+        const { loadingState, sampleTypes, validateLookup, isValidOptions } = this.state;
         const isLoaded = !isLoading(loadingState);
 
         const id = createFormInputId(DOMAIN_FIELD_SAMPLE_TYPE, domainIndex, index);
@@ -129,13 +137,25 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                             disabled={isFieldFullyLocked(lockType)}
                             name={createFormInputName(DOMAIN_FIELD_SAMPLE_TYPE)}
                             onChange={this.onFieldChange}
-                            value={value || ALL_SAMPLES_DISPLAY_TEXT}
+                            value={value || SAMPLE_TYPE_OPTION_VALUE}
                         >
                             {!isLoaded && (
                                 <option disabled key="_loading" value={value}>
                                     Loading...
                                 </option>
                             )}
+                            {!isValidOptions && (
+                                <option
+                                    key={createFormInputId(
+                                        DOMAIN_FIELD_SAMPLE_TYPE + '-empty-' + index,
+                                        domainIndex,
+                                        index
+                                    )}
+                                    value={undefined}
+                                >
+                                    &lt;Invalid sample type: {field?.lookupQuery}&gt;
+                                </option>
+                            )}
                             {isLoaded && (
                                 <option
                                     key={createFormInputId(
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index bf33a78ebf..f1bc74b34b 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -1124,12 +1124,12 @@ export class DomainField
     }
 
     static resolveLookupConfig(rawField: Partial<IDomainField>, dataType: PropDescType): ILookupConfig {
+        const isSampleType = dataType === SAMPLE_TYPE;
         const lookupType = LOOKUP_TYPE.set('rangeURI', rawField.rangeURI) as PropDescType;
         const lookupContainer = rawField.lookupContainer === null ? undefined : rawField.lookupContainer;
         const lookupSchema = resolveLookupSchema(rawField, dataType);
-        const lookupQuery =
-            rawField.lookupQuery || (dataType === SAMPLE_TYPE ? SCHEMAS.EXP_TABLES.MATERIALS.queryName : undefined);
-        const lookupQueryValue = encodeLookup(lookupQuery, lookupType);
+        const lookupQuery = rawField.lookupQuery || (dataType === SAMPLE_TYPE ? SCHEMAS.EXP_TABLES.MATERIALS.queryName : undefined);
+        const lookupQueryValue = resolveLookupQueryValue(lookupType, lookupSchema, lookupQuery, isSampleType);
 
         return {
             lookupContainer,
@@ -1542,6 +1542,23 @@ function resolveLookupSchema(rawField: Partial<IDomainField>, dataType: PropDesc
     return undefined;
 }
 
+// TODO add jest coverage
+function resolveLookupQueryValue(
+    lookupType: PropDescType,
+    lookupSchema: string,
+    lookupQuery: string,
+    isSampleType = false
+): string {
+    if (
+        isSampleType &&
+        lookupSchema === SCHEMAS.EXP_TABLES.SCHEMA &&
+        lookupQuery === SCHEMAS.EXP_TABLES.MATERIALS.queryName
+    ) {
+        return SAMPLE_TYPE_OPTION_VALUE;
+    }
+    return encodeLookup(lookupQuery, lookupType);
+}
+
 export function updateSampleField(field: Partial<DomainField>, sampleQueryValue?: string): DomainField {
     const { queryName, rangeURI = INT_RANGE_URI } = decodeLookup(sampleQueryValue);
     const lookupType = field.lookupType || LOOKUP_TYPE;
@@ -1561,7 +1578,7 @@ export function updateSampleField(field: Partial<DomainField>, sampleQueryValue?
                   // use the samples.<SampleType> table for specific sample types
                   lookupSchema: SCHEMAS.SAMPLE_SETS.SCHEMA,
                   lookupQuery: queryName,
-                  lookupQueryValue: sampleQueryValue || SAMPLE_TYPE_OPTION_VALUE,
+                  lookupQueryValue: sampleQueryValue,
                   lookupType: lookupType.set('rangeURI', rangeURI),
                   lookupValidator: LOOKUP_VALIDATOR,
                   propertyValidators: List([LOOKUP_VALIDATOR]),

From 8cdd4dbefb82c977b0c4fbe679e584e2b2fd4e36 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 22 Jul 2025 11:33:44 -0500
Subject: [PATCH 03/17] 6.56.2-assayDesignerFixes258.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 2dca7d7610..0cbb302a77 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.56.2",
+  "version": "6.56.2-assayDesignerFixes258.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.56.2",
+      "version": "6.56.2-assayDesignerFixes258.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index cc70398f93..ad64aa1ca8 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.56.2",
+  "version": "6.56.2-assayDesignerFixes258.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 224445cc6a7d4dc66ed7aeca438f247a9913ae26 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 22 Jul 2025 11:38:41 -0500
Subject: [PATCH 04/17] jest test fixes to match dev changes

---
 .../components/domainproperties/AdvancedSettings.test.tsx | 8 ++++++--
 .../internal/components/domainproperties/actions.test.ts  | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx b/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx
index 5d8b7327d3..21b7260168 100644
--- a/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx
@@ -114,7 +114,9 @@ describe('AdvancedSettings', () => {
         // Verify mvEnabled
         id = createFormInputId(DOMAIN_FIELD_MVENABLED, _domainIndex, _index);
         const mvEnabled = document.querySelector('#' + id);
-        expect(mvEnabled.getAttribute('checked')).toBeNull();
+        expect(mvEnabled).toBeNull();
+        // TODO update this test case for isApp scenario
+        // expect(mvEnabled.getAttribute('checked')).toBeNull();
 
         // Verify recommendedVariable
         id = createFormInputId(DOMAIN_FIELD_RECOMMENDEDVARIABLE, _domainIndex, _index);
@@ -129,7 +131,9 @@ describe('AdvancedSettings', () => {
         // Verify default type
         id = createFormInputId(DOMAIN_FIELD_DEFAULT_VALUE_TYPE, _domainIndex, _index);
         const defaultType = document.querySelector('#' + id);
-        expect(defaultType.textContent).toEqual('Editable defaultLast enteredFixed value');
+        expect(defaultType).toBeNull();
+        // TODO update this test case for isApp scenario
+        // expect(defaultType.textContent).toEqual('Editable defaultLast enteredFixed value');
 
         // Verify buttons
         const btns = document.getElementsByClassName('btn');
diff --git a/packages/components/src/internal/components/domainproperties/actions.test.ts b/packages/components/src/internal/components/domainproperties/actions.test.ts
index 085428a891..07a58091e0 100644
--- a/packages/components/src/internal/components/domainproperties/actions.test.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.test.ts
@@ -821,7 +821,7 @@ describe('domain properties actions', () => {
         expect(field.dataType).toBe(SAMPLE_TYPE);
         expect(field.lookupSchema).toBe('exp');
         expect(field.lookupQuery).toBe('Materials');
-        expect(field.lookupQueryValue).toBe('http://www.w3.org/2001/XMLSchema#int|Materials');
+        expect(field.lookupQueryValue).toBe('http://www.w3.org/2001/XMLSchema#int|all');
     });
 
     test('updateDataType Sample data type, saved field', () => {
@@ -830,7 +830,7 @@ describe('domain properties actions', () => {
         expect(field.dataType).toBe(SAMPLE_TYPE);
         expect(field.lookupSchema).toBe('exp');
         expect(field.lookupQuery).toBe('Materials');
-        expect(field.lookupQueryValue).toBe('http://www.w3.org/2001/XMLSchema#int|Materials');
+        expect(field.lookupQueryValue).toBe('http://www.w3.org/2001/XMLSchema#int|all');
     });
 
     test('updateDataType Sample data type, saved lookup field', () => {
@@ -839,7 +839,7 @@ describe('domain properties actions', () => {
         expect(field.dataType).toBe(SAMPLE_TYPE);
         expect(field.lookupSchema).toBe('exp');
         expect(field.lookupQuery).toBe('Materials');
-        expect(field.lookupQueryValue).toBe('http://www.w3.org/2001/XMLSchema#int|Materials');
+        expect(field.lookupQueryValue).toBe('http://www.w3.org/2001/XMLSchema#int|all');
     });
 
     test('updateDomainField principalConceptCode', () => {

From 1657543fb93df9e765b50d4657bb6a7fa696fe3b Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 29 Jul 2025 10:56:53 -0500
Subject: [PATCH 05/17] 6.56.3-assayDesignerFixes258.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index c704efb92b..6a1d036998 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.56.3",
+  "version": "6.56.3-assayDesignerFixes258.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.56.3",
+      "version": "6.56.3-assayDesignerFixes258.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 363825c439..d194a290b8 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.56.3",
+  "version": "6.56.3-assayDesignerFixes258.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From a1d0b15e3e0a79cccce3e02ac5d6f77c01c60fae Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 29 Jul 2025 11:52:34 -0500
Subject: [PATCH 06/17] jest test updates

---
 .../AdvancedSettings.test.tsx                 | 14 ++++++++------
 .../domainproperties/models.test.ts           | 19 +++++++++++++++++++
 .../components/domainproperties/models.tsx    |  4 ++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx b/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx
index 21b7260168..e5b576fe62 100644
--- a/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx
@@ -27,6 +27,12 @@ import {
 import { AdvancedSettings } from './AdvancedSettings';
 import { DomainField } from './models';
 
+// mock isApp() to return false for this test case, affects MV enabled checkbox and Default Value Type
+jest.mock('../../app/utils', () => ({
+    ...jest.requireActual('../../app/utils'),
+    isApp: () => false,
+}));
+
 describe('AdvancedSettings', () => {
     const _fieldName = 'Marty';
     const _title = 'Advanced Settings and Properties';
@@ -114,9 +120,7 @@ describe('AdvancedSettings', () => {
         // Verify mvEnabled
         id = createFormInputId(DOMAIN_FIELD_MVENABLED, _domainIndex, _index);
         const mvEnabled = document.querySelector('#' + id);
-        expect(mvEnabled).toBeNull();
-        // TODO update this test case for isApp scenario
-        // expect(mvEnabled.getAttribute('checked')).toBeNull();
+        expect(mvEnabled.getAttribute('checked')).toBeNull(); // Note mock of isApp above
 
         // Verify recommendedVariable
         id = createFormInputId(DOMAIN_FIELD_RECOMMENDEDVARIABLE, _domainIndex, _index);
@@ -131,9 +135,7 @@ describe('AdvancedSettings', () => {
         // Verify default type
         id = createFormInputId(DOMAIN_FIELD_DEFAULT_VALUE_TYPE, _domainIndex, _index);
         const defaultType = document.querySelector('#' + id);
-        expect(defaultType).toBeNull();
-        // TODO update this test case for isApp scenario
-        // expect(defaultType.textContent).toEqual('Editable defaultLast enteredFixed value');
+        expect(defaultType.textContent).toEqual('Editable defaultLast enteredFixed value'); // Note mock of isApp above
 
         // Verify buttons
         const btns = document.getElementsByClassName('btn');
diff --git a/packages/components/src/internal/components/domainproperties/models.test.ts b/packages/components/src/internal/components/domainproperties/models.test.ts
index 175e76a60e..4d74e73e8e 100644
--- a/packages/components/src/internal/components/domainproperties/models.test.ts
+++ b/packages/components/src/internal/components/domainproperties/models.test.ts
@@ -64,6 +64,7 @@ import {
     isValidTextChoiceValue,
     PropertyValidator,
     PropertyValidatorProperties,
+    resolveLookupQueryValue,
 } from './models';
 import {
     BOOLEAN_RANGE_URI,
@@ -1470,3 +1471,21 @@ describe('resolveBaseProperties', () => {
         );
     });
 });
+
+describe('resolveLookupQueryValue', () => {
+    test('isSampleType', () => {
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', true)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'query', true)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'Materials', false)).toBe('http://www.w3.org/2001/XMLSchema#string|Materials');
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'Materials', true)).toBe('http://www.w3.org/2001/XMLSchema#int|all');
+    });
+
+    test('lookupType', () => {
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
+        expect(resolveLookupQueryValue(INTEGER_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#int|query');
+        expect(resolveLookupQueryValue(DATETIME_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#dateTime|query');
+        expect(resolveLookupQueryValue(SAMPLE_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#int|query');
+    });
+});
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index f1bc74b34b..051e0c4e0d 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -1542,8 +1542,8 @@ function resolveLookupSchema(rawField: Partial<IDomainField>, dataType: PropDesc
     return undefined;
 }
 
-// TODO add jest coverage
-function resolveLookupQueryValue(
+// export for jest testing
+export function resolveLookupQueryValue(
     lookupType: PropDescType,
     lookupSchema: string,
     lookupQuery: string,

From 665c95983df3f52158b82c5c371e15bc63a0ca2a Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 29 Jul 2025 14:22:33 -0500
Subject: [PATCH 07/17] SampleFieldOptions.tsx update isValidOptions check for
 no sample type case

---
 .../internal/components/domainproperties/SampleFieldOptions.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
index 5c6ce8a58b..9717e5ea15 100644
--- a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
@@ -62,7 +62,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                 .toList();
 
             let isValidOptions = true;
-            if (value !== SAMPLE_TYPE_OPTION_VALUE && sampleTypes.size > 0) {
+            if (value !== SAMPLE_TYPE_OPTION_VALUE) {
                 const optionValues = sampleTypes.map(st => encodeLookup(st.name, st.type));
                 isValidOptions = optionValues.includes(value);
             }

From 5efe014e2ebb2645bb4b80c4add8e98783095fa7 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 29 Jul 2025 14:23:13 -0500
Subject: [PATCH 08/17] 6.56.3-assayDesignerFixes258.1

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 6a1d036998..f0adcd4015 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.56.3-assayDesignerFixes258.0",
+  "version": "6.56.3-assayDesignerFixes258.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.56.3-assayDesignerFixes258.0",
+      "version": "6.56.3-assayDesignerFixes258.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index d194a290b8..2b686cf430 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.56.3-assayDesignerFixes258.0",
+  "version": "6.56.3-assayDesignerFixes258.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 8667c199031cd3ce55468d552252056ddb8f00f9 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Wed, 30 Jul 2025 15:47:38 -0500
Subject: [PATCH 09/17] 6.57.0-assayDesignerFixes258.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index fa27adb420..56959d1074 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0",
+  "version": "6.57.0-assayDesignerFixes258.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.57.0",
+      "version": "6.57.0-assayDesignerFixes258.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index c78cdb7ef7..76745cdf08 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0",
+  "version": "6.57.0-assayDesignerFixes258.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From dc49431f73a98ced84b96238ff0688d50ac136d5 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Wed, 30 Jul 2025 15:57:13 -0500
Subject: [PATCH 10/17] cr feedback - renaming

---
 .../domainproperties/SampleFieldOptions.tsx   | 22 +++++++++----------
 .../components/domainproperties/models.tsx    |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
index 9717e5ea15..6f30664f90 100644
--- a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
@@ -20,7 +20,7 @@ import {
     ITypeDependentProps,
     LOOKUP_VALIDATOR,
     LookupInfo,
-    SAMPLE_TYPE_OPTION_VALUE,
+    SAMPLE_TYPE_ALL_OPTION_VALUE,
 } from './models';
 
 import { SectionHeading } from './SectionHeading';
@@ -35,7 +35,7 @@ interface SampleFieldProps extends ITypeDependentProps {
 }
 
 interface State {
-    isValidOptions?: boolean;
+    isValidOption?: boolean;
     loadingState: LoadingState;
     sampleTypes: List<LookupInfo>;
     validateLookup: boolean;
@@ -61,14 +61,14 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                 .filter(st => st.type.isInteger()) // Remove rowId duplicates
                 .toList();
 
-            let isValidOptions = true;
-            if (value !== SAMPLE_TYPE_OPTION_VALUE) {
+            let isValidOption = true;
+            if (value !== SAMPLE_TYPE_ALL_OPTION_VALUE) {
                 const optionValues = sampleTypes.map(st => encodeLookup(st.name, st.type));
-                isValidOptions = optionValues.includes(value);
+                isValidOption = optionValues.includes(value);
             }
 
             this.setState({
-                isValidOptions,
+                isValidOption,
                 loadingState: LoadingState.LOADED,
                 sampleTypes,
                 validateLookup: field.isNew() || !!field.lookupValidator,
@@ -81,7 +81,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
 
     onFieldChange = (evt): void => {
         this.props.onChange(evt.target.id, evt.target.value);
-        this.setState({ isValidOptions: true });
+        this.setState({ isValidOption: true });
     };
 
     addLookupValidator = (evt): void => {
@@ -98,7 +98,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
 
     render() {
         const { index, label, lockType, value, domainIndex, field } = this.props;
-        const { loadingState, sampleTypes, validateLookup, isValidOptions } = this.state;
+        const { loadingState, sampleTypes, validateLookup, isValidOption } = this.state;
         const isLoaded = !isLoading(loadingState);
 
         const id = createFormInputId(DOMAIN_FIELD_SAMPLE_TYPE, domainIndex, index);
@@ -137,14 +137,14 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                             disabled={isFieldFullyLocked(lockType)}
                             name={createFormInputName(DOMAIN_FIELD_SAMPLE_TYPE)}
                             onChange={this.onFieldChange}
-                            value={value || SAMPLE_TYPE_OPTION_VALUE}
+                            value={value || SAMPLE_TYPE_ALL_OPTION_VALUE}
                         >
                             {!isLoaded && (
                                 <option disabled key="_loading" value={value}>
                                     Loading...
                                 </option>
                             )}
-                            {!isValidOptions && (
+                            {!isValidOption && (
                                 <option
                                     key={createFormInputId(
                                         DOMAIN_FIELD_SAMPLE_TYPE + '-empty-' + index,
@@ -163,7 +163,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                                         domainIndex,
                                         index
                                     )}
-                                    value={SAMPLE_TYPE_OPTION_VALUE}
+                                    value={SAMPLE_TYPE_ALL_OPTION_VALUE}
                                 >
                                     All Samples
                                 </option>
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 051e0c4e0d..22c5646c0f 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -138,7 +138,7 @@ export interface DomainPropertiesGridColumn {
     sortable: boolean;
 }
 
-export const SAMPLE_TYPE_OPTION_VALUE = `${SAMPLE_TYPE.rangeURI}|all`;
+export const SAMPLE_TYPE_ALL_OPTION_VALUE = `${SAMPLE_TYPE.rangeURI}|all`;
 
 interface IDomainDesign {
     allowAttachmentProperties: boolean;
@@ -1554,7 +1554,7 @@ export function resolveLookupQueryValue(
         lookupSchema === SCHEMAS.EXP_TABLES.SCHEMA &&
         lookupQuery === SCHEMAS.EXP_TABLES.MATERIALS.queryName
     ) {
-        return SAMPLE_TYPE_OPTION_VALUE;
+        return SAMPLE_TYPE_ALL_OPTION_VALUE;
     }
     return encodeLookup(lookupQuery, lookupType);
 }

From ca315be7c6c15666f929559ff540b001e57157bd Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Wed, 30 Jul 2025 15:57:38 -0500
Subject: [PATCH 11/17] 6.57.0-assayDesignerFixes258.1

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 56959d1074..a91e18c3e4 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0-assayDesignerFixes258.0",
+  "version": "6.57.0-assayDesignerFixes258.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.57.0-assayDesignerFixes258.0",
+      "version": "6.57.0-assayDesignerFixes258.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 76745cdf08..ac77a73a13 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0-assayDesignerFixes258.0",
+  "version": "6.57.0-assayDesignerFixes258.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 01468e8c3b9abb3d5bf596411aa04d4cf1b603d8 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Thu, 31 Jul 2025 08:22:53 -0500
Subject: [PATCH 12/17] GitHub Issue 788: use field.lookupIsValid for row
 details error

---
 .../domainproperties/SampleFieldOptions.tsx       | 15 +++------------
 .../components/domainproperties/actions.ts        |  1 +
 .../components/domainproperties/models.tsx        | 13 +++++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
index 6f30664f90..6a14550e99 100644
--- a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
@@ -35,7 +35,6 @@ interface SampleFieldProps extends ITypeDependentProps {
 }
 
 interface State {
-    isValidOption?: boolean;
     loadingState: LoadingState;
     sampleTypes: List<LookupInfo>;
     validateLookup: boolean;
@@ -49,7 +48,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
     };
 
     componentDidMount = async (): Promise<void> => {
-        const { original, field, value } = this.props;
+        const { original, field } = this.props;
 
         this.setState({ loadingState: LoadingState.LOADING });
 
@@ -61,14 +60,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                 .filter(st => st.type.isInteger()) // Remove rowId duplicates
                 .toList();
 
-            let isValidOption = true;
-            if (value !== SAMPLE_TYPE_ALL_OPTION_VALUE) {
-                const optionValues = sampleTypes.map(st => encodeLookup(st.name, st.type));
-                isValidOption = optionValues.includes(value);
-            }
-
             this.setState({
-                isValidOption,
                 loadingState: LoadingState.LOADED,
                 sampleTypes,
                 validateLookup: field.isNew() || !!field.lookupValidator,
@@ -81,7 +73,6 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
 
     onFieldChange = (evt): void => {
         this.props.onChange(evt.target.id, evt.target.value);
-        this.setState({ isValidOption: true });
     };
 
     addLookupValidator = (evt): void => {
@@ -98,7 +89,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
 
     render() {
         const { index, label, lockType, value, domainIndex, field } = this.props;
-        const { loadingState, sampleTypes, validateLookup, isValidOption } = this.state;
+        const { loadingState, sampleTypes, validateLookup } = this.state;
         const isLoaded = !isLoading(loadingState);
 
         const id = createFormInputId(DOMAIN_FIELD_SAMPLE_TYPE, domainIndex, index);
@@ -144,7 +135,7 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                                     Loading...
                                 </option>
                             )}
-                            {!isValidOption && (
+                            {field && !field.lookupIsValid && (
                                 <option
                                     key={createFormInputId(
                                         DOMAIN_FIELD_SAMPLE_TYPE + '-empty-' + index,
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 598ea8f374..d06aa05d03 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -866,6 +866,7 @@ export function updateDataType(field: DomainField, value: any): DomainField {
             rangeURI: dataType.rangeURI,
             lookupSchema: dataType.lookupSchema,
             lookupQuery: dataType.lookupQuery,
+            lookupIsValid: true,
             sourceOntology: undefined,
             conceptSubtree: undefined,
             conceptLabelColumn: undefined,
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 22c5646c0f..c7d091799e 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -1422,6 +1422,17 @@ export class DomainField
                     ? ALL_SAMPLES_DISPLAY_TEXT
                     : this.lookupQuery;
             details.push(period + detailsText);
+
+            if (!this.lookupIsValid) {
+                const fieldError = new DomainFieldError({
+                    extraInfo:
+                        'The selected sample type may have been deleted or renamed. Expand the row to select a valid sample lookup.',
+                    message: 'Invalid sample type',
+                    severity: SEVERITY_LEVEL_ERROR,
+                });
+                details.push(<DomainRowWarning fieldError={fieldError} key="domain-row-sample-error" />);
+            }
+
             period = '. ';
         } else if (this.dataType.isLookup() && this.lookupSchema && this.lookupQuery) {
             // only show the query as a link in LKS, for now
@@ -1571,6 +1582,7 @@ export function updateSampleField(field: Partial<DomainField>, sampleQueryValue?
                   lookupQueryValue: sampleQueryValue,
                   lookupType: field.lookupType.set('rangeURI', rangeURI),
                   lookupValidator: LOOKUP_VALIDATOR,
+                  lookupIsValid: true,
                   propertyValidators: List([LOOKUP_VALIDATOR]),
                   rangeURI,
               }
@@ -1581,6 +1593,7 @@ export function updateSampleField(field: Partial<DomainField>, sampleQueryValue?
                   lookupQueryValue: sampleQueryValue,
                   lookupType: lookupType.set('rangeURI', rangeURI),
                   lookupValidator: LOOKUP_VALIDATOR,
+                  lookupIsValid: true,
                   propertyValidators: List([LOOKUP_VALIDATOR]),
                   rangeURI,
               };

From 262856fe2aa19249a85652b90f07ae07f02d127e Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Thu, 31 Jul 2025 08:25:17 -0500
Subject: [PATCH 13/17] 6.57.0-assayDesignerFixes258.2

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index a91e18c3e4..536a143547 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0-assayDesignerFixes258.1",
+  "version": "6.57.0-assayDesignerFixes258.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.57.0-assayDesignerFixes258.1",
+      "version": "6.57.0-assayDesignerFixes258.2",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index ac77a73a13..1e8240d7e0 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0-assayDesignerFixes258.1",
+  "version": "6.57.0-assayDesignerFixes258.2",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 478270f43fc35946e29ae195c83a37447f17f4ea Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Thu, 31 Jul 2025 08:27:17 -0500
Subject: [PATCH 14/17] jest fix for recent update to use lookupIsValid for
 sample data type

---
 .../domainproperties/models.test.ts           | 55 +++++++++++++++----
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/models.test.ts b/packages/components/src/internal/components/domainproperties/models.test.ts
index 4d74e73e8e..f0edf0a680 100644
--- a/packages/components/src/internal/components/domainproperties/models.test.ts
+++ b/packages/components/src/internal/components/domainproperties/models.test.ts
@@ -1012,7 +1012,20 @@ describe('DomainField', () => {
         field = field.merge({ propertyId: 0, updatedField: true }) as DomainField;
         expect(field.getDetailsArray().join('')).toBe('Updated');
 
-        field = field.merge({ dataType: SAMPLE_TYPE, lookupSchema: 'exp', lookupQuery: 'SampleType1' }) as DomainField;
+        field = field.merge({
+            dataType: SAMPLE_TYPE,
+            lookupSchema: 'exp',
+            lookupQuery: 'SampleType1',
+            lookupIsValid: false,
+        }) as DomainField;
+        expect(field.getDetailsArray().join('')).toBe('Updated. SampleType1[object Object]');
+
+        field = field.merge({
+            dataType: SAMPLE_TYPE,
+            lookupSchema: 'exp',
+            lookupQuery: 'SampleType1',
+            lookupIsValid: true,
+        }) as DomainField;
         expect(field.getDetailsArray().join('')).toBe('Updated. SampleType1');
 
         field = field.merge({ dataType: LOOKUP_TYPE }) as DomainField;
@@ -1474,18 +1487,38 @@ describe('resolveBaseProperties', () => {
 
 describe('resolveLookupQueryValue', () => {
     test('isSampleType', () => {
-        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
-        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', true)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
-        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
-        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'query', true)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
-        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'Materials', false)).toBe('http://www.w3.org/2001/XMLSchema#string|Materials');
-        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'Materials', true)).toBe('http://www.w3.org/2001/XMLSchema#int|all');
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', false)).toBe(
+            'http://www.w3.org/2001/XMLSchema#string|query'
+        );
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', true)).toBe(
+            'http://www.w3.org/2001/XMLSchema#string|query'
+        );
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'query', false)).toBe(
+            'http://www.w3.org/2001/XMLSchema#string|query'
+        );
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'query', true)).toBe(
+            'http://www.w3.org/2001/XMLSchema#string|query'
+        );
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'Materials', false)).toBe(
+            'http://www.w3.org/2001/XMLSchema#string|Materials'
+        );
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'exp', 'Materials', true)).toBe(
+            'http://www.w3.org/2001/XMLSchema#int|all'
+        );
     });
 
     test('lookupType', () => {
-        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#string|query');
-        expect(resolveLookupQueryValue(INTEGER_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#int|query');
-        expect(resolveLookupQueryValue(DATETIME_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#dateTime|query');
-        expect(resolveLookupQueryValue(SAMPLE_TYPE, 'schema', 'query', false)).toBe('http://www.w3.org/2001/XMLSchema#int|query');
+        expect(resolveLookupQueryValue(TEXT_TYPE, 'schema', 'query', false)).toBe(
+            'http://www.w3.org/2001/XMLSchema#string|query'
+        );
+        expect(resolveLookupQueryValue(INTEGER_TYPE, 'schema', 'query', false)).toBe(
+            'http://www.w3.org/2001/XMLSchema#int|query'
+        );
+        expect(resolveLookupQueryValue(DATETIME_TYPE, 'schema', 'query', false)).toBe(
+            'http://www.w3.org/2001/XMLSchema#dateTime|query'
+        );
+        expect(resolveLookupQueryValue(SAMPLE_TYPE, 'schema', 'query', false)).toBe(
+            'http://www.w3.org/2001/XMLSchema#int|query'
+        );
     });
 });

From f4b7f73ec3e59c1d1ee461f837dd8bee3d606d6c Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Mon, 4 Aug 2025 13:56:42 -0500
Subject: [PATCH 15/17] npm run lint-branch-fix

---
 .../domainproperties/AdvancedSettings.tsx     | 74 ++++++++++---------
 .../domainproperties/SampleFieldOptions.tsx   |  4 +-
 .../domainproperties/actions.test.ts          |  2 +-
 .../components/domainproperties/models.tsx    |  3 +-
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx b/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
index 1b70b278f2..e6329ad068 100644
--- a/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
+++ b/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
@@ -60,7 +60,6 @@ interface AdvancedSettingsProps {
 }
 
 interface AdvancedSettingsState {
-    PHI?: string;
     defaultDisplayValue?: string;
     defaultValueType?: string;
     dimension?: boolean;
@@ -68,7 +67,8 @@ interface AdvancedSettingsState {
     hidden?: boolean;
     measure?: boolean;
     mvEnabled?: boolean;
-    phiLevels?: Array<{ label: string; value: string; }>;
+    PHI?: string;
+    phiLevels?: { label: string; value: string }[];
     recommendedVariable?: boolean;
     shownInDetailsView?: boolean;
     shownInInsertView?: boolean;
@@ -265,9 +265,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 <div>These options configure how and in which views this field will be visible.</div>
                 <CheckboxLK
                     checked={hidden === false}
-                    onChange={this.handleCheckbox}
-                    name={createFormInputName(DOMAIN_FIELD_HIDDEN)}
                     id={createFormInputId(DOMAIN_FIELD_HIDDEN, domainIndex, index)}
+                    name={createFormInputName(DOMAIN_FIELD_HIDDEN)}
+                    onChange={this.handleCheckbox}
                 >
                     Show field on default view of the grid
                 </CheckboxLK>
@@ -275,17 +275,17 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                     <>
                         <CheckboxLK
                             checked={shownInUpdateView === true}
-                            onChange={this.handleCheckbox}
-                            name={createFormInputName(DOMAIN_FIELD_SHOWNINUPDATESVIEW)}
                             id={createFormInputId(DOMAIN_FIELD_SHOWNINUPDATESVIEW, domainIndex, index)}
+                            name={createFormInputName(DOMAIN_FIELD_SHOWNINUPDATESVIEW)}
+                            onChange={this.handleCheckbox}
                         >
                             Show on update form when updating a single row of data
                         </CheckboxLK>
                         <CheckboxLK
                             checked={shownInInsertView === true}
-                            onChange={this.handleCheckbox}
-                            name={createFormInputName(DOMAIN_FIELD_SHOWNININSERTVIEW)}
                             id={createFormInputId(DOMAIN_FIELD_SHOWNININSERTVIEW, domainIndex, index)}
+                            name={createFormInputName(DOMAIN_FIELD_SHOWNININSERTVIEW)}
+                            onChange={this.handleCheckbox}
                         >
                             Show on insert form when updating a single row of data
                         </CheckboxLK>
@@ -293,9 +293,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 )}
                 <CheckboxLK
                     checked={shownInDetailsView === true}
-                    onChange={this.handleCheckbox}
-                    name={createFormInputName(DOMAIN_FIELD_SHOWNINDETAILSVIEW)}
                     id={createFormInputId(DOMAIN_FIELD_SHOWNINDETAILSVIEW, domainIndex, index)}
+                    name={createFormInputName(DOMAIN_FIELD_SHOWNINDETAILSVIEW)}
+                    onChange={this.handleCheckbox}
                 >
                     Show on details page for a single row
                 </CheckboxLK>
@@ -312,21 +312,23 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 <div className="domain-adv-misc-options">Default Value Options</div>
                 <div className="row domain-adv-thick-row">
                     <div className="col-xs-3">
-                        <DomainFieldLabel label="Default Type" helpTipBody={this.getDefaultTypeHelpText()} />
+                        <DomainFieldLabel helpTipBody={this.getDefaultTypeHelpText()} label="Default Type" />
                     </div>
                     <div className="col-xs-6">
                         <select
                             className="form-control"
-                            name={createFormInputName(DOMAIN_FIELD_DEFAULT_VALUE_TYPE)}
                             id={createFormInputId(DOMAIN_FIELD_DEFAULT_VALUE_TYPE, domainIndex, index)}
+                            name={createFormInputName(DOMAIN_FIELD_DEFAULT_VALUE_TYPE)}
                             onChange={this.handleChange}
                             value={defaultValueType}
                         >
-                            {defaultValueOptions.map(level => (
-                                <option key={level} value={level}>
-                                    {DOMAIN_DEFAULT_TYPES[level]}
-                                </option>
-                            )).toArray()}
+                            {defaultValueOptions
+                                .map(level => (
+                                    <option key={level} value={level}>
+                                        {DOMAIN_DEFAULT_TYPES[level]}
+                                    </option>
+                                ))
+                                .toArray()}
                         </select>
                     </div>
                     <div className="col-xs-3" />
@@ -342,9 +344,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                                 : ''}
                         </span>
                         <a
-                            style={{ marginLeft: '20px' }}
-                            onClick={this.handleSetDefaultValues}
                             className="domain-adv-link"
+                            onClick={this.handleSetDefaultValues}
+                            style={{ marginLeft: '20px' }}
                         >
                             Set Default Values
                         </a>
@@ -378,16 +380,16 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 {!field.isCalculatedField() && (
                     <div className="row">
                         <div className="col-xs-3">
-                            <DomainFieldLabel label="PHI Level" helpTipBody={this.getPhiHelpText()} />
+                            <DomainFieldLabel helpTipBody={this.getPhiHelpText()} label="PHI Level" />
                         </div>
                         <div className="col-xs-6">
                             <select
                                 className="form-control"
-                                name={createFormInputName(DOMAIN_FIELD_PHI)}
+                                disabled={disablePhiSelect}
                                 id={createFormInputId(DOMAIN_FIELD_PHI, domainIndex, index)}
+                                name={createFormInputName(DOMAIN_FIELD_PHI)}
                                 onChange={this.handleChange}
                                 value={PHI}
-                                disabled={disablePhiSelect}
                             >
                                 {!currentValueExists && (
                                     <option key={PHI} value={PHI}>
@@ -407,9 +409,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 {field.dataType === DATETIME_TYPE && (
                     <CheckboxLK
                         checked={excludeFromShifting}
-                        onChange={this.handleCheckbox}
-                        name={createFormInputName(DOMAIN_FIELD_EXCLUDE_FROM_SHIFTING)}
                         id={createFormInputId(DOMAIN_FIELD_EXCLUDE_FROM_SHIFTING, domainIndex, index)}
+                        name={createFormInputName(DOMAIN_FIELD_EXCLUDE_FROM_SHIFTING)}
+                        onChange={this.handleCheckbox}
                     >
                         Exclude from "Participant Date Shifting" on export/publication
                         <LabelHelpTip title="Exclude from Date Shifting">
@@ -421,9 +423,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 {PropDescType.isMeasure(field.dataType.rangeURI) && (
                     <CheckboxLK
                         checked={measure}
-                        onChange={this.handleCheckbox}
-                        name={createFormInputName(DOMAIN_FIELD_MEASURE)}
                         id={createFormInputId(DOMAIN_FIELD_MEASURE, domainIndex, index)}
+                        name={createFormInputName(DOMAIN_FIELD_MEASURE)}
+                        onChange={this.handleCheckbox}
                     >
                         Make this field available as a measure
                         <LabelHelpTip title="Measure">
@@ -446,9 +448,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 {PropDescType.isDimension(field.dataType.rangeURI) && (
                     <CheckboxLK
                         checked={dimension}
-                        onChange={this.handleCheckbox}
-                        name={createFormInputName(DOMAIN_FIELD_DIMENSION)}
                         id={createFormInputId(DOMAIN_FIELD_DIMENSION, domainIndex, index)}
+                        name={createFormInputName(DOMAIN_FIELD_DIMENSION)}
+                        onChange={this.handleCheckbox}
                     >
                         Make this field available as a dimension
                         <LabelHelpTip title="Data Dimension">
@@ -470,9 +472,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 )}
                 <CheckboxLK
                     checked={recommendedVariable}
-                    onChange={this.handleCheckbox}
-                    name={createFormInputName(DOMAIN_FIELD_RECOMMENDEDVARIABLE)}
                     id={createFormInputId(DOMAIN_FIELD_RECOMMENDEDVARIABLE, domainIndex, index)}
+                    name={createFormInputName(DOMAIN_FIELD_RECOMMENDEDVARIABLE)}
+                    onChange={this.handleCheckbox}
                 >
                     Make this field a recommended variable
                     <LabelHelpTip title="Recommended Variable">
@@ -485,10 +487,10 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 {PropDescType.isMvEnableable(field.dataType.rangeURI) && !field.isCalculatedField() && !isApp() && (
                     <CheckboxLK
                         checked={mvEnabled}
-                        onChange={this.handleCheckbox}
-                        name={createFormInputName(DOMAIN_FIELD_MVENABLED)}
-                        id={createFormInputId(DOMAIN_FIELD_MVENABLED, domainIndex, index)}
                         disabled={domainFormDisplayOptions.disableMvEnabled}
+                        id={createFormInputId(DOMAIN_FIELD_MVENABLED, domainIndex, index)}
+                        name={createFormInputName(DOMAIN_FIELD_MVENABLED)}
+                        onChange={this.handleCheckbox}
                     >
                         Track reason for missing data values
                         <LabelHelpTip title="Missing Value Indicators">
@@ -510,9 +512,9 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                     <CheckboxLK
                         checked={uniqueConstraint || field.isPrimaryKey}
                         disabled={field.isPrimaryKey}
-                        onChange={this.handleCheckbox}
-                        name={createFormInputName(DOMAIN_FIELD_UNIQUECONSTRAINT)}
                         id={createFormInputId(DOMAIN_FIELD_UNIQUECONSTRAINT, domainIndex, index)}
+                        name={createFormInputName(DOMAIN_FIELD_UNIQUECONSTRAINT)}
+                        onChange={this.handleCheckbox}
                     >
                         Require all values to be unique
                         <LabelHelpTip title="Unique Constraint">
@@ -536,7 +538,7 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                 >
                     Cancel
                 </button>
-                <HelpLink topic={ADVANCED_FIELD_EDITOR_TOPIC} className="domain-adv-footer domain-adv-link">
+                <HelpLink className="domain-adv-footer domain-adv-link" topic={ADVANCED_FIELD_EDITOR_TOPIC}>
                     Get help with field designer settings
                 </HelpLink>
                 <button
diff --git a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
index 6a14550e99..d6db52cdf0 100644
--- a/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/SampleFieldOptions.tsx
@@ -123,9 +123,9 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                         </div>
                         <select
                             className="form-control"
+                            disabled={isFieldFullyLocked(lockType)}
                             id={id}
                             key={id}
-                            disabled={isFieldFullyLocked(lockType)}
                             name={createFormInputName(DOMAIN_FIELD_SAMPLE_TYPE)}
                             onChange={this.onFieldChange}
                             value={value || SAMPLE_TYPE_ALL_OPTION_VALUE}
@@ -175,10 +175,10 @@ export class SampleFieldOptions extends PureComponent<SampleFieldProps, State> {
                     <div className="col-xs-6">
                         <div className="domain-field-label">Lookup Validator</div>
                         <DomainDesignerCheckbox
+                            checked={validateLookup}
                             className="domain-field-checkbox-margin"
                             id={createFormInputId(DOMAIN_VALIDATOR_LOOKUP, domainIndex, index)}
                             name={createFormInputName(DOMAIN_VALIDATOR_LOOKUP)}
-                            checked={validateLookup}
                             onChange={this.addLookupValidator}
                         >
                             <span className="domain-lookup-validator-text">Ensure Value Exists in Lookup Target</span>
diff --git a/packages/components/src/internal/components/domainproperties/actions.test.ts b/packages/components/src/internal/components/domainproperties/actions.test.ts
index 07a58091e0..b581b56fcd 100644
--- a/packages/components/src/internal/components/domainproperties/actions.test.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.test.ts
@@ -22,8 +22,8 @@ import { QueryColumn } from '../../../public/QueryColumn';
 import { ConceptModel, OntologyModel } from '../ontology/models';
 
 import {
-    TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT,
     TEST_LKS_STARTER_MODULE_CONTEXT,
+    TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT,
     TEST_LKSM_STARTER_MODULE_CONTEXT,
 } from '../../productFixtures';
 
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index c7d091799e..21c3d149af 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -1128,7 +1128,8 @@ export class DomainField
         const lookupType = LOOKUP_TYPE.set('rangeURI', rawField.rangeURI) as PropDescType;
         const lookupContainer = rawField.lookupContainer === null ? undefined : rawField.lookupContainer;
         const lookupSchema = resolveLookupSchema(rawField, dataType);
-        const lookupQuery = rawField.lookupQuery || (dataType === SAMPLE_TYPE ? SCHEMAS.EXP_TABLES.MATERIALS.queryName : undefined);
+        const lookupQuery =
+            rawField.lookupQuery || (dataType === SAMPLE_TYPE ? SCHEMAS.EXP_TABLES.MATERIALS.queryName : undefined);
         const lookupQueryValue = resolveLookupQueryValue(lookupType, lookupSchema, lookupQuery, isSampleType);
 
         return {

From cb82b591c5a3baa5f9bd2540c363ccb45e1a38ee Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Mon, 4 Aug 2025 13:56:58 -0500
Subject: [PATCH 16/17] 6.58.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 536a143547..0350f3eb22 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0-assayDesignerFixes258.2",
+  "version": "6.58.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.57.0-assayDesignerFixes258.2",
+      "version": "6.58.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 1e8240d7e0..b1dfc3de24 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.57.0-assayDesignerFixes258.2",
+  "version": "6.58.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From f3e9460b04e48eb32aacb0e558a322b7cdc323b1 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Mon, 4 Aug 2025 13:57:22 -0500
Subject: [PATCH 17/17] Update release notes with version number and release
 date

---
 packages/components/releaseNotes/components.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 199b1db209..30936ae2ec 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,8 +1,8 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
-### version TBD
-*Released*: TBD
+### version 6.58.0
+*Released*: 4 August 2025
 - GitHub Issue 783: Hide domain designer field Advanced Settings that are not currently implemented in app
 - GitHub Issue 788: Domain Designer better handling of invalid lookup query value for Sample data type