Skip to content

Commit 2a6559b

Browse files
authored
GitHub Issue 974: Lookup data type incorrectly shown in app assay designer (#1971)
### version 7.21.4 *Released*: 6 April 2026 - GitHub Issue #974: Lookup Data Type shown in Assay Designer for app, even when premium module is not present - AssayDesignerPanels to pass appPropertiesOnly to AssayDomainForm - add new domainFormDisplayOptions.showAdvancedSettingsForApp for assay designer case
1 parent 1d0983b commit 2a6559b

7 files changed

Lines changed: 26 additions & 11 deletions

File tree

packages/components/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@labkey/components",
3-
"version": "7.21.3",
3+
"version": "7.21.4",
44
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
55
"sideEffects": false,
66
"files": [

packages/components/releaseNotes/components.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# @labkey/components
22
Components, models, actions, and utility functions for LabKey applications and pages
33

4+
### version 7.21.4
5+
*Released*: 6 April 2026
6+
- GitHub Issue #974: Lookup Data Type shown in Assay Designer for app, even when premium module is not present
7+
- AssayDesignerPanels to pass appPropertiesOnly to AssayDomainForm
8+
- add new domainFormDisplayOptions.showAdvancedSettingsForApp for assay designer case
9+
410
### version 7.21.3
511
*Released*: 12 March 2026
612
- GitHub Issue #790: Sample check-in and discard should not allow amount/unit input for differing units

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,10 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
395395
const draggableId = createFormInputId('domaindrag', domainIndex, index);
396396
// Use undefined instead of false to allow for css to handle the highlight color for hover
397397
const highlighted = dragging ? true : isDragDisabled ? false : undefined;
398-
const showAdvancedSettingsButton = expanded && !isFieldFullyLocked(field.lockType) && !appPropertiesOnly;
398+
const showAdvancedSettingsButton =
399+
expanded &&
400+
!isFieldFullyLocked(field.lockType) &&
401+
(!appPropertiesOnly || domainFormDisplayOptions?.showAdvancedSettingsForApp); // GitHub Issue #974
399402

400403
return (
401404
<Draggable

packages/components/src/internal/components/domainproperties/assay/AssayDesignerPanels.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ import { FilterCriteriaContext } from './FilterCriteriaContext';
3939
const PROPERTIES_PANEL_INDEX = 0;
4040
const DOMAIN_PANEL_INDEX = 1;
4141

42-
interface AssayDomainFormProps
43-
extends Omit<InjectedBaseDomainDesignerProps, 'onFinish' | 'setSubmitting' | 'submitting'> {
42+
interface AssayDomainFormProps extends Omit<
43+
InjectedBaseDomainDesignerProps,
44+
'onFinish' | 'setSubmitting' | 'submitting'
45+
> {
4446
api: DomainPropertiesAPIWrapper;
4547
appDomainHeaders: Map<string, HeaderRenderer>;
48+
appPropertiesOnly?: boolean;
4649
domain: DomainDesign;
4750
domainFormDisplayOptions: IDomainFormDisplayOptions;
4851
headerPrefix: string;
49-
hideAdvancedProperties?: boolean;
5052
index: number;
5153
onDomainChange: (
5254
index: number,
@@ -67,7 +69,7 @@ const AssayDomainForm: FC<AssayDomainFormProps> = memo(props => {
6769
domainFormDisplayOptions,
6870
firstState,
6971
headerPrefix,
70-
hideAdvancedProperties,
72+
appPropertiesOnly,
7173
index,
7274
onDomainChange,
7375
onTogglePanel,
@@ -125,7 +127,7 @@ const AssayDomainForm: FC<AssayDomainFormProps> = memo(props => {
125127
<DomainForm
126128
api={api}
127129
appDomainHeaderRenderer={appDomainHeaderRenderer}
128-
appPropertiesOnly={hideAdvancedProperties}
130+
appPropertiesOnly={appPropertiesOnly}
129131
controlledCollapse
130132
domain={domain}
131133
domainFormDisplayOptions={displayOptions}
@@ -450,6 +452,7 @@ export class AssayDesignerPanelsImpl extends React.PureComponent<Props, State> {
450452
<AssayDomainForm
451453
api={api}
452454
appDomainHeaders={appDomainHeaders}
455+
appPropertiesOnly={appPropertiesOnly}
453456
currentPanelIndex={currentPanelIndex}
454457
domain={domain}
455458
domainFormDisplayOptions={domainFormDisplayOptions}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2248,6 +2248,7 @@ export interface IDomainFormDisplayOptions {
22482248
isDragDisabled?: boolean;
22492249
phiLevelDisabled?: boolean;
22502250
retainReservedFields?: boolean;
2251+
showAdvancedSettingsForApp?: boolean;
22512252
showFilterCriteria?: boolean;
22522253
showScannableOption?: boolean;
22532254
textChoiceLockedForDomain?: boolean;

packages/components/src/internal/components/forms/model.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ export function formatSavedResults(
129129

130130
const { key, orderedModels } = result;
131131
const models = fromJS(result.models[key]);
132-
const orderedResults = orderedModels[key]
133-
.reduce((ordered, k) => ordered.set(k, models.get(k)), OrderedMap<string, any>());
132+
const orderedResults = orderedModels[key].reduce(
133+
(ordered, k) => ordered.set(k, models.get(k)),
134+
OrderedMap<string, any>()
135+
);
134136

135137
return formatResults(model, orderedResults, token);
136138
}

0 commit comments

Comments
 (0)