Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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": "7.21.3",
"version": "7.21.3-fb-assayLookupType974.1",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
6 changes: 6 additions & 0 deletions packages/components/releaseNotes/components.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages

### version TBD
*Released*: TBD
- 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

### version 7.21.3
*Released*: 12 March 2026
- GitHub Issue #790: Sample check-in and discard should not allow amount/unit input for differing units
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,10 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
const draggableId = createFormInputId('domaindrag', domainIndex, index);
// Use undefined instead of false to allow for css to handle the highlight color for hover
const highlighted = dragging ? true : isDragDisabled ? false : undefined;
const showAdvancedSettingsButton = expanded && !isFieldFullyLocked(field.lockType) && !appPropertiesOnly;
const showAdvancedSettingsButton =
expanded &&
!isFieldFullyLocked(field.lockType) &&
(!appPropertiesOnly || domainFormDisplayOptions?.showAdvancedSettingsForApp); // GitHub Issue #974

return (
<Draggable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ interface AssayDomainFormProps
extends Omit<InjectedBaseDomainDesignerProps, 'onFinish' | 'setSubmitting' | 'submitting'> {
api: DomainPropertiesAPIWrapper;
appDomainHeaders: Map<string, HeaderRenderer>;
appPropertiesOnly?: boolean;
domain: DomainDesign;
domainFormDisplayOptions: IDomainFormDisplayOptions;
headerPrefix: string;
hideAdvancedProperties?: boolean;
index: number;
onDomainChange: (
index: number,
Expand All @@ -67,7 +67,7 @@ const AssayDomainForm: FC<AssayDomainFormProps> = memo(props => {
domainFormDisplayOptions,
firstState,
headerPrefix,
hideAdvancedProperties,
appPropertiesOnly,
index,
onDomainChange,
onTogglePanel,
Expand Down Expand Up @@ -125,7 +125,7 @@ const AssayDomainForm: FC<AssayDomainFormProps> = memo(props => {
<DomainForm
api={api}
appDomainHeaderRenderer={appDomainHeaderRenderer}
appPropertiesOnly={hideAdvancedProperties}
appPropertiesOnly={appPropertiesOnly}
controlledCollapse
domain={domain}
domainFormDisplayOptions={displayOptions}
Expand Down Expand Up @@ -450,6 +450,7 @@ export class AssayDesignerPanelsImpl extends React.PureComponent<Props, State> {
<AssayDomainForm
api={api}
appDomainHeaders={appDomainHeaders}
appPropertiesOnly={appPropertiesOnly}
currentPanelIndex={currentPanelIndex}
domain={domain}
domainFormDisplayOptions={domainFormDisplayOptions}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2248,6 +2248,7 @@ export interface IDomainFormDisplayOptions {
isDragDisabled?: boolean;
phiLevelDisabled?: boolean;
retainReservedFields?: boolean;
showAdvancedSettingsForApp?: boolean;
showFilterCriteria?: boolean;
showScannableOption?: boolean;
textChoiceLockedForDomain?: boolean;
Expand Down