Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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.4",
"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 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

### 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 @@ -39,14 +39,16 @@ import { FilterCriteriaContext } from './FilterCriteriaContext';
const PROPERTIES_PANEL_INDEX = 0;
const DOMAIN_PANEL_INDEX = 1;

interface AssayDomainFormProps
extends Omit<InjectedBaseDomainDesignerProps, 'onFinish' | 'setSubmitting' | 'submitting'> {
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 +69,7 @@ const AssayDomainForm: FC<AssayDomainFormProps> = memo(props => {
domainFormDisplayOptions,
firstState,
headerPrefix,
hideAdvancedProperties,
appPropertiesOnly,
index,
onDomainChange,
onTogglePanel,
Expand Down Expand Up @@ -125,7 +127,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 +452,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
6 changes: 4 additions & 2 deletions packages/components/src/internal/components/forms/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ export function formatSavedResults(

const { key, orderedModels } = result;
const models = fromJS(result.models[key]);
const orderedResults = orderedModels[key]
.reduce((ordered, k) => ordered.set(k, models.get(k)), OrderedMap<string, any>());
const orderedResults = orderedModels[key].reduce(
(ordered, k) => ordered.set(k, models.get(k)),
OrderedMap<string, any>()
);

return formatResults(model, orderedResults, token);
}
Expand Down